Changeset 5f70118 in mainline for 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:

• Makefile (modified) (1 diff)

Makefile

@@ -30 +30 @@
 #
 
-.PHONY: all config distclean clean cscope
+CSCOPE = cscope
+CONFIG = tools/config.py
+
+.PHONY: all config config_default distclean clean cscope precheck
 
 all: Makefile.config config.h config.defs
-        $(MAKE) -C kernel
-        $(MAKE) -C uspace
-        $(MAKE) -C boot
+        $(MAKE) -C kernel PRECHECK=$(PRECHECK)
+        $(MAKE) -C uspace PRECHECK=$(PRECHECK)
+        $(MAKE) -C boot PRECHECK=$(PRECHECK)
 
-Makefile.config config.h config.defs: HelenOS.config
-        tools/config.py HelenOS.config default
+precheck: clean
+        $(MAKE) all PRECHECK=y
 
-config:
-        tools/config.py HelenOS.config
+cscope:
+        find kernel boot uspace -regex '^.*\.[chsS]$$' | xargs $(CSCOPE) -b -k -u -f$(CSCOPE).out
+
+Makefile.config: config_default
+
+config.h: config_default
+
+config.defs: config_default
+
+config_default: HelenOS.config
+        $(CONFIG) HelenOS.config default
+
+config: HelenOS.config
+        $(CONFIG) HelenOS.config
 
 distclean: clean
-        rm -f Makefile.config config.h config.defs tools/*.pyc
+        rm -f $(CSCOPE).out Makefile.config config.h config.defs tools/*.pyc
 
 clean:
-        -$(MAKE) -C kernel clean
-        -$(MAKE) -C uspace clean
-        -$(MAKE) -C boot clean
-
-cscope:
-        find kernel boot uspace -regex '^.*\.[chsS]$$' -print > srclist
-        rm -f cscope.out
-        cscope -bi srclist
+        $(MAKE) -C kernel clean
+        $(MAKE) -C uspace clean
+        $(MAKE) -C boot clean