Changeset 0b749a3 in mainline for uspace/Makefile


Ignore:
Timestamp:
2010-11-22T15:39:53Z (16 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export
Children:
0eddb76, aae339e9
Parents:
9a1d8ab (diff), 8cd1aa5e (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 development/ changes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    r9a1d8ab r0b749a3  
    4646        app/tasks \
    4747        app/tester \
     48        app/test_serial \
    4849        app/tetris \
    4950        app/trace \
    5051        app/top \
     52        app/virtusbkbd \
     53        app/netecho \
     54        app/nettest1 \
     55        app/nettest2 \
     56        app/ping \
    5157        srv/clip \
    5258        srv/devmap \
     59        srv/devman \
    5360        srv/loader \
    5461        srv/ns \
    … …  
    6673        srv/hid/adb_mouse \
    6774        srv/hid/char_mouse \
     75        srv/hid/s3c24xx_ts \
    6876        srv/hid/fb \
    6977        srv/hid/kbd \
    … …  
    7987        srv/net/tl/tcp \
    8088        srv/net/net \
    81         srv/net/netstart \
    82         app/netecho \
    83         app/nettest1 \
    84         app/nettest2 \
    85         app/ping
     89        drv/root \
     90        drv/vhc
    8691
    8792## Networking
    … …  
    106111
    107112ifeq ($(UARCH),amd64)
    108         DIRS += srv/hw/bus/pci
    109113endif
    110114
    111115ifeq ($(UARCH),ia32)
    112         DIRS += srv/hw/bus/pci
     116        DIRS += drv/rootia32
     117        DIRS += drv/pciintel
     118        DIRS += drv/isa
     119        DIRS += drv/ns8250
     120        DIRS += drv/uhci
     121        DIRS += drv/usbkbd
    113122endif
    114123
    … …  
    133142        lib/softint \
    134143        lib/softfloat \
    135         lib/socket \
     144        lib/drv \
     145        lib/packet \
    136146        lib/net
    137147
    138148ifeq ($(UARCH),amd64)
    139         LIBS += lib/pci
     149        LIBS += lib/usb
     150        LIBS += lib/usbvirt
    140151endif
    141152
    142153ifeq ($(UARCH),ia32)
    143         LIBS += lib/pci
     154        LIBS += lib/usb
     155        LIBS += lib/usbvirt
    144156endif
    145 
    146157
    147158LIBC_BUILD = $(addsuffix .build,$(LIBC))
Note: See TracChangeset for help on using the changeset viewer.