X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/15fe6590af6a347a83a8d1bcb22070d173df826d..c5e45e2e383ba669b6c8b1ff93145577182aeafa:/openwrt/Makefile diff --git a/openwrt/Makefile b/openwrt/Makefile index 17507b9f8..b8c9b10b7 100644 --- a/openwrt/Makefile +++ b/openwrt/Makefile @@ -27,8 +27,7 @@ CONFIG_DEFCONFIG = .defconfig CONFIG = package/config noconfig_targets := menuconfig config oldconfig randconfig \ - defconfig allyesconfig allnoconfig clean distclean \ - release tags + defconfig allyesconfig allnoconfig release tags # Pull in the user's configuration file ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) @@ -50,7 +49,7 @@ ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y) # ############################################################## TARGETS:=host-sed kernel-headers uclibc-configured binutils gcc uclibc-target-utils -TARGETS+=linux +TARGETS+=openwrt-sstrip linux include toolchain/Makefile.in include package/Makefile.in @@ -119,6 +118,8 @@ $(TARGET_DIR): fi; -find $(TARGET_DIR) -type d -name CVS | xargs rm -rf -find $(TARGET_DIR) -type d -name .svn | xargs rm -rf + -ln -sf /tmp/resolv.conf $(TARGET_DIR) + -mkdir -p $(TARGET_DIR)/jffs source: $(TARGETS_SOURCE) @@ -127,17 +128,17 @@ source: $(TARGETS_SOURCE) # Cleanup and misc junk # ############################################################# -clean: $(TARGETS_CLEAN) - rm -rf $(STAGING_DIR) $(TARGET_DIR) $(IMAGE) +clean: + rm -rf $(TARGET_DIR) $(IMAGE).* + $(MAKE) openwrt-image-clean dirclean: $(TARGETS_DIRCLEAN) - rm -rf $(STAGING_DIR) $(TARGET_DIR) $(IMAGE) - -distclean: - rm -rf $(DL_DIR) $(BUILD_DIR) $(LINUX_KERNEL) $(IMAGE) + rm -rf $(TARGET_DIR) $(IMAGE).* + $(MAKE) openwrt-image-dirclean -cleanall: - rm -rf $(DL_DIR) $(BUILD_DIR) $(LINUX_KERNEL) $(IMAGE) $(TOOL_BUILD_DIR) +distclean: clean + rm -rf $(DL_DIR) $(BUILD_DIR) $(TOOL_BUILD_DIR) + rm .config* .tmpconfig.h sourceball: rm -rf $(BUILD_DIR) @@ -167,35 +168,56 @@ $(CONFIG)/mconf: fi menuconfig: $(CONFIG)/mconf + -touch .config + -cp .config .config.test @$(CONFIG)/mconf $(CONFIG_CONFIG_IN) + -./scripts/configtest.pl config: $(CONFIG)/conf + -touch .config + -cp .config .config.test @$(CONFIG)/conf $(CONFIG_CONFIG_IN) + -./scripts/configtest.pl oldconfig: $(CONFIG)/conf + -touch .config + -cp .config .config.test @$(CONFIG)/conf -o $(CONFIG_CONFIG_IN) + -./scripts/configtest.pl randconfig: $(CONFIG)/conf + -touch .config + -cp .config .config.test @$(CONFIG)/conf -r $(CONFIG_CONFIG_IN) + -./scripts/configtest.pl allyesconfig: $(CONFIG)/conf #@$(CONFIG)/conf -y $(CONFIG_CONFIG_IN) #sed -i -e "s/^CONFIG_DEBUG.*/# CONFIG_DEBUG is not set/" .config + -touch .config + -cp .config .config.test @$(CONFIG)/conf -o $(CONFIG_CONFIG_IN) + -./scripts/configtest.pl allnoconfig: $(CONFIG)/conf + -touch .config + -cp .config .config.test @$(CONFIG)/conf -n $(CONFIG_CONFIG_IN) + -./scripts/configtest.pl defconfig: $(CONFIG)/conf + -touch .config + -cp .config .config.test @$(CONFIG)/conf -d $(CONFIG_CONFIG_IN) + -./scripts/configtest.pl ############################################################# # # Cleanup and misc junk # ############################################################# -clean: - - $(MAKE) -C $(CONFIG) clean +clean: + @$(MAKE) -C $(CONFIG) clean distclean: clean @@ -204,4 +226,3 @@ endif # ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y) .PHONY: dummy subdirs release distclean clean config oldconfig \ menuconfig tags check test depend -