Changeset 04803bf in mainline for uspace/srv/hid/fb/Makefile


Ignore:
Timestamp:
2011-03-21T22:00:17Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
143932e
Parents:
b50b5af2 (diff), 7308e84 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes (needs fixes).

File:
1 moved

Legend:

Unmodified
Added
Removed

  • uspace/srv/hid/fb/Makefile

    rb50b5af2 r04803bf  
    11#
    22# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 ## Setup toolchain
    30 #
     30USPACE_PREFIX = ../../..
     31ROOT_PATH = $(USPACE_PREFIX)/..
    3132
    32 LIBC_PREFIX = ../../lib/libc
    33 SOFTINT_PREFIX = ../../lib/softint
     33COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
     34CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
    3435
    35 include $(LIBC_PREFIX)/Makefile.toolchain
     36BINARY = fb
    3637
    37 LIBS = $(LIBC_PREFIX)/libc.a
     38-include $(COMMON_MAKEFILE)
     39-include $(CONFIG_MAKEFILE)
    3840
    39 ## Sources
    40 #
    41 
    42 OUTPUT = fb
    4341SOURCES = \
    4442        main.c \
    … …  
    4644
    4745ifneq ($(UARCH),ia64)
    48         SOURCES += fb.c \
     46        SOURCES += \
     47                fb.c \
    4948                font-8x16.c
    50         CFLAGS += -DFB_ENABLED
     49        EXTRA_CFLAGS += -DFB_ENABLED
    5150endif
    5251
    5352ifeq ($(UARCH),ia32)
    54         SOURCES += ega.c
    55         CFLAGS += -DEGA_ENABLED
     53        SOURCES += \
     54                ega.c
     55        EXTRA_CFLAGS += -DEGA_ENABLED
    5656endif
    5757
    5858ifeq ($(UARCH),ia64)
    59         SOURCES += ega.c \
     59        SOURCES += \
     60                ega.c \
    6061                ski.c \
    6162                serial_console.c
    62         CFLAGS += -DSKI_ENABLED
    63         CFLAGS += -DEGA_ENABLED
     63        EXTRA_CFLAGS += -DSKI_ENABLED -DEGA_ENABLED
    6464endif
    6565
    6666ifeq ($(UARCH),amd64)
    67         SOURCES += ega.c
    68         CFLAGS += -DEGA_ENABLED
     67        SOURCES += \
     68                ega.c
     69        EXTRA_CFLAGS += -DEGA_ENABLED
    6970endif
    7071
    7172ifeq ($(UARCH),mips32)
    72         SOURCES += msim.c \
     73        SOURCES += \
     74                msim.c \
    7375                serial_console.c
    74         CFLAGS += -DMSIM_ENABLED
     76        EXTRA_CFLAGS += -DMSIM_ENABLED
    7577endif
    7678
    7779ifeq ($(UARCH),sparc64)
    78         SOURCES += sgcn.c \
    79                 serial_console.c
    80         CFLAGS += -DSGCN_ENABLED
     80        ifeq ($(PROCESSOR),sun4v)
     81                SOURCES += \
     82                        niagara.c \
     83                        serial_console.c
     84                EXTRA_CFLAGS += -DNIAGARA_ENABLED
     85        endif
     86       
     87        ifeq ($(MACHINE),serengeti)
     88                SOURCES += \
     89                        sgcn.c \
     90                        serial_console.c
     91                EXTRA_CFLAGS += -DSGCN_ENABLED
     92        endif
    8193endif
    8294
    83 CFLAGS += -D$(UARCH)
     95EXTRA_CFLAGS += -D$(UARCH)
    8496
    85 
    86 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    87 
    88 .PHONY: all clean depend disasm
    89 
    90 all: $(OUTPUT) $(OUTPUT).disasm
    91 
    92 -include Makefile.depend
    93 
    94 clean:
    95         -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
    96 
    97 depend:
    98         $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
    99 
    100 $(OUTPUT): $(OBJECTS) $(LIBS)
    101         $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    102 
    103 disasm: $(OUTPUT).disasm
    104 
    105 $(OUTPUT).disasm: $(OUTPUT)
    106         $(OBJDUMP) -d $< > $@
    107 
    108 %.o: %.S
    109         $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
    110 
    111 %.o: %.s
    112         $(AS) $(AFLAGS) $< -o $@
    113 
    114 %.o: %.c
    115         $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
     97include $(USPACE_PREFIX)/Makefile.common
Note: See TracChangeset for help on using the changeset viewer.