Changeset 04cb68f2 in mainline for uspace/Makefile


Ignore:
Timestamp:
2010-10-20T19:30:54Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
78a9e5ef
Parents:
e0e568ff (diff), a6e54c5d (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:~helenos-dd/helenos/dd.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    re0e568ff r04cb68f2  
    4343        app/sbi \
    4444        app/stats \
     45        app/shutters \
    4546        app/taskdump \
    4647        app/tasks \
    4748        app/tester \
     49        app/test_serial \
    4850        app/tetris \
    4951        app/trace \
    … …  
    5153        srv/clip \
    5254        srv/devmap \
     55        srv/devman \
     56        srv/drivers/root \
    5357        srv/loader \
    5458        srv/ns \
    … …  
    111115
    112116ifeq ($(UARCH),ia32)
    113         DIRS += srv/hw/bus/pci
     117        DIRS += srv/drivers/rootia32
     118        DIRS += srv/drivers/pciintel
     119        DIRS += srv/drivers/isa
     120        DIRS += srv/drivers/ns8250
     121#       DIRS += srv/hw/bus/pci
    114122endif
    115123
    … …  
    134142        lib/softint \
    135143        lib/softfloat \
     144        lib/drv \
    136145        lib/packet \
    137146        lib/net
Note: See TracChangeset for help on using the changeset viewer.