Changeset 1b11576d in mainline for uspace/Makefile


Ignore:
Timestamp:
2010-10-23T16:04:12Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c77b4d6
Parents:
84c20da (diff), 58b833c (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/Makefile

    r84c20da r1b11576d  
    4646        app/tasks \
    4747        app/tester \
     48        app/test_serial \
    4849        app/tetris \
    4950        app/trace \
    5051        app/top \
     52        app/netecho \
     53        app/nettest1 \
     54        app/nettest2 \
     55        app/ping \
    5156        srv/clip \
    5257        srv/devmap \
     58        srv/devman \
    5359        srv/loader \
    5460        srv/ns \
     
    8187        srv/net/net \
    8288        srv/net/netstart \
    83         app/netecho \
    84         app/nettest1 \
    85         app/nettest2 \
    86         app/ping
     89        drv/root
    8790
    8891## Networking
     
    107110
    108111ifeq ($(UARCH),amd64)
    109         DIRS += srv/hw/bus/pci
    110112endif
    111113
    112114ifeq ($(UARCH),ia32)
    113         DIRS += srv/hw/bus/pci
     115        DIRS += drv/rootia32
     116        DIRS += drv/pciintel
     117        DIRS += drv/isa
     118        DIRS += drv/ns8250
    114119endif
    115120
     
    134139        lib/softint \
    135140        lib/softfloat \
     141        lib/drv \
    136142        lib/packet \
    137143        lib/net
    138 
    139 ifeq ($(UARCH),amd64)
    140         LIBS += lib/pci
    141 endif
    142 
    143 ifeq ($(UARCH),ia32)
    144         LIBS += lib/pci
    145 endif
    146 
    147144
    148145LIBC_BUILD = $(addsuffix .build,$(LIBC))
Note: See TracChangeset for help on using the changeset viewer.