Changeset 0837ab4 in mainline for Makefile

Timestamp:

2011-07-27T01:59:44Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

4912d01a

Parents:

80e9e5e (diff), 056d6821 (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 binutils changes.

File:

• Makefile (modified) (2 diffs)

Makefile

@@ -66 +66 @@
 # 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 +72 @@
 # 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)