Changeset b0f00a9 in mainline for uspace/Makefile

Timestamp:

2011-11-06T22:21:05Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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) (8 diffs)

uspace/Makefile

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