Changeset bfd7aac in mainline for uspace/srv/hid/kbd/Makefile.build


Ignore:
Timestamp:
2010-02-17T19:19:08Z (14 years ago)
Author:
Lukas Mejdrech <lukasmejdrech@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
1e2e0c1e
Parents:
01a9ef5 (diff), b8da2a3 (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/kbd/Makefile.build

    r01a9ef5 rbfd7aac  
    130130
    131131ifeq ($(UARCH),sparc64)
    132         ifeq ($(MACHINE),serengeti)
     132        ifeq ($(PROCESSOR),sun4v)
    133133                SOURCES += \
    134                         port/sgcn.c \
     134                        port/niagara.c \
    135135                        ctl/stty.c
    136136        else
    137                 SOURCES += \
     137                ifeq ($(MACHINE),serengeti)
     138                        SOURCES += \
     139                                port/sgcn.c \
     140                                ctl/stty.c
     141                endif
     142                ifeq ($(MACHINE),generic)
     143                        SOURCES += \
    138144                        port/sun.c \
    139145                        port/z8530.c \
    140146                        port/ns16550.c \
    141147                        ctl/sun.c
     148                endif
    142149        endif
     150endif
     151
     152ifeq ($(UARCH),abs32le)
     153        SOURCES += \
     154                port/dummy.c \
     155                ctl/pc.c
    143156endif
    144157
Note: See TracChangeset for help on using the changeset viewer.