Changeset fcd7053 in mainline for uspace/srv/fb/Makefile


Ignore:
Timestamp:
2009-02-12T20:11:25Z (16 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
fa024ce
Parents:
84266669
Message:

cleanup configuration
code cleanup

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/fb/Makefile

    r84266669 rfcd7053  
    3030#
    3131
    32 -include ../../../Makefile.config
    33 
    3432LIBC_PREFIX = ../../lib/libc
    3533SOFTINT_PREFIX = ../../lib/softint
     34
    3635include $(LIBC_PREFIX)/Makefile.toolchain
    3736
    … …  
    4847        ppm.c
    4948
    50 ifneq ($(ARCH), ia64)
     49ifneq ($(UARCH),ia64)
    5150        SOURCES += fb.c \
    5251                font-8x16.c
    5352        CFLAGS += -DFB_ENABLED
    5453endif
    55 ifeq ($(ARCH), ia32)
     54
     55ifeq ($(UARCH),ia32)
    5656        SOURCES += ega.c
    5757        CFLAGS += -DEGA_ENABLED
    5858endif
    59 ifeq ($(ARCH), ia64)
     59
     60ifeq ($(UARCH),ia64)
    6061        SOURCES += ega.c \
    61                    ski.c \
    62                    serial_console.c
     62                ski.c \
     63                serial_console.c
    6364        CFLAGS += -DSKI_ENABLED
    6465        CFLAGS += -DEGA_ENABLED
    6566endif
    66 ifeq ($(ARCH), amd64)
     67
     68ifeq ($(UARCH),amd64)
    6769        SOURCES += ega.c
    6870        CFLAGS += -DEGA_ENABLED
    6971endif
    70 ifeq ($(ARCH), arm32)
    71         CFLAGS += -DFB_INVERT_ENDIAN
     72
     73ifeq ($(UARCH),mips32)
     74        SOURCES += msim.c \
     75                serial_console.c
     76        CFLAGS += -DMSIM_ENABLED
    7277endif
    73 ifeq ($(ARCH), mips32)
    74         SOURCES += msim.c \
    75                    serial_console.c
    76         CFLAGS += -DMSIM_ENABLED -DFB_INVERT_ENDIAN
    77 endif
    78 ifeq ($(ARCH), sparc64)
     78
     79ifeq ($(UARCH),sparc64)
    7980        SOURCES += sgcn.c \
    80                    serial_console.c
     81                serial_console.c
    8182        CFLAGS += -DSGCN_ENABLED
    8283endif
    8384
    84 CFLAGS += -D$(ARCH)
     85CFLAGS += -D$(UARCH)
    8586
    8687
    … …  
    100101
    101102$(OUTPUT): $(OBJECTS) $(LIBS)
    102         $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
     103        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    103104
    104105disasm: $(OUTPUT).disasm
Note: See TracChangeset for help on using the changeset viewer.