Changeset 8ff0bd2 in mainline for uspace/Makefile

Timestamp:

2011-09-04T11:30:58Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (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) (9 diffs)

uspace/Makefile

@@ -37 +37 @@
         app/blkdump \
         app/bnchmark \
+        app/devctl \
         app/edit \
         app/ext2info \
@@ -44 +45 @@
         app/killall \
         app/klog \
+        app/locinfo \
         app/lsusb \
         app/mkfat \
@@ -66 +68 @@
         app/mkbd \
         srv/clip \
-        srv/devmap \
+        srv/loc \
         srv/devman \
         srv/loader \
@@ -78 +80 @@
         srv/bd/part/guid_part \
         srv/bd/part/mbr_part \
+        srv/fs/exfat \
         srv/fs/fat \
         srv/fs/tmpfs \
-        srv/fs/devfs \
         srv/fs/minixfs \
+        srv/fs/locfs \
         srv/fs/ext2fs \
-        srv/hid/adb_mouse \
-        srv/hid/char_mouse \
+        srv/hid/console \
         srv/hid/s3c24xx_ts \
         srv/hid/fb \
-        srv/hid/kbd \
+        srv/hid/input \
         srv/hw/char/i8042 \
         srv/hw/char/s3c24xx_uart \
@@ -98 +100 @@
         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
@@ -125 +127 @@
 #
 
-ifneq ($(UARCH),abs32le)
-        DIRS += srv/hid/console
-endif
-
 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
@@ -141 +139 @@
 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
@@ -150 +148 @@
 
 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
@@ -167 +166 @@
         lib/block \
         lib/clui \
+        lib/fmtutil \
+        lib/scsi \
         lib/softint \
         lib/softfloat \
         lib/drv \
         lib/packet \
+        lib/imgmap \
         lib/net \
         lib/ext2 \