Changeset e4f8c77 in mainline for uspace/Makefile

Timestamp:

2011-07-13T22:39:18Z (13 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

e6910c8

Parents:

5974661 (diff), 8ecef91 (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 libposix.

File:

• uspace/Makefile (modified) (6 diffs)

uspace/Makefile

@@ -85 +85 @@
         srv/fs/devfs \
         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 \
@@ -100 +98 @@
         srv/net/tl/tcp \
         srv/net/net \
-        drv/root \
-        drv/rootvirt \
-        drv/test1 \
-        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
+        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
@@ -133 +131 @@
 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
@@ -143 +141 @@
 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
@@ -152 +150 @@
 
 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
@@ -169 +168 @@
         lib/block \
         lib/clui \
+        lib/scsi \
         lib/softint \
         lib/softfloat \