Changeset 432a269 in mainline for uspace/srv/hid/fb/Makefile


Ignore:
Timestamp:
2011-09-16T21:13:57Z (13 years ago)
Author:
Martin Sucha <sucha14@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
3a11f17
Parents:
c0e53ff (diff), fd07e526 (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

    rc0e53ff r432a269  
    2929
    3030USPACE_PREFIX = ../../..
    31 ROOT_PATH = $(USPACE_PREFIX)/..
    32 
    33 COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
    34 CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
    35 
     31LIBS = $(LIBFB_PREFIX)/libfb.a
     32EXTRA_CFLAGS += -I$(LIBFB_PREFIX)
    3633BINARY = fb
    3734
    38 -include $(COMMON_MAKEFILE)
    39 -include $(CONFIG_MAKEFILE)
    40 
    4135SOURCES = \
    42         main.c
    43 
    44 ifneq ($(UARCH),ia64)
    45         SOURCES += \
    46                 fb.c \
    47                 font-8x16.c
    48         EXTRA_CFLAGS += -DFB_ENABLED
    49 endif
    50 
    51 ifeq ($(UARCH),ia32)
    52         SOURCES += \
    53                 ega.c
    54         EXTRA_CFLAGS += -DEGA_ENABLED
    55 endif
    56 
    57 ifeq ($(UARCH),ia64)
    58         SOURCES += \
    59                 ega.c \
    60                 ski.c \
    61                 serial_console.c
    62         EXTRA_CFLAGS += -DSKI_ENABLED -DEGA_ENABLED
    63 endif
    64 
    65 ifeq ($(UARCH),amd64)
    66         SOURCES += \
    67                 ega.c
    68         EXTRA_CFLAGS += -DEGA_ENABLED
    69 endif
    70 
    71 ifeq ($(UARCH),mips32)
    72         SOURCES += \
    73                 msim.c \
    74                 serial_console.c
    75         EXTRA_CFLAGS += -DMSIM_ENABLED
    76 endif
    77 
    78 ifeq ($(UARCH),sparc64)
    79         ifeq ($(PROCESSOR),sun4v)
    80                 SOURCES += \
    81                         niagara.c \
    82                         serial_console.c
    83                 EXTRA_CFLAGS += -DNIAGARA_ENABLED
    84         endif
    85 endif
    86 
    87 LIBS = $(LIBIMGMAP_PREFIX)/libimgmap.a
    88 EXTRA_CFLAGS += -I$(LIBIMGMAP_PREFIX) -D$(UARCH)
     36        gfx/font-8x16.c \
     37        ctl/serial.c \
     38        port/ega.c \
     39        port/kfb.c \
     40        port/kchar.c \
     41        port/niagara.c \
     42        port/ski.c \
     43        proto/vt100.c \
     44        fb.c
    8945
    9046include $(USPACE_PREFIX)/Makefile.common
Note: See TracChangeset for help on using the changeset viewer.