Changes in uspace/Makefile [63f8966:c7dc8ad] in mainline

File:

• uspace/Makefile (modified) (2 diffs)

uspace/Makefile

@@ -27 +27 @@
 #
 
--include ../Makefile.common
+## Include configuration
+#
+
 -include ../Makefile.config
 
-## Common binaries
-#
-
 DIRS = \
-        app/bdsh \
-        app/edit \
-        app/getterm \
-        app/init \
-        app/klog \
-        app/mkfat \
-        app/redir \
-        app/taskdump \
-        app/tester \
-        app/tetris \
-        app/trace \
-        srv/clip \
-        srv/devmap \
-        srv/loader \
-        srv/ns \
-        srv/taskmon \
-        srv/vfs \
         srv/bd/ata_bd \
         srv/bd/file_bd \
         srv/bd/gxe_bd \
         srv/bd/rd \
-        srv/bd/part/guid_part \
-        srv/bd/part/mbr_part \
+        srv/ns \
+        srv/loader \
+        srv/fb \
+        srv/kbd \
+        srv/console \
         srv/fs/fat \
         srv/fs/tmpfs \
         srv/fs/devfs \
-        srv/hid/adb_mouse \
-        srv/hid/char_mouse \
-        srv/hid/fb \
-        srv/hid/kbd \
-        srv/hw/char/i8042
-
-## Platform-specific hardware support
-#
-
-ifneq ($(UARCH),abs32le)
-        DIRS += srv/hid/console
-endif
+        srv/vfs \
+        srv/devmap \
+        srv/part/mbr_part \
+        app/edit \
+        app/tetris \
+        app/tester \
+        app/trace \
+        app/klog \
+        app/init \
+        app/getvc \
+        app/redir \
+        app/bdsh
 
 ifeq ($(UARCH),amd64)
-        DIRS += srv/hw/bus/pci
+        DIRS += srv/pci
 endif
 
 ifeq ($(UARCH),ia32)
-        DIRS += srv/hw/bus/pci
-endif
-
-ifeq ($(UARCH),ppc32)
-        DIRS += srv/hw/bus/cuda_adb
+        DIRS += srv/pci
 endif
 
 ifeq ($(UARCH),sparc64)
         DIRS += \
-                srv/hw/cir/fhc \
-                srv/hw/cir/obio
+                srv/cir/fhc \
+                srv/cir/obio
 endif
 
-## Networking
-#
-
-ifeq ($(CONFIG_NETIF_DP8390),y)
-        DIRS += srv/net/netif/dp8390
-endif
-
-NETWORKING_COMMON = \
-        srv/net/netif/lo \
-        srv/net/nil/eth \
-        srv/net/nil/nildummy \
-        srv/net/net \
-        srv/net/net/start \
-        srv/net/socket \
-        srv/net/app/echo \
-        srv/net/app/ping \
-        srv/net/app/nettest1 \
-        srv/net/app/nettest2
-
-NETWORKING_MODULAR = \
-        srv/net/il/arp \
-        srv/net/il/ip \
-        srv/net/tl/icmp \
-        srv/net/tl/udp \
-        srv/net/tl/tcp
-
-## System libraries
-#
-
-LIBC = lib/c
+LIBC = lib/libc
 LIBS = \
-        lib/fs \
-        lib/block \
+        lib/libfs \
+        lib/libblock \
         lib/softint \
-        lib/softfloat \
-
-ifeq ($(UARCH),amd64)
-        LIBS += lib/pci
-endif
-
-ifeq ($(UARCH),ia32)
-        LIBS += lib/pci
-endif
-
+        lib/softfloat
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))
 LIBS_BUILD = $(addsuffix .build,$(LIBS))
 
-ifeq ($(CONFIG_NETWORKING),modular)
-        BUILDS := $(addsuffix .build,$(DIRS)) $(addsuffix .build,$(NETWORKING_COMMON)) $(addsuffix .build,$(NETWORKING_MODULAR))
-endif
-
-ifeq ($(CONFIG_NETWORKING),module)
-        BUILDS := $(addsuffix .build,$(DIRS)) $(addsuffix .build,$(NETWORKING_COMMON))
-endif
-
-ifeq ($(CONFIG_NETWORKING),none)
-        BUILDS := $(addsuffix .build,$(DIRS))
-endif
-
-CLEANS := $(addsuffix .clean,$(DIRS)) $(addsuffix .clean,$(NETWORKING_COMMON)) $(addsuffix .clean,$(NETWORKING_MODULAR)) $(addsuffix .clean,$(LIBS)) $(addsuffix .clean,$(LIBC))
+BUILDS := $(addsuffix .build,$(DIRS))
+CLEANS := $(addsuffix .clean,$(DIRS)) $(addsuffix .clean,$(LIBS)) $(addsuffix .clean,$(LIBC))
 
 .PHONY: all $(LIBC_BUILD) $(LIBS_BUILD) $(BUILDS) $(CLEANS) clean
@@ -163 +95 @@
 
 $(BUILDS): $(LIBC_BUILD) $(LIBS_BUILD)
-        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)
+        $(MAKE) -C $(basename $@) all
 
 $(LIBS_BUILD): $(LIBC_BUILD)
-        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)
+        $(MAKE) -C $(basename $@) all
 
 $(LIBC_BUILD):
-        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)
+        $(MAKE) -C $(basename $@) all