Changeset 7bdcc45 in mainline for uspace/Makefile


Ignore:
Timestamp:
2010-12-16T16:38:49Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
7837101
Parents:
8e58f94 (diff), eb221e5 (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

    r8e58f94 r7bdcc45  
    4646        app/tasks \
    4747        app/tester \
    48         app/test_serial \
    4948        app/tetris \
    5049        app/trace \
    … …  
    8685        srv/net/tl/tcp \
    8786        srv/net/net \
    88         drv/root
     87        drv/root \
     88        drv/rootvirt \
     89        drv/test1 \
     90        drv/test2
    8991
    9092## Networking
    … …  
    109111
    110112ifeq ($(UARCH),amd64)
     113        DIRS += drv/rootpc
     114        DIRS += drv/pciintel
     115        DIRS += drv/isa
     116        DIRS += drv/ns8250
    111117endif
    112118
    113119ifeq ($(UARCH),ia32)
    114         DIRS += drv/rootia32
     120        DIRS += drv/rootpc
    115121        DIRS += drv/pciintel
    116122        DIRS += drv/isa
Note: See TracChangeset for help on using the changeset viewer.