Changes in uspace/Makefile [405b67c:1d24ad3] in mainline

File:

• uspace/Makefile (modified) (15 diffs)

uspace/Makefile

@@ -34 +34 @@
 
 DIRS = \
-        app/barber \
         app/bdsh \
         app/bithenge \
         app/blkdump \
         app/bnchmark \
-        app/corecfg \
         app/devctl \
         app/dnscfg \
         app/dnsres \
-        app/download \
         app/edit \
-        app/fdisk \
-        app/fontviewer \
         app/getterm \
         app/init \
@@ -52 +47 @@
         app/kill \
         app/killall \
-        app/kio \
+        app/klog \
         app/loc \
         app/logset \
-        app/mixerctl \
         app/mkfat \
         app/mkexfat \
         app/mkmfs \
-        app/modplay \
-        app/netecho \
         app/nterm \
         app/redir \
-        app/rcutest \
-        app/rcubench \
         app/sbi \
         app/sportdmp \
@@ -75 +65 @@
         app/trace \
         app/top \
-        app/untar \
         app/usbinfo \
         app/vuhid \
-        app/nic \
+        app/netecho \
+        app/nettest1 \
+        app/nettest2 \
+        app/nettest3 \
         app/ping \
+        app/ping6 \
         app/sysinfo \
-        app/sysinst \
         app/mkbd \
         app/date \
-        app/vcalc \
+        app/websrv \
         app/vdemo \
-        app/viewer \
         app/vlaunch \
         app/vterm \
-        app/df \
-        app/wavplay \
-        app/websrv \
-        app/wifi_supplicant \
-        srv/audio/hound \
         srv/clipboard \
         srv/locsrv \
         srv/logger \
-        srv/klog \
         srv/devman \
         srv/loader \
-        srv/net/dhcp \
         srv/net/dnsrsrv \
         srv/net/ethip \
         srv/net/inetsrv \
         srv/net/loopip \
-        srv/net/nconfsrv \
         srv/net/slip \
         srv/net/tcp \
@@ -115 +98 @@
         srv/bd/file_bd \
         srv/bd/rd \
-        srv/bd/vbd \
+        srv/bd/part/guid_part \
+        srv/bd/part/mbr_part \
         srv/fs/exfat \
         srv/fs/udf \
@@ -124 +108 @@
         srv/fs/locfs \
         srv/fs/ext4fs \
-        srv/volsrv \
         srv/hid/compositor \
         srv/hid/console \
@@ -133 +116 @@
         srv/hid/remcons \
         srv/hw/char/s3c24xx_uart \
-        srv/hid/rfb \
-        drv/audio/hdaudio \
-        drv/audio/sb16 \
-        drv/root/root \
-        drv/root/virt \
+        drv/infrastructure/root \
+        drv/infrastructure/rootvirt \
         drv/block/ahci \
         drv/block/ata_bd \
-        drv/block/ddisk \
         drv/char/i8042 \
-        drv/char/pl050 \
         drv/char/ps2mouse \
-        drv/char/atkbd \
         drv/char/xtkbd \
         drv/test/test1 \
@@ -153 +130 @@
         drv/bus/usb/ohci \
         drv/bus/usb/uhci \
+        drv/bus/usb/uhcirh \
         drv/bus/usb/usbflbk \
         drv/bus/usb/usbhid \
@@ -161 +139 @@
         drv/nic/ne2k \
         drv/nic/e1k \
-        drv/nic/rtl8139 \
-        drv/nic/rtl8169 \
-        drv/nic/ar9271 \
-        drv/platform/icp
+        drv/nic/rtl8139
+
+ifeq ($(CONFIG_PCC),y)
+DIRS += \
+        app/cc \
+        app/ccom \
+        app/ccom/mkext \
+        app/cpp
+endif
+
+ifeq ($(CONFIG_BINUTILS),y)
+DIRS += \
+        app/binutils
+endif
+
+ifeq ($(CONFIG_MSIM),y)
+DIRS += \
+        app/msim
+endif
 
 ## Platform-specific hardware support
 #
 
-ifeq ($(UARCH), $(filter $(UARCH),amd64 ia32 ia64))
-        DIRS += \
-                drv/platform/pc \
+ifeq ($(UARCH),amd64)
+        DIRS += \
+                drv/infrastructure/rootpc \
                 drv/bus/pci/pciintel \
                 drv/bus/isa \
@@ -180 +173 @@
 endif
 
-ifeq ($(UARCH), $(filter $(UARCH),mips32 mips32eb))
-ifeq ($(MACHINE),msim)
-        DIRS += \
-                drv/platform/msim
-else
-        DIRS += \
-                drv/platform/malta \
+ifeq ($(UARCH),ia32)
+        DIRS += \
+                drv/infrastructure/rootpc \
                 drv/bus/pci/pciintel \
-                drv/bus/isa
-endif
+                drv/bus/isa \
+                drv/char/ns8250 \
+                drv/time/cmos-rtc \
+                srv/hw/irc/apic \
+                srv/hw/irc/i8259
 endif
 
 ifeq ($(UARCH),ppc32)
         DIRS += \
-                drv/platform/mac \
+                drv/infrastructure/rootmac \
                 drv/bus/pci/pciintel \
                 srv/hw/bus/cuda_adb
@@ -202 +194 @@
         DIRS += \
                 srv/hw/irc/obio
-ifeq ($(MACHINE),generic)
-        DIRS += \
-                drv/platform/sun4u \
-                drv/bus/pci/pciintel \
-                drv/bus/isa \
-                drv/char/ns8250
-endif
 endif
 
 ifeq ($(UARCH),arm32)
         DIRS += \
-                drv/platform/amdm37x \
-                drv/fb/amdm37x_dispc \
-                srv/hw/irc/icp-ic
-endif
-
-## Dynamic linking tests
-#
-ifeq ($(CONFIG_BUILD_SHARED_LIBS),y)
-        DIRS += \
-                app/dltest \
-                app/dltests
+                drv/infrastructure/rootamdm37x \
+                drv/fb/amdm37x_dispc
 endif
 
@@ -233 +209 @@
         lib/fs \
         lib/block \
-        lib/crypto \
         lib/clui \
-        lib/dltest \
-        lib/fdisk \
         lib/fmtutil \
         lib/scsi \
-        lib/compress \
         lib/softint \
         lib/softfloat \
@@ -245 +217 @@
         lib/graph \
         lib/gui \
-        lib/hound \
-        lib/http \
         lib/softrend \
         lib/draw \
-        lib/label \
-        lib/math \
-        lib/nettl \
+        lib/net \
         lib/nic \
         lib/ext4 \
-        lib/trackmod \
-        lib/uri \
         lib/usb \
         lib/usbhost \
@@ -261 +227 @@
         lib/usbhid \
         lib/usbvirt \
-        lib/pcm \
-        lib/pcut \
         lib/bithenge \
-        lib/posix \
-        lib/ieee80211
+        lib/posix
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))
@@ -271 +234 @@
 LIBN_BUILD = $(addsuffix .build,$(LIBN))
 BUILDS := $(addsuffix .build,$(DIRS))
-BUILDS_TESTS := $(addsuffix .build-test,$(DIRS) $(LIBS) lib/c)
 
 CLEANS := $(addsuffix .clean,$(DIRS)) $(addsuffix .clean,$(LIBN)) $(addsuffix .clean,$(LIBS)) $(addsuffix .clean,$(LIBC))
@@ -277 +239 @@
 .PHONY: all $(LIBC_BUILD) $(LIBS_BUILD) $(LIBN_BUILD) $(BUILDS) $(CLEANS) clean
 
-all: $(BUILDS) $(BUILDS_TESTS)
-
-$(BUILDS_TESTS): $(LIBC_BUILD) $(LIBS_BUILD) $(LIBN_BUILD)
-        $(MAKE) -C $(basename $@) all-test PRECHECK=$(PRECHECK)
+all: $(BUILDS)
 
 clean: $(CLEANS)