Changeset f4f866c in mainline for uspace/srv/hid/fb/Makefile


Ignore:
Timestamp:
2010-04-23T21:42:26Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
6c39a907
Parents:
38aaacc2 (diff), 80badbe (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.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/hid/fb/Makefile

    r38aaacc2 rf4f866c  
    2929
    3030USPACE_PREFIX = ../../..
     31ROOT_PATH = $(USPACE_PREFIX)/..
     32
     33COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
     34CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
     35
    3136BINARY = fb
     37
     38-include $(COMMON_MAKEFILE)
     39-include $(CONFIG_MAKEFILE)
    3240
    3341SOURCES = \
    … …  
    3644
    3745ifneq ($(UARCH),ia64)
    38         SOURCES += fb.c \
     46        SOURCES += \
     47                fb.c \
    3948                font-8x16.c
    40         EXTRA_CFLAGS = -DFB_ENABLED
     49        EXTRA_CFLAGS += -DFB_ENABLED
    4150endif
    4251
    4352ifeq ($(UARCH),ia32)
    44         SOURCES += ega.c
    45         EXTRA_CFLAGS = -DEGA_ENABLED
     53        SOURCES += \
     54                ega.c
     55        EXTRA_CFLAGS += -DEGA_ENABLED
    4656endif
    4757
    4858ifeq ($(UARCH),ia64)
    49         SOURCES += ega.c \
     59        SOURCES += \
     60                ega.c \
    5061                ski.c \
    5162                serial_console.c
    52         EXTRA_CFLAGS = -DSKI_ENABLED -DEGA_ENABLED
     63        EXTRA_CFLAGS += -DSKI_ENABLED -DEGA_ENABLED
    5364endif
    5465
    5566ifeq ($(UARCH),amd64)
    56         SOURCES += ega.c
    57         EXTRA_CFLAGS = -DEGA_ENABLED
     67        SOURCES += \
     68                ega.c
     69        EXTRA_CFLAGS += -DEGA_ENABLED
    5870endif
    5971
    6072ifeq ($(UARCH),mips32)
    61         SOURCES += msim.c \
     73        SOURCES += \
     74                msim.c \
    6275                serial_console.c
    63         EXTRA_CFLAGS = -DMSIM_ENABLED
     76        EXTRA_CFLAGS += -DMSIM_ENABLED
    6477endif
    6578
    6679ifeq ($(UARCH),sparc64)
    67         ifeq ($(PROCESSOR), sun4v)
    68                 SOURCES += niagara.c \
     80        ifeq ($(PROCESSOR),sun4v)
     81                SOURCES += \
     82                        niagara.c \
    6983                        serial_console.c
    70                 EXTRA_CFLAGS = -DNIAGARA_ENABLED
     84                EXTRA_CFLAGS += -DNIAGARA_ENABLED
    7185        endif
    72 
    73         ifeq ($(MACHINE), serengeti)
    74                 SOURCES += sgcn.c \
     86       
     87        ifeq ($(MACHINE),serengeti)
     88                SOURCES += \
     89                        sgcn.c \
    7590                        serial_console.c
    76                 EXTRA_CFLAGS = -DSGCN_ENABLED
     91                EXTRA_CFLAGS += -DSGCN_ENABLED
    7792        endif
    7893endif
Note: See TracChangeset for help on using the changeset viewer.