Changeset 4006447 in mainline for uspace/Makefile


Ignore:
Timestamp:
2010-12-06T20:03:54Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c0bd08d
Parents:
b38dfd8 (diff), 463e734 (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 from lp:~vojtech-horky/helenos/ddf-fixes.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    rb38dfd8 r4006447  
    8585        srv/net/tl/tcp \
    8686        srv/net/net \
    87         drv/root
     87        drv/root \
     88        drv/rootvirt \
     89        drv/test1 \
     90        drv/test2
    8891
    8992## Networking
    … …  
    108111
    109112ifeq ($(UARCH),amd64)
     113        DIRS += drv/rootpc
     114        DIRS += drv/pciintel
     115        DIRS += drv/isa
     116        DIRS += drv/ns8250
    110117endif
    111118
    112119ifeq ($(UARCH),ia32)
    113         DIRS += drv/rootia32
     120        DIRS += drv/rootpc
    114121        DIRS += drv/pciintel
    115122        DIRS += drv/isa
Note: See TracChangeset for help on using the changeset viewer.