Changeset 75732da in mainline for uspace/Makefile


Ignore:
Timestamp:
2010-12-13T07:20:20Z (13 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
309dea52
Parents:
84439d7 (diff), 37f7cfe (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

    r84439d7 r75732da  
    4949        app/trace \
    5050        app/top \
     51        app/usbinfo \
    5152        app/virtusbkbd \
    5253        app/netecho \
    … …  
    8788        srv/net/net \
    8889        drv/root \
    89         drv/vhc
     90        drv/rootvirt \
     91        drv/test1 \
     92        drv/test2
    9093
    9194## Networking
    … …  
    110113
    111114ifeq ($(UARCH),amd64)
    112 endif
    113 
    114 ifeq ($(UARCH),ia32)
    115         DIRS += drv/rootia32
     115        DIRS += drv/rootpc
    116116        DIRS += drv/pciintel
    117117        DIRS += drv/isa
    … …  
    120120        DIRS += drv/usbhub
    121121        DIRS += drv/usbkbd
     122        DIRS += drv/vhc
     123endif
     124
     125ifeq ($(UARCH),ia32)
     126        DIRS += drv/rootpc
     127        DIRS += drv/pciintel
     128        DIRS += drv/isa
     129        DIRS += drv/ns8250
     130        DIRS += drv/uhci
     131        DIRS += drv/usbhub
     132        DIRS += drv/usbkbd
     133        DIRS += drv/vhc
    122134endif
    123135
Note: See TracChangeset for help on using the changeset viewer.