Changeset 1787e527 in mainline for uspace/Makefile

Timestamp:

2009-11-16T21:22:54Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5ebdf94

Parents:

fcbd1be (diff), 9c70ed6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merged with head (unstable)

File:

• uspace/Makefile (modified) (5 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 \
@@ -60 +57 @@
         app/init \
         app/getvc \
+        app/redir \
         app/bdsh
 
@@ -82 +80 @@
 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 +102 @@
         -$(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