Changes in uspace/Makefile [ffdd2b9:b73c26d] in mainline

File:

• uspace/Makefile (modified) (5 diffs)

uspace/Makefile

@@ -27 +27 @@
 #
 
--include ../Makefile.common
+## Include configuration
+#
+
 -include ../Makefile.config
-
-## Common binaries
-#
 
 DIRS = \
@@ -41 +40 @@
         app/mkfat \
         app/redir \
-        app/sbi \
-        app/stats \
         app/taskdump \
-        app/tasks \
         app/tester \
         app/tetris \
         app/trace \
-        app/top \
-        app/netecho \
-        app/nettest1 \
-        app/nettest2 \
-        app/ping \
         srv/clip \
         srv/devmap \
-        srv/devman \
         srv/loader \
         srv/ns \
@@ -70 +60 @@
         srv/fs/devfs \
         srv/hid/adb_mouse \
+        srv/hid/console \
         srv/hid/char_mouse \
-        srv/hid/s3c24xx_ts \
         srv/hid/fb \
         srv/hid/kbd \
-        srv/hw/char/i8042 \
-        srv/hw/char/s3c24xx_uart \
-        srv/hw/netif/dp8390 \
-        srv/net/cfg \
-        srv/net/netif/lo \
-        srv/net/il/arp \
-        srv/net/il/ip \
-        srv/net/tl/icmp \
-        srv/net/tl/udp \
-        srv/net/tl/tcp \
-        srv/net/net \
-        drv/root
-
-## Networking
-#
-
-ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
-        LIBN = \
-                srv/net/nil/eth \
-                srv/net/nil/nildummy
-else
-        DIRS += \
-                srv/net/nil/eth \
-                srv/net/nil/nildummy
-endif
-
-## Platform-specific hardware support
-#
-
-ifneq ($(UARCH),abs32le)
-        DIRS += srv/hid/console
-endif
+        srv/hw/char/i8042
 
 ifeq ($(UARCH),amd64)
+        DIRS += srv/hw/bus/pci
 endif
 
 ifeq ($(UARCH),ia32)
-        DIRS += drv/rootia32
-        DIRS += drv/pciintel
-        DIRS += drv/isa
-        DIRS += drv/ns8250
+        DIRS += srv/hw/bus/pci
 endif
 
@@ -127 +84 @@
 endif
 
-## System libraries
-#
-
-LIBC = lib/c
+LIBC = lib/libc
 LIBS = \
-        lib/fs \
-        lib/block \
-        lib/clui \
+        lib/libfs \
+        lib/libblock \
         lib/softint \
         lib/softfloat \
-        lib/drv \
-        lib/packet \
-        lib/net
+
+ifeq ($(UARCH),amd64)
+        LIBS += lib/libpci
+endif
+
+ifeq ($(UARCH),ia32)
+        LIBS += lib/libpci
+endif
+
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))
 LIBS_BUILD = $(addsuffix .build,$(LIBS))
-LIBN_BUILD = $(addsuffix .build,$(LIBN))
+
 BUILDS := $(addsuffix .build,$(DIRS))
+CLEANS := $(addsuffix .clean,$(DIRS)) $(addsuffix .clean,$(LIBS)) $(addsuffix .clean,$(LIBC))
 
-CLEANS := $(addsuffix .clean,$(DIRS)) $(addsuffix .clean,$(LIBN)) $(addsuffix .clean,$(LIBS)) $(addsuffix .clean,$(LIBC))
-
-.PHONY: all $(LIBC_BUILD) $(LIBS_BUILD) $(LIBN_BUILD) $(BUILDS) $(CLEANS) clean
+.PHONY: all $(LIBC_BUILD) $(LIBS_BUILD) $(BUILDS) $(CLEANS) clean
 
 all: $(BUILDS)
@@ -157 +115 @@
         -$(MAKE) -C $(basename $@) clean
 
-$(BUILDS): $(LIBC_BUILD) $(LIBS_BUILD) $(LIBN_BUILD)
-        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)
-
-$(LIBN_BUILD): $(LIBC_BUILD) $(LIBS_BUILD)
+$(BUILDS): $(LIBC_BUILD) $(LIBS_BUILD)
         $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)