Changeset efedee77 in mainline for uspace/Makefile

Timestamp:

2010-11-02T22:38:46Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

af894a21

Parents:

aab02fb (diff), e06ef614 (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:

• uspace/Makefile (modified) (6 diffs)

uspace/Makefile

@@ -46 +46 @@
         app/tasks \
         app/tester \
+        app/test_serial \
         app/tetris \
         app/trace \
         app/top \
+        app/usb \
         app/virtusbkbd \
+        app/netecho \
+        app/nettest1 \
+        app/nettest2 \
+        app/ping \
         srv/clip \
         srv/devmap \
+        srv/devman \
         srv/loader \
         srv/ns \
@@ -67 +74 @@
         srv/hid/adb_mouse \
         srv/hid/char_mouse \
+        srv/hid/s3c24xx_ts \
         srv/hid/fb \
         srv/hid/kbd \
@@ -82 +90 @@
         srv/net/net \
         srv/net/netstart \
-        app/usb \
-        app/netecho \
-        app/nettest1 \
-        app/nettest2 \
-        app/ping
+        drv/root
 
 ## Networking
@@ -109 +113 @@
 
 ifeq ($(UARCH),amd64)
-        DIRS += srv/hw/bus/pci
 endif
 
 ifeq ($(UARCH),ia32)
-        DIRS += srv/hw/bus/pci
+        DIRS += drv/rootia32
+        DIRS += drv/pciintel
+        DIRS += drv/isa
+        DIRS += drv/ns8250
 endif
 
@@ -136 +142 @@
         lib/softint \
         lib/softfloat \
-        lib/socket \
+        lib/drv \
+        lib/packet \
         lib/net
 
 ifeq ($(UARCH),amd64)
-        LIBS += lib/pci
         LIBS += lib/usb
         LIBS += lib/usbvirt
@@ -146 +152 @@
 
 ifeq ($(UARCH),ia32)
-        LIBS += lib/pci
         LIBS += lib/usb
         LIBS += lib/usbvirt
 endif
-
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))