Changes in uspace/Makefile [01579ad:75fe97b] in mainline

File:

• uspace/Makefile (modified) (10 diffs)

uspace/Makefile

@@ -44 +44 @@
         app/download \
         app/edit \
+        app/fontviewer \
         app/getterm \
         app/hdisk \
@@ -77 +78 @@
         app/nettest2 \
         app/nettest3 \
+        app/nic \
         app/ping \
         app/sysinfo \
@@ -130 +132 @@
         srv/hid/rfb \
         drv/audio/sb16 \
-        drv/infrastructure/root \
-        drv/infrastructure/rootvirt \
+        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 \
@@ -153 +156 @@
         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
@@ -178 +165 @@
 ifeq ($(UARCH), $(filter $(UARCH),amd64 ia32 ia64))
         DIRS += \
-                drv/infrastructure/rootpc \
+                drv/platform/pc \
                 drv/bus/pci/pciintel \
                 drv/bus/isa \
@@ -189 +176 @@
 ifeq ($(UARCH), $(filter $(UARCH),mips32 mips32eb))
         DIRS += \
-                drv/infrastructure/rootmalta \
+                drv/platform/malta \
                 drv/bus/pci/pciintel \
                 drv/bus/isa
@@ -196 +183 @@
 ifeq ($(UARCH),ppc32)
         DIRS += \
-                drv/infrastructure/rootmac \
+                drv/platform/mac \
                 drv/bus/pci/pciintel \
                 srv/hw/bus/cuda_adb
@@ -208 +195 @@
 ifeq ($(UARCH),arm32)
         DIRS += \
-                drv/infrastructure/rootamdm37x \
-                drv/fb/amdm37x_dispc
+                drv/platform/amdm37x \
+                drv/fb/amdm37x_dispc \
+                srv/hw/irc/icp-ic
 endif
 
@@ -247 +235 @@
         lib/gpt
 
-ifeq ($(CONFIG_PCUT_TESTS),y)
-        LIBS += lib/pcut
-endif
-
 LIBC_BUILD = $(addsuffix .build,$(LIBC))
 LIBS_BUILD = $(addsuffix .build,$(LIBS))
 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))
@@ -261 +244 @@
 .PHONY: all $(LIBC_BUILD) $(LIBS_BUILD) $(LIBN_BUILD) $(BUILDS) $(CLEANS) clean
 
-all: $(BUILDS) $(BUILDS_TESTS)
-
-$(BUILDS_TESTS): $(BUILDS)
-        $(MAKE) -C $(basename $@) all-test PRECHECK=$(PRECHECK)
+all: $(BUILDS)
 
 clean: $(CLEANS)