Changes in uspace/Makefile [eb660787:75608143] in mainline

File:

• uspace/Makefile (modified) (9 diffs)

uspace/Makefile

@@ -37 +37 @@
         app/blkdump \
         app/bnchmark \
-        app/devctl \
         app/edit \
         app/ext2info \
@@ -45 +44 @@
         app/killall \
         app/klog \
-        app/locinfo \
         app/lsusb \
         app/mkfat \
@@ -67 +65 @@
         app/mkbd \
         srv/clip \
-        srv/loc \
+        srv/devmap \
         srv/devman \
         srv/loader \
@@ -79 +77 @@
         srv/bd/part/guid_part \
         srv/bd/part/mbr_part \
-        srv/fs/exfat \
         srv/fs/fat \
         srv/fs/tmpfs \
-        srv/fs/locfs \
+        srv/fs/devfs \
         srv/fs/ext2fs \
-        srv/hid/console \
+        srv/hid/adb_mouse \
+        srv/hid/char_mouse \
         srv/hid/s3c24xx_ts \
         srv/hid/fb \
-        srv/hid/input \
+        srv/hid/kbd \
         srv/hw/char/i8042 \
         srv/hw/char/s3c24xx_uart \
@@ -98 +96 @@
         srv/net/tl/tcp \
         srv/net/net \
-        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
+        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
 
 ## Networking
@@ -125 +123 @@
 #
 
+ifneq ($(UARCH),abs32le)
+        DIRS += srv/hid/console
+endif
+
 ifeq ($(UARCH),amd64)
         DIRS += \
-                drv/infrastructure/rootpc \
-                drv/bus/pci/pciintel \
-                drv/bus/isa \
-                drv/char/ns8250 \
+                drv/rootpc \
+                drv/pciintel \
+                drv/isa \
+                drv/ns8250 \
                 srv/hw/irc/apic \
                 srv/hw/irc/i8259
@@ -137 +139 @@
 ifeq ($(UARCH),ia32)
         DIRS += \
-                drv/infrastructure/rootpc \
-                drv/bus/pci/pciintel \
-                drv/bus/isa \
-                drv/char/ns8250 \
+                drv/rootpc \
+                drv/pciintel \
+                drv/isa \
+                drv/ns8250 \
                 srv/hw/irc/apic \
                 srv/hw/irc/i8259
@@ -146 +148 @@
 
 ifeq ($(UARCH),ppc32)
-        DIRS += \
-                drv/infrastructure/rootmac \
-                srv/hw/bus/cuda_adb
+        DIRS += srv/hw/bus/cuda_adb
 endif
 
 ifeq ($(UARCH),sparc64)
         DIRS += \
+                srv/hw/irc/fhc \
                 srv/hw/irc/obio
 endif
@@ -164 +165 @@
         lib/block \
         lib/clui \
-        lib/fmtutil \
-        lib/scsi \
         lib/softint \
         lib/softfloat \
         lib/drv \
         lib/packet \
-        lib/imgmap \
         lib/net \
         lib/ext2 \