Changeset 7bdcc45 in mainline for Makefile

Timestamp:

2010-12-16T16:38:49Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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) (4 diffs)

Makefile

@@ -28 +28 @@
 
 CSCOPE = cscope
+CHECK = tools/check.sh
 CONFIG = tools/config.py
 AUTOTOOL = tools/autotool.py
@@ -41 +42 @@
 CONFIG_HEADER = config.h
 
-.PHONY: all precheck cscope autotool config_default config distclean clean
+.PHONY: all precheck cscope autotool config_auto config_default config distclean clean check
 
 all: $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER)
@@ -55 +56 @@
         find kernel boot uspace -regex '^.*\.[chsS]$$' | xargs $(CSCOPE) -b -k -u -f$(CSCOPE).out
 
+# Pre-integration build check
+check: $(CHECK)
+ifdef JOBS 
+        $(CHECK) -j $(JOBS)
+else
+        $(CHECK)
+endif
+
 $(COMMON_MAKEFILE): autotool
 $(COMMON_HEADER): autotool
@@ -66 +75 @@
 
 config_default: $(CONFIG_RULES)
-        $(CONFIG) $< default
+ifeq ($(HANDS_OFF),y)
+        $(CONFIG) $< hands-off $(PROFILE)
+else
+        $(CONFIG) $< default $(PROFILE)
+endif
 
 config: $(CONFIG_RULES)