Переглянути джерело

fix make clean target rule

correct the wrong path and remove the correct files on clean.
Finetune more directory creation rules.
Waldemar Brodkorb 15 роки тому
батько
коміт
422beddb9d
6 змінених файлів з 7 додано та 12 видалено
  1. 4 3
      mk/build.mk
  2. 1 0
      mk/buildhlp.mk
  3. 0 3
      package/Makefile
  4. 1 4
      toolchain/Makefile
  5. 1 1
      toolchain/eglibc/Makefile
  6. 0 1
      toolchain/gdb/Makefile

+ 4 - 3
mk/build.mk

@@ -114,7 +114,8 @@ ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/M
 .PHONY: all world clean cleantarget cleandir distclean image_clean
 
 world:
-	mkdir -p $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR)/.stamps $(TOOLS_DIR) $(TOOLS_BUILD_DIR)
+	mkdir -p $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR)/.stamps \
+		$(TOOLS_DIR) $(TOOLS_BUILD_DIR) $(TOOLCHAIN_BUILD_DIR)
 	${BASH} ${TOPDIR}/scripts/scan-pkgs.sh
 	${BASH} ${TOPDIR}/scripts/update-sys
 	${BASH} ${TOPDIR}/scripts/update-pkg
@@ -200,7 +201,7 @@ root_clean:
 	mkdir -p $(TARGET_DIR)
 
 # Do a per-package clean here, too. This way stale headers and
-# libraries from cross_*/target/ get wiped away, which keeps
+# libraries from target_*/ get wiped away, which keeps
 # future package build's configure scripts from returning false
 # dependencies information.
 
@@ -210,7 +211,7 @@ clean:
 	for d in ${STAGING_PKG_DIR}; do \
 		for f in $$(ls $$d/[a-z]* 2>/dev/null); do  \
 			while read file ; do \
-				rm $$d/target/$$file 2>/dev/null; \
+				rm ${STAGING_TARGET_DIR}/$$file 2>/dev/null;\
 			done < $$f ; \
 			rm $$f ; \
 		done \

+ 1 - 0
mk/buildhlp.mk

@@ -25,6 +25,7 @@ _CHECKSUM_COOKIE=
 endif
 
 post-extract:
+	@mkdir -p ${PACKAGE_DIR}/.stamps
 
 ifeq ($(strip ${NO_DISTFILES}),1)
 ${WRKDIST}/.extract_done:

+ 0 - 3
package/Makefile

@@ -48,9 +48,6 @@ compile: $(REBUILD_PACKAGES) base-files-compile $(COMPILE_PACKAGES)
 install: base-files-install $(INSTALL_PACKAGES)
 endif
 
-$(TARGET_DIR):
-	mkdir -p $(TARGET_DIR)
-
 %-download:
 	$(START_TRACE) "package/$(patsubst %-download,%,$@)-download: "
 	$(MAKE) -C $(patsubst %-download,%,$@) fetch

+ 1 - 4
toolchain/Makefile

@@ -54,14 +54,11 @@ $(STAGING_HOST_DIR):
 	@mkdir -p $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)
 	@ln -sf ../lib $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/lib
 
-$(TOOLCHAIN_BUILD_DIR):
-	@mkdir -p $(TOOLCHAIN_BUILD_DIR)
-
 %-download:
 	$(TRACE) toolchain/$(patsubst %-download,%,$@)/download
 	$(MAKE) -C $(patsubst %-download,%,$@) fetch
 
-%-prepare: $(STAGING_HOST_DIR) $(TOOLCHAIN_BUILD_DIR)
+%-prepare: $(STAGING_HOST_DIR)
 	$(TRACE) toolchain/$(patsubst %-prepare,%,$@)/prepare
 	@if test x"$(patsubst %-prepare,%,$@)" = x"$(LIBC)"; then \
 		$(MAKE) -C $(patsubst %-prepare,%,$@) prepare \

+ 1 - 1
toolchain/eglibc/Makefile

@@ -4,7 +4,6 @@
 include $(TOPDIR)/rules.mk
 include ../rules.mk
 include Makefile.inc
-
 include ${TOPDIR}/mk/buildhlp.mk
 
 ifneq ($(ADK_DEBUG),)
@@ -79,6 +78,7 @@ $(WRKBUILD)/.configured:
 	);
 	touch $@
 
+$(EGLIBC_BUILD_DIR_FINAL)/libc.so:
 $(WRKBUILD)/.compiled: $(WRKBUILD)/.configured
 	${EGLIBC_ENV} $(MAKE) -C $(EGLIBC_BUILD_DIR_FINAL) all
 	touch $@

+ 0 - 1
toolchain/gdb/Makefile

@@ -4,7 +4,6 @@
 include $(TOPDIR)/rules.mk
 include ../rules.mk
 include Makefile.inc
-
 include ${TOPDIR}/mk/buildhlp.mk
 
 ifeq (${ADK_MAKE_PARALLEL},y)