From 5ef9e52b8e370677df4fbe69b94c5cfd59bb5a8a Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Fri, 27 Jul 2007 14:57:34 +0000 Subject: [PATCH] - fix directory dependencies - BASE_TARGET depends on dirs --- Makefile | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index c90c5f2f03..8cf0888211 100644 --- a/Makefile +++ b/Makefile @@ -210,14 +210,17 @@ TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS)) # all targets depend on the crosscompiler and it's prerequisites $(TARGETS): $(BASE_TARGETS) -world: $(DL_DIR) $(BUILD_DIR) $(PROJECT_BUILD_DIR) \ - $(BINARIES_DIR) $(STAGING_DIR) $(TARGET_DIR) bsp $(TARGETS) -dirs: $(DL_DIR) $(BUILD_DIR) $(PROJECT_BUILD_DIR) $(STAGING_DIR) +dirs: $(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \ + $(BINARIES_DIR) $(PROJECT_BUILD_DIR) +$(BASE_TARGETS): dirs +world: dirs target-host-info $(TARGETS) -.PHONY: all world dirs clean dirclean distclean source bsp $(TARGETS) \ + +.PHONY: all world dirs clean dirclean distclean source target-host-info \ + $(BASE_TARGETS) $(TARGETS) \ $(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) \ - $(DL_DIR) $(BUILD_DIR) $(TOOL_BUILD_DIR) $(STAGING_DIR) \ - $(PROJECT_BUILD_DIR) $(BINARIES_DIR) + $(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \ + $(BINARIES_DIR) $(PROJECT_BUILD_DIR) ############################################################# # @@ -225,8 +228,8 @@ dirs: $(DL_DIR) $(BUILD_DIR) $(PROJECT_BUILD_DIR) $(STAGING_DIR) # dependencies anywhere else # ############################################################# -$(DL_DIR) $(BUILD_DIR) $(TOOL_BUILD_DIR) \ - $(PROJECT_BUILD_DIR) $(BINARIES_DIR) : +$(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) \ + $(PROJECT_BUILD_DIR) $(BINARIES_DIR): @mkdir -p $@ $(STAGING_DIR): @@ -242,7 +245,7 @@ else endif @mkdir -p $(STAGING_DIR)/usr/include -$(TARGET_DIR): +$(TARGET_DIR): $(STAGING_DIR) mkdir -p $(TARGET_DIR) if [ -d "$(TARGET_SKELETON)" ] ; then \ cp -fa $(TARGET_SKELETON)/* $(TARGET_DIR)/; \ @@ -251,7 +254,7 @@ $(TARGET_DIR): -find $(TARGET_DIR) -type d -name CVS | xargs rm -rf -find $(TARGET_DIR) -type d -name .svn | xargs rm -rf -bsp: $(TARGET_DIR)/etc/issue $(TARGET_DIR)/etc/hostname +target-host-info: dirs $(TARGET_DIR)/etc/issue $(TARGET_DIR)/etc/hostname $(TARGET_DIR)/etc/issue: $(TARGET_DIR) .config echo "" > $(TARGET_DIR)/etc/issue