Changeset 925a21e in mainline for uspace/srv/hid/fb/Makefile


Ignore:
Timestamp:
2011-09-24T14:20:29Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5bf76c1
Parents:
867e2555 (diff), 1ab4aca (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

    r867e2555 r925a21e  
    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         ppm.c
    44 
    45 ifneq ($(UARCH),ia64)
    46         SOURCES += \
    47                 fb.c \
    48                 font-8x16.c
    49         EXTRA_CFLAGS += -DFB_ENABLED
    50 endif
    51 
    52 ifeq ($(UARCH),ia32)
    53         SOURCES += \
    54                 ega.c
    55         EXTRA_CFLAGS += -DEGA_ENABLED
    56 endif
    57 
    58 ifeq ($(UARCH),ia64)
    59         SOURCES += \
    60                 ega.c \
    61                 ski.c \
    62                 serial_console.c
    63         EXTRA_CFLAGS += -DSKI_ENABLED -DEGA_ENABLED
    64 endif
    65 
    66 ifeq ($(UARCH),amd64)
    67         SOURCES += \
    68                 ega.c
    69         EXTRA_CFLAGS += -DEGA_ENABLED
    70 endif
    71 
    72 ifeq ($(UARCH),mips32)
    73         SOURCES += \
    74                 msim.c \
    75                 serial_console.c
    76         EXTRA_CFLAGS += -DMSIM_ENABLED
    77 endif
    78 
    79 ifeq ($(UARCH),sparc64)
    80         ifeq ($(PROCESSOR),sun4v)
    81                 SOURCES += \
    82                         niagara.c \
    83                         serial_console.c
    84                 EXTRA_CFLAGS += -DNIAGARA_ENABLED
    85         endif
    86 endif
    87 
    88 EXTRA_CFLAGS += -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.