Changeset 040068c in mainline for Makefile

Timestamp:

2010-12-09T00:28:58Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

cdc1aa1

Parents:

818dc00 (diff), 0a5a950 (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 + minor changes

The marge with mainline includes the hands-off configure and merge with
our DDF fixes.

The virtual USB host controller is now under the virtual devices hierarchy
(the path is /virt/usbhc now).

File:

• Makefile (modified) (2 diffs)

Makefile

@@ -41 +41 @@
 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
 
 all: $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER)
@@ -66 +66 @@
 
 config_default: $(CONFIG_RULES)
-        $(CONFIG) $< default
+ifeq ($(HANDS_OFF),y)
+        $(CONFIG) $< hands-off $(PROFILE)
+else
+        $(CONFIG) $< default $(PROFILE)
+endif
 
 config: $(CONFIG_RULES)