Changeset fcd7053 in mainline for uspace/srv/kbd/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/kbd/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
    … …  
    4948
    5049ARCH_SOURCES = \
    51         arch/$(ARCH)/src/kbd.c
     50        arch/$(UARCH)/src/kbd.c
    5251
    53 ifeq ($(ARCH), ia32)
     52ifeq ($(UARCH), ia32)
    5453        ARCH_SOURCES += \
    55                 arch/$(ARCH)/src/mouse.c \
    56                 arch/$(ARCH)/src/scanc.c
     54                arch/$(UARCH)/src/mouse.c \
     55                arch/$(UARCH)/src/scanc.c
    5756        GENARCH_SOURCES = \
    5857                genarch/src/kbd.c
    5958        CFLAGS += -DMOUSE_ENABLED
    6059endif
    61 ifeq ($(ARCH), ia64)
     60ifeq ($(UARCH), ia64)
    6261        ARCH_SOURCES += \
    63                 arch/$(ARCH)/src/mouse.c \
    64                 arch/$(ARCH)/src/scanc.c \
    65                 arch/$(ARCH)/src/lkbd.c
     62                arch/$(UARCH)/src/mouse.c \
     63                arch/$(UARCH)/src/scanc.c \
     64                arch/$(UARCH)/src/lkbd.c
    6665        GENARCH_SOURCES = \
    6766                genarch/src/kbd.c
    6867        CFLAGS += -DMOUSE_ENABLED
    6968endif
    70 ifeq ($(ARCH), amd64)
     69ifeq ($(UARCH), amd64)
    7170        ARCH_SOURCES += \
    72                 arch/$(ARCH)/src/mouse.c \
    73                 arch/$(ARCH)/src/scanc.c
     71                arch/$(UARCH)/src/mouse.c \
     72                arch/$(UARCH)/src/scanc.c
    7473        GENARCH_SOURCES = \
    7574                genarch/src/kbd.c
    7675        CFLAGS += -DMOUSE_ENABLED
    7776endif
    78 ifeq ($(ARCH), sparc64)
     77ifeq ($(UARCH), sparc64)
    7978        ARCH_SOURCES += \
    80                 arch/$(ARCH)/src/scanc.c \
    81                 arch/$(ARCH)/src/sgcn.c
     79                arch/$(UARCH)/src/scanc.c \
     80                arch/$(UARCH)/src/sgcn.c
    8281        GENARCH_SOURCES = \
    8382                genarch/src/kbd.c \
    8483                genarch/src/nofb.c
    8584endif
    86 ifeq ($(ARCH), arm32)
     85ifeq ($(UARCH), arm32)
    8786        ARCH_SOURCES += \
    88                 arch/$(ARCH)/src/kbd_gxemul.c
     87                arch/$(UARCH)/src/kbd_gxemul.c
    8988endif
    90 ifeq ($(ARCH), mips32)
     89ifeq ($(UARCH), mips32)
    9190        GENARCH_SOURCES += \
    9291            genarch/src/nofb.c
    9392endif
    94 ifeq ($(ARCH), mips32eb)
     93ifeq ($(UARCH), mips32eb)
    9594        GENARCH_SOURCES += \
    9695            genarch/src/nofb.c
    … …  
    110109
    111110links:
    112         ln -sfn ../arch/$(ARCH)/include include/arch
     111        ln -sfn ../arch/$(UARCH)/include include/arch
    113112        ln -sfn ../genarch/include include/genarch
    114113
    … …  
    120119
    121120$(OUTPUT): $(OBJECTS) $(LIBS)
    122         $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
     121        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    123122
    124123disasm: $(OUTPUT).disasm
Note: See TracChangeset for help on using the changeset viewer.