Changeset 26e7d6d in mainline for uspace/Makefile

Timestamp:

2011-09-19T16:31:00Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a347a11

Parents:

3842a955 (diff), 086290d (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) (10 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 \
+        app/mkmfs \
         app/redir \
         app/sbi \
+        app/sportdmp \
         app/stats \
         app/taskdump \
@@ -65 +69 @@
         app/mkbd \
         srv/clip \
-        srv/devmap \
+        srv/loc \
         srv/devman \
         srv/loader \
@@ -77 +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/fs/mfs \
+        srv/fs/locfs \
         srv/fs/ext2fs \
-        srv/hid/adb_mouse \
-        srv/hid/char_mouse \
+        srv/hid/console \
         srv/hid/s3c24xx_ts \
         srv/hid/fb \
@@ -96 +102 @@
         srv/net/tl/tcp \
         srv/net/net \
-        drv/root \
-        drv/rootvirt \
-        drv/test1 \
-        drv/test2 \
-        drv/test3 \
-        drv/ehci \
-        drv/ohci \
-        drv/uhci \
-        drv/uhcirh \
-        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
+
+ifeq ($(CONFIG_PCC),y)
+DIRS += \
+        app/cc \
+        app/ccom \
+        app/ccom/mkext \
+        app/cpp
+endif
+
+ifeq ($(CONFIG_BINUTILS),y)
+DIRS += \
+        app/binutils
+endif
 
 ## Networking
@@ -123 +142 @@
 #
 
-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
@@ -139 +154 @@
 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
@@ -148 +163 @@
 
 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
@@ -165 +181 @@
         lib/block \
         lib/clui \
+        lib/fmtutil \
+        lib/scsi \
         lib/softint \
         lib/softfloat \
         lib/drv \
         lib/packet \
+        lib/fb \
         lib/net \
         lib/ext2 \
@@ -175 +194 @@
         lib/usbdev \
         lib/usbhid \
-        lib/usbvirt
+        lib/usbvirt \
+        lib/posix
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))