Changes in uspace/Makefile [48e3190:a047aaa] in mainline

File:

• uspace/Makefile (modified) (12 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/ext2info \
+        app/fontviewer \
         app/getterm \
+        app/hdisk \
         app/init \
         app/inet \
         app/kill \
         app/killall \
-        app/klog \
+        app/kio \
         app/loc \
+        app/logset \
+        app/mixerctl \
         app/mkfat \
         app/mkexfat \
         app/mkmfs \
+        app/modplay \
         app/nterm \
         app/redir \
@@ -62 +72 @@
         app/trace \
         app/top \
+        app/untar \
         app/usbinfo \
         app/vuhid \
         app/netecho \
+        app/netspeed \
         app/nettest1 \
         app/nettest2 \
         app/nettest3 \
+        app/nic \
         app/ping \
         app/sysinfo \
         app/mkbd \
-        app/websrv \
+        app/date \
         app/vdemo \
+        app/viewer \
         app/vlaunch \
         app/vterm \
+        app/df \
+        app/wavplay \
+        app/websrv \
+        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 \
         srv/net/udp \
@@ -87 +111 @@
         srv/taskmon \
         srv/vfs \
-        srv/bd/ata_bd \
         srv/bd/sata_bd \
         srv/bd/file_bd \
-        srv/bd/gxe_bd \
         srv/bd/rd \
         srv/bd/part/guid_part \
@@ -101 +123 @@
         srv/fs/mfs \
         srv/fs/locfs \
-        srv/fs/ext2fs \
         srv/fs/ext4fs \
         srv/hid/compositor \
@@ -111 +132 @@
         srv/hid/remcons \
         srv/hw/char/s3c24xx_uart \
-        drv/infrastructure/root \
-        drv/infrastructure/rootvirt \
+        srv/hid/rfb \
+        drv/audio/hdaudio \
+        drv/audio/sb16 \
+        drv/root/root \
+        drv/root/virt \
         drv/block/ahci \
+        drv/block/ata_bd \
         drv/char/i8042 \
+        drv/char/pl050 \
         drv/char/ps2mouse \
         drv/char/xtkbd \
@@ -133 +159 @@
         drv/nic/ne2k \
         drv/nic/e1k \
-        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
+        drv/nic/rtl8139 \
+        drv/nic/rtl8169 \
+        drv/platform/icp
 
 ## Platform-specific hardware support
 #
 
-ifeq ($(UARCH),amd64)
-        DIRS += \
-                drv/infrastructure/rootpc \
+ifeq ($(UARCH), $(filter $(UARCH),amd64 ia32 ia64))
+        DIRS += \
+                drv/platform/pc \
                 drv/bus/pci/pciintel \
                 drv/bus/isa \
                 drv/char/ns8250 \
+                drv/time/cmos-rtc \
                 srv/hw/irc/apic \
                 srv/hw/irc/i8259
 endif
 
-ifeq ($(UARCH),ia32)
-        DIRS += \
-                drv/infrastructure/rootpc \
+ifeq ($(UARCH), $(filter $(UARCH),mips32 mips32eb))
+        DIRS += \
+                drv/platform/malta \
                 drv/bus/pci/pciintel \
-                drv/bus/isa \
-                drv/char/ns8250 \
-                srv/hw/irc/apic \
-                srv/hw/irc/i8259
+                drv/bus/isa
 endif
 
 ifeq ($(UARCH),ppc32)
         DIRS += \
-                drv/infrastructure/rootmac \
+                drv/platform/mac \
                 drv/bus/pci/pciintel \
                 srv/hw/bus/cuda_adb
@@ -186 +194 @@
         DIRS += \
                 srv/hw/irc/obio
+endif
+
+ifeq ($(UARCH),arm32)
+        DIRS += \
+                drv/platform/amdm37x \
+                drv/fb/amdm37x_dispc \
+                srv/hw/irc/icp-ic
 endif
 
@@ -198 +213 @@
         lib/fmtutil \
         lib/scsi \
+        lib/compress \
         lib/softint \
         lib/softfloat \
@@ -203 +219 @@
         lib/graph \
         lib/gui \
+        lib/hound \
+        lib/http \
         lib/softrend \
         lib/draw \
+        lib/math \
         lib/net \
         lib/nic \
-        lib/ext2 \
         lib/ext4 \
+        lib/trackmod \
+        lib/uri \
         lib/usb \
         lib/usbhost \
@@ -214 +234 @@
         lib/usbhid \
         lib/usbvirt \
-        lib/posix
+        lib/pcm \
+        lib/pcut \
+        lib/bithenge \
+        lib/posix \
+        lib/mbr \
+        lib/gpt
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))
@@ -220 +245 @@
 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))
@@ -225 +251 @@
 .PHONY: all $(LIBC_BUILD) $(LIBS_BUILD) $(LIBN_BUILD) $(BUILDS) $(CLEANS) clean
 
-all: $(BUILDS)
+all: $(BUILDS) $(BUILDS_TESTS)
+
+$(BUILDS_TESTS): $(BUILDS)
+        $(MAKE) -C $(basename $@) all-test PRECHECK=$(PRECHECK)
 
 clean: $(CLEANS)