Changeset 925a21e in mainline for Makefile

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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) (5 diffs)

Makefile

@@ -27 +27 @@
 #
 
+# Just for this Makefile. Sub-makes will run in parallel if requested.
+.NOTPARALLEL:
+
 CSCOPE = cscope
 CHECK = tools/check.sh
@@ -54 +57 @@
 
 cscope:
-        find kernel boot uspace -regex '^.*\.[chsS]$$' | xargs $(CSCOPE) -b -k -u -f$(CSCOPE).out
+        find abi kernel boot uspace -regex '^.*\.[chsS]$$' | xargs $(CSCOPE) -b -k -u -f$(CSCOPE).out
 
 # Pre-integration build check
@@ -66 +69 @@
 # Autotool (detects compiler features)
 
-$(COMMON_MAKEFILE): autotool
-$(COMMON_HEADER): autotool
-
-autotool: $(CONFIG_MAKEFILE)
+autotool $(COMMON_MAKEFILE) $(COMMON_HEADER): $(CONFIG_MAKEFILE)
         $(AUTOTOOL)
         -[ -f $(COMMON_HEADER_PREV) ] && diff -q $(COMMON_HEADER_PREV) $(COMMON_HEADER) && mv -f $(COMMON_HEADER_PREV) $(COMMON_HEADER)
@@ -75 +75 @@
 # Build-time configuration
 
-$(CONFIG_MAKEFILE): config_default
-$(CONFIG_HEADER): config_default
-
-config_default: $(CONFIG_RULES)
+config_default $(CONFIG_MAKEFILE) $(CONFIG_HEADER): $(CONFIG_RULES)
 ifeq ($(HANDS_OFF),y)
         $(CONFIG) $< hands-off $(PROFILE)
@@ -100 +97 @@
 distclean: clean
         rm -f $(CSCOPE).out $(COMMON_MAKEFILE) $(COMMON_HEADER) $(COMMON_HEADER_PREV) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) tools/*.pyc tools/checkers/*.pyc release/HelenOS-*
+        cd ./uspace/app/binutils/; ./distclean.sh
 
 clean: