Changes in uspace/Makefile [53b9f2c:b446b02] in mainline

File:

• uspace/Makefile (modified) (8 diffs)

uspace/Makefile

@@ -135 +135 @@
         srv/hid/remcons \
         srv/hw/char/s3c24xx_uart \
+        srv/hw/irc/obio \
         srv/hid/rfb \
         drv/audio/hdaudio \
@@ -143 +144 @@
         drv/block/ata_bd \
         drv/block/ddisk \
-        drv/block/usbmast \
         drv/bus/adb/cuda_adb \
         drv/bus/isa \
@@ -151 +151 @@
         drv/bus/usb/uhci \
         drv/bus/usb/usbflbk \
+        drv/bus/usb/usbhid \
         drv/bus/usb/usbhub \
+        drv/bus/usb/usbmast \
         drv/bus/usb/usbmid \
         drv/bus/usb/vhc \
         drv/char/i8042 \
-        drv/char/msim-con \
         drv/char/ns8250 \
         drv/char/pl050 \
-        drv/char/ski-con \
-        drv/char/sun4v-con \
+        drv/char/ps2mouse \
+        drv/char/atkbd \
+        drv/char/xtkbd \
+        drv/test/test1 \
+        drv/test/test2 \
+        drv/test/test3 \
         drv/fb/amdm37x_dispc \
         drv/fb/kfb \
-        drv/hid/atkbd \
-        drv/hid/ps2mouse \
-        drv/hid/usbhid \
-        drv/hid/xtkbd \
         drv/intctl/apic \
         drv/intctl/i8259 \
         drv/intctl/icp-ic \
-        drv/intctl/obio \
         drv/nic/ne2k \
         drv/nic/e1k \
@@ -181 +181 @@
         drv/platform/msim \
         drv/platform/pc \
-        drv/platform/ski \
-        drv/platform/sun4v \
-        drv/test/test1 \
-        drv/test/test2 \
-        drv/test/test3 \
         drv/time/cmos-rtc
 
@@ -205 +200 @@
 #
 
-BASE_LIBS = \
-        lib/c \
-        lib/softint \
-        lib/softfloat
-
+LIBC = lib/c
 LIBS = \
         lib/fs \
@@ -220 +211 @@
         lib/scsi \
         lib/compress \
+        lib/softint \
+        lib/softfloat \
         lib/drv \
         lib/graph \
@@ -229 +222 @@
         lib/label \
         lib/math \
-        lib/minix \
         lib/nettl \
         lib/nic \
@@ -246 +238 @@
         lib/ieee80211
 
-BASE_BUILDS := $(addsuffix .build,$(BASE_LIBS))
-BUILDS := $(addsuffix .build,$(DIRS) $(LIBS))
-BUILDS_TESTS := $(addsuffix .build-test,$(DIRS) $(LIBS) $(BASE_LIBS))
-DEPS = $(addsuffix /deps.mk,$(DIRS) $(LIBS))
-CLEANS := $(addsuffix .clean,$(DIRS) $(LIBS) $(BASE_LIBS))
-
-.PHONY: all $(BASE_BUILDS) $(BUILDS) $(BUILDS_TESTS) $(CLEANS) clean
+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))
+
+.PHONY: all $(LIBC_BUILD) $(LIBS_BUILD) $(LIBN_BUILD) $(BUILDS) $(CLEANS) clean
 
 all: $(BUILDS) $(BUILDS_TESTS)
 
-$(BUILDS_TESTS): $(BASE_BUILDS) $(BUILDS)
+$(BUILDS_TESTS): $(LIBC_BUILD) $(LIBS_BUILD) $(LIBN_BUILD)
         $(MAKE) -r -C $(basename $@) all-test PRECHECK=$(PRECHECK)
 
 clean: $(CLEANS)
-        find lib app drv srv -name '*.o' -follow -exec rm \{\} \;
-        find lib app drv srv -name '*.lo' -follow -exec rm \{\} \;
-        find lib app drv srv -name '*.d' -follow -exec rm \{\} \;
 
 $(CLEANS):
-        -$(MAKE) -r -C $(basename $@) fasterclean
-
-$(BASE_BUILDS) $(BUILDS):
-        $(MAKE) -r -C $(basename $@) all PRECHECK=$(PRECHECK)
-
-$(DEPS): %/deps.mk: %/Makefile
-        $(MAKE) -r -C $(@D) deps.mk SELF_TARGET="$(@D).build"
-
-# Special case for base libraries.
-lib/c.build: lib/softfloat.build lib/softint.build
-
-$(BUILDS): $(BASE_BUILDS)
-
--include $(DEPS)
-
+        -$(MAKE) -r -C $(basename $@) clean
+
+$(BUILDS): $(LIBC_BUILD) $(LIBS_BUILD) $(LIBN_BUILD)
+        $(MAKE) -r -C $(basename $@) all PRECHECK=$(PRECHECK)
+
+$(LIBN_BUILD): $(LIBC_BUILD) $(LIBS_BUILD)
+        $(MAKE) -r -C $(basename $@) all PRECHECK=$(PRECHECK)
+
+$(LIBS_BUILD): $(LIBC_BUILD)
+        $(MAKE) -r -C $(basename $@) all PRECHECK=$(PRECHECK)
+
+$(LIBC_BUILD):
+        $(MAKE) -r -C $(basename $@) all PRECHECK=$(PRECHECK)