diff options
Diffstat (limited to 'mk/build.mk')
-rw-r--r-- | mk/build.mk | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/mk/build.mk b/mk/build.mk index de7ece082..7c8a697f8 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -113,7 +113,9 @@ ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/M .NOTPARALLEL: .PHONY: all world clean cleantarget cleandir distclean image_clean -world: $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR) +world: + 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 @@ -133,18 +135,6 @@ ifeq ($(ADK_TARGET_PACKAGE_IPKG),y) ${BASH} ${TOPDIR}/scripts/ipkg-make-index.sh . >Packages endif -$(DISTDIR): - mkdir -p $(DISTDIR) - -$(BUILD_DIR): - mkdir -p $(BUILD_DIR) - -$(TARGET_DIR): - mkdir -p $(TARGET_DIR) - -$(PACKAGE_DIR): - mkdir -p ${PACKAGE_DIR}/.stamps - ${STAGING_TARGET_DIR} ${STAGING_TARGET_DIR}/etc ${STAGING_HOST_DIR}: mkdir -p ${STAGING_TARGET_DIR}/{bin,etc,lib,usr/include} \ ${STAGING_HOST_DIR}/{bin,lib} @@ -192,7 +182,7 @@ switch: kernelconfig: cp $(TOPDIR)/target/$(ADK_TARGET_ARCH)/kernel.config $(BUILD_DIR)/linux/.config - $(MAKE) -C $(BUILD_DIR)/linux/ ARCH=$(ARCH) menuconfig + ${KERNEL_MAKE_ENV} ${MAKE} ${KERNEL_MAKE_OPTS} -C $(BUILD_DIR)/linux menuconfig cp $(BUILD_DIR)/linux/.config $(TOPDIR)/target/$(ADK_TARGET_ARCH)/kernel.config # create a new package from package/.template @@ -211,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. @@ -221,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 \ @@ -568,7 +558,6 @@ ${TOPDIR}/bin/tools/pkgmaker: @$(HOSTCC) -Wall -g -o $@ tools/adk/pkgmaker.c tools/adk/sortfile.c tools/adk/strmap.c ${TOPDIR}/bin/tools/pkgrebuild: - @mkdir -p $(TOPDIR)/bin/tools @$(HOSTCC) -Wall -g -o $@ tools/adk/pkgrebuild.c tools/adk/strmap.c package/Config.in.auto menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) ${TOPDIR}/bin/tools/pkgmaker ${TOPDIR}/bin/tools/pkgrebuild @@ -576,10 +565,7 @@ package/Config.in.auto menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) ${TO @$(TOPDIR)/bin/tools/pkgmaker @:>.menu -$(TOPDIR)/bin/tools: - @mkdir -p $(TOPDIR)/bin/tools - -${TOPDIR}/bin/tools/depmaker: $(TOPDIR)/bin/tools +${TOPDIR}/bin/tools/depmaker: $(HOSTCC) -g -o $(TOPDIR)/bin/tools/depmaker $(TOPDIR)/tools/adk/depmaker.c dep: $(TOPDIR)/bin/tools/depmaker |