Changeset 5f70118 in mainline for uspace/Makefile

Timestamp:

2010-01-10T12:16:59Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c77a64f

Parents:

309ede1 (diff), 1ac3a52 (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:

Merge mainline changes.

File:

• uspace/Makefile (modified) (2 diffs)

uspace/Makefile

@@ -33 +33 @@
 
 DIRS = \
-        lib/libc \
-        lib/libfs \
-        lib/libblock \
-        lib/softint \
-        lib/softfloat \
+        app/bdsh \
+        app/edit \
+        app/getterm \
+        app/init \
+        app/klog \
+        app/mkfat \
+        app/redir \
+        app/tester \
+        app/tetris \
+        app/trace \
+        srv/clip \
+        srv/devmap \
+        srv/loader \
+        srv/ns \
+        srv/vfs \
         srv/bd/ata_bd \
         srv/bd/file_bd \
         srv/bd/gxe_bd \
         srv/bd/rd \
-        srv/ns \
-        srv/loader \
-        srv/fb \
-        srv/kbd \
-        srv/console \
+        srv/bd/part/mbr_part \
         srv/fs/fat \
         srv/fs/tmpfs \
         srv/fs/devfs \
-        srv/vfs \
-        srv/devmap \
-        srv/part/mbr_part \
-        app/tetris \
-        app/tester \
-        app/trace \
-        app/klog \
-        app/init \
-        app/getvc \
-        app/bdsh
+        srv/hid/console \
+        srv/hid/c_mouse \
+        srv/hid/fb \
+        srv/hid/kbd \
+        srv/hw/char/i8042
 
 ifeq ($(UARCH),amd64)
-        DIRS += srv/pci
+        DIRS += srv/hw/bus/pci
 endif
 
 ifeq ($(UARCH),ia32)
-        DIRS += srv/pci
+        DIRS += srv/hw/bus/pci
 endif
 
 ifeq ($(UARCH),sparc64)
         DIRS += \
-                srv/cir/fhc \
-                srv/cir/obio
+                srv/hw/cir/fhc \
+                srv/hw/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)
@@ -87 +98 @@
         -$(MAKE) -C $(basename $@) clean
 
-$(BUILDS):
-        $(MAKE) -C $(basename $@) all
+$(BUILDS): $(LIBC_BUILD) $(LIBS_BUILD)
+        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)
+
+$(LIBS_BUILD): $(LIBC_BUILD)
+        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)
+
+$(LIBC_BUILD):
+        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)