Changes in uspace/Makefile [86554e7:c7dc8ad] in mainline

File:

• uspace/Makefile (modified) (4 diffs)

uspace/Makefile

@@ -33 +33 @@
 
 DIRS = \
-        lib/libc \
-        lib/libfs \
-        lib/libblock \
-        lib/softint \
-        lib/softfloat \
         srv/bd/ata_bd \
         srv/bd/file_bd \
@@ -52 +47 @@
         srv/vfs \
         srv/devmap \
+        srv/part/mbr_part \
+        app/edit \
         app/tetris \
-        app/shutters \
-        app/test_serial \
         app/tester \
         app/trace \
@@ -60 +55 @@
         app/init \
         app/getvc \
+        app/redir \
         app/bdsh
 
 ifeq ($(UARCH),amd64)
-        DIRS += \
-                srv/pci \
-                app/lspci
+        DIRS += srv/pci
 endif
 
 ifeq ($(UARCH),ia32)
-        DIRS += \
-                srv/pci \
-                app/lspci
+        DIRS += srv/pci
 endif
 
 ifeq ($(UARCH),sparc64)
         DIRS += \
-                srv/pci \
-                app/lspci \
                 srv/cir/fhc \
                 srv/cir/obio
 endif
 
+LIBC = lib/libc
+LIBS = \
+        lib/libfs \
+        lib/libblock \
+        lib/softint \
+        lib/softfloat
+
+LIBC_BUILD = $(addsuffix .build,$(LIBC))
+LIBS_BUILD = $(addsuffix .build,$(LIBS))
+
 BUILDS := $(addsuffix .build,$(DIRS))
-CLEANS := $(addsuffix .clean,$(DIRS))
+CLEANS := $(addsuffix .clean,$(DIRS)) $(addsuffix .clean,$(LIBS)) $(addsuffix .clean,$(LIBC))
 
-.PHONY: all $(BUILDS) $(CLEANS) clean
+.PHONY: all $(LIBC_BUILD) $(LIBS_BUILD) $(BUILDS) $(CLEANS) clean
 
-all: ../Makefile.config ../config.h ../config.defs $(BUILDS)
+all: $(BUILDS)
 
 clean: $(CLEANS)
@@ -94 +94 @@
         -$(MAKE) -C $(basename $@) clean
 
-$(BUILDS):
+$(BUILDS): $(LIBC_BUILD) $(LIBS_BUILD)
         $(MAKE) -C $(basename $@) all
+
+$(LIBS_BUILD): $(LIBC_BUILD)
+        $(MAKE) -C $(basename $@) all
+
+$(LIBC_BUILD):
+        $(MAKE) -C $(basename $@) all