Changeset 1affcdf3 in mainline for uspace/Makefile

Timestamp:

2011-06-10T19:33:41Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1878386

Parents:

13ecdac9 (diff), 79a141a (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) (7 diffs)

uspace/Makefile

@@ -35 +35 @@
 DIRS = \
         app/bdsh \
+        app/blkdump \
+        app/bnchmark \
         app/edit \
+        app/ext2info \
         app/getterm \
         app/init \
@@ -41 +44 @@
         app/killall \
         app/klog \
+        app/lsusb \
         app/mkfat \
         app/mkminix \
@@ -48 +52 @@
         app/taskdump \
         app/tester \
+        app/testread \
         app/tetris \
         app/trace \
         app/top \
+        app/usbinfo \
+        app/vuhid \
         app/netecho \
         app/nettest1 \
@@ -57 +64 @@
         app/websrv \
         app/sysinfo \
+        app/mkbd \
         srv/clip \
         srv/devmap \
@@ -74 +82 @@
         srv/fs/devfs \
         srv/fs/minixfs \
+        srv/fs/ext2fs \
         srv/hid/adb_mouse \
         srv/hid/char_mouse \
@@ -92 +101 @@
         drv/rootvirt \
         drv/test1 \
-        drv/test2
+        drv/test2 \
+        drv/test3 \
+        drv/ehci_hcd \
+        drv/ohci \
+        drv/uhci_hcd \
+        drv/uhci_rhd \
+        drv/usbflbk \
+        drv/usbhid \
+        drv/usbhub \
+        drv/usbmast \
+        drv/usbmid \
+        drv/usbmouse \
+        drv/vhc
 
 ## Networking
@@ -150 +171 @@
         lib/drv \
         lib/packet \
-        lib/net
+        lib/net \
+        lib/ext2 \
+        lib/usb \
+        lib/usbhost \
+        lib/usbdev \
+        lib/usbhid \
+        lib/usbvirt
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))