Changeset c028b22 in mainline for uspace/Makefile

Timestamp:

2011-07-08T17:01:01Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cc1a727

Parents:

4e36219 (diff), 026793d (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) (10 diffs)

uspace/Makefile

@@ -44 +44 @@
         app/killall \
         app/klog \
+        app/lsusb \
         app/mkfat \
         app/redir \
@@ -54 +55 @@
         app/trace \
         app/top \
+        app/usbinfo \
+        app/vuhid \
         app/netecho \
         app/nettest1 \
@@ -60 +63 @@
         app/websrv \
         app/sysinfo \
+        app/mkbd \
         srv/clip \
         srv/devmap \
@@ -76 +80 @@
         srv/fs/tmpfs \
         srv/fs/devfs \
-        srv/fs/pipefs \
         srv/fs/ext2fs \
-        srv/hid/adb_mouse \
-        srv/hid/char_mouse \
         srv/hid/s3c24xx_ts \
         srv/hid/fb \
-        srv/hid/kbd \
+        srv/hid/input \
         srv/hw/char/i8042 \
         srv/hw/char/s3c24xx_uart \
@@ -93 +94 @@
         srv/net/tl/tcp \
         srv/net/net \
-        drv/root \
-        drv/rootvirt \
-        drv/test1 \
-        drv/test2 \
-        drv/test3
+        drv/infrastructure/root \
+        drv/infrastructure/rootvirt \
+        drv/test/test1 \
+        drv/test/test2 \
+        drv/test/test3 \
+        drv/bus/usb/ehci \
+        drv/bus/usb/ohci \
+        drv/bus/usb/uhci \
+        drv/bus/usb/uhcirh \
+        drv/bus/usb/usbflbk \
+        drv/bus/usb/usbhid \
+        drv/bus/usb/usbhub \
+        drv/bus/usb/usbmast \
+        drv/bus/usb/usbmid \
+        drv/bus/usb/usbmouse \
+        drv/bus/usb/vhc
 
 ## Networking
@@ -115 +127 @@
 ifeq ($(UARCH),amd64)
         DIRS += \
-                drv/rootpc \
-                drv/pciintel \
-                drv/isa \
-                drv/ns8250 \
+                drv/infrastructure/rootpc \
+                drv/bus/pci/pciintel \
+                drv/bus/isa \
+                drv/char/ns8250 \
                 srv/hw/irc/apic \
                 srv/hw/irc/i8259
@@ -125 +137 @@
 ifeq ($(UARCH),ia32)
         DIRS += \
-                drv/rootpc \
-                drv/pciintel \
-                drv/isa \
-                drv/ns8250 \
+                drv/infrastructure/rootpc \
+                drv/bus/pci/pciintel \
+                drv/bus/isa \
+                drv/char/ns8250 \
                 srv/hw/irc/apic \
                 srv/hw/irc/i8259
@@ -134 +146 @@
 
 ifeq ($(UARCH),ppc32)
-        DIRS += srv/hw/bus/cuda_adb
+        DIRS += \
+                drv/infrastructure/rootmac \
+                srv/hw/bus/cuda_adb
 endif
 
 ifeq ($(UARCH),sparc64)
         DIRS += \
-                srv/hw/irc/fhc \
                 srv/hw/irc/obio
 endif
@@ -151 +164 @@
         lib/block \
         lib/clui \
+        lib/scsi \
         lib/softint \
         lib/softfloat \
@@ -156 +170 @@
         lib/packet \
         lib/net \
-        lib/ext2
+        lib/ext2 \
+        lib/usb \
+        lib/usbhost \
+        lib/usbdev \
+        lib/usbhid \
+        lib/usbvirt
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))