Changes in uspace/Makefile [e5291e0:3f10d92] in mainline

File:

• uspace/Makefile (modified) (8 diffs)

uspace/Makefile

@@ -35 +35 @@
 DIRS = \
         app/bdsh \
-        app/blkdump \
-        app/bnchmark \
-        app/devctl \
         app/edit \
-        app/ext2info \
         app/getterm \
         app/init \
@@ -45 +41 @@
         app/killall \
         app/klog \
-        app/locinfo \
-        app/lsusb \
         app/mkfat \
-        app/mkmfs \
         app/redir \
         app/sbi \
-        app/sportdmp \
         app/stats \
         app/taskdump \
         app/tester \
-        app/testread \
         app/tetris \
         app/trace \
         app/top \
-        app/usbinfo \
-        app/vuhid \
         app/netecho \
         app/nettest1 \
@@ -67 +56 @@
         app/websrv \
         app/sysinfo \
-        app/mkbd \
         srv/clip \
-        srv/loc \
+        srv/devmap \
         srv/devman \
         srv/loader \
@@ -81 +69 @@
         srv/bd/part/guid_part \
         srv/bd/part/mbr_part \
-        srv/fs/exfat \
         srv/fs/fat \
-        srv/fs/cdfs \
         srv/fs/tmpfs \
-        srv/fs/mfs \
-        srv/fs/locfs \
-        srv/fs/ext2fs \
-        srv/hid/console \
+        srv/fs/devfs \
+        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 \
+        srv/hw/netif/ne2000 \
+        srv/net/netif/lo \
         srv/net/il/arp \
         srv/net/il/ip \
@@ -99 +86 @@
         srv/net/tl/udp \
         srv/net/tl/tcp \
+        srv/net/net \
+        drv/root \
+        drv/rootvirt \
+        drv/test1 \
+        drv/test2
+
+## Networking
+#
+
+DIRS += \
         srv/net/nil/eth \
-        srv/net/nil/nildummy \
-        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/vhc \
-        drv/nic/lo \
-        drv/nic/ne2k
-
-ifeq ($(CONFIG_PCC),y)
-DIRS += \
-        app/cc \
-        app/ccom \
-        app/ccom/mkext \
-        app/cpp
-endif
-
-ifeq ($(CONFIG_BINUTILS),y)
-DIRS += \
-        app/binutils
-endif
+        srv/net/nil/nildummy
 
 ## Platform-specific hardware support
 #
 
+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
@@ -148 +118 @@
 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
@@ -157 +127 @@
 
 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
@@ -175 +144 @@
         lib/block \
         lib/clui \
-        lib/fmtutil \
-        lib/scsi \
         lib/softint \
         lib/softfloat \
         lib/drv \
-        lib/fb \
-        lib/net \
-        lib/nic \
-        lib/ext2 \
-        lib/usb \
-        lib/usbhost \
-        lib/usbdev \
-        lib/usbhid \
-        lib/usbvirt \
-        lib/posix
+        lib/packet \
+        lib/net
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))