Fix macfiltering options (#2397)

[openwrt.git] / Makefile

diff --git a/Makefile b/Makefile
index e035faa..dcd5bae 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,44 +14,49 @@ export TOPDIR LC_ALL LANG IS_TTY
 
 world:
 
 
 world:
 

-include $(TOPDIR)/include/debug.mk

 include $(TOPDIR)/include/host.mk
 
 ifneq ($(OPENWRT_BUILD),1)
   override OPENWRT_BUILD=1
   export OPENWRT_BUILD
 include $(TOPDIR)/include/host.mk
 
 ifneq ($(OPENWRT_BUILD),1)
   override OPENWRT_BUILD=1
   export OPENWRT_BUILD

+  include $(TOPDIR)/include/debug.mk

   include $(TOPDIR)/include/toplevel.mk
 else
   include rules.mk
   include $(INCLUDE_DIR)/depends.mk
   include $(INCLUDE_DIR)/subdir.mk
   include $(TOPDIR)/include/toplevel.mk
 else
   include rules.mk
   include $(INCLUDE_DIR)/depends.mk
   include $(INCLUDE_DIR)/subdir.mk

-  include $(INCLUDE_DIR)/target.mk

   include target/Makefile
   include package/Makefile
   include tools/Makefile
   include toolchain/Makefile
 
 $(toolchain/stamp-compile): $(tools/stamp-compile)
   include target/Makefile
   include package/Makefile
   include tools/Makefile
   include toolchain/Makefile
 
 $(toolchain/stamp-compile): $(tools/stamp-compile)

-$(target/stamp-compile): $(toolchain/stamp-install) $(tools/stamp-install)
+$(target/stamp-compile): $(toolchain/stamp-install) $(tools/stamp-install) $(BUILD_DIR)/.prepared

 $(package/stamp-compile): $(target/stamp-compile)
 $(target/stamp-install): $(package/stamp-compile) $(package/stamp-install)
 
 $(package/stamp-compile): $(target/stamp-compile)
 $(target/stamp-install): $(package/stamp-compile) $(package/stamp-install)
 

+$(BUILD_DIR)/.prepared: Makefile
+       @mkdir -p $$(dirname $@)
+       @touch $@
+

 clean: FORCE
 clean: FORCE

-       rm -rf build_* bin tmp
+       rm -rf $(BUILD_DIR) $(BIN_DIR)
+       $(MAKE) target/linux/clean
+       rm -rf $(TMP_DIR)

 
 dirclean: clean
 
 dirclean: clean

-       rm -rf staging_dir_* toolchain_build_* tool_build
-
-distclean: dirclean 
-       rm -rf dl .config*
+       rm -rf $(STAGING_DIR) $(STAGING_DIR_HOST) $(STAGING_DIR_TOOLCHAIN) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST)

 
 # check prerequisites before starting to build
 prereq: $(package/stamp-prereq) $(target/stamp-prereq) ;
 
 
 # check prerequisites before starting to build
 prereq: $(package/stamp-prereq) $(target/stamp-prereq) ;
 

-world: .config $(tools/stamp-install) $(toolchain/stamp-install) $(target/stamp-compile) $(package/stamp-cleanup) $(package/stamp-compile) $(package/stamp-install) $(package/stamp-rootfs-prepare) $(target/stamp-install) FORCE
+prepare: .config $(tools/stamp-install) $(toolchain/stamp-install)
+world: prepare $(target/stamp-compile) $(package/stamp-cleanup) $(package/stamp-compile) $(package/stamp-install) $(package/stamp-rootfs-prepare) $(target/stamp-install) FORCE

        $(MAKE) package/index
 
 package/symlinks:
        $(SCRIPT_DIR)/feeds.sh $(CONFIG_SOURCE_FEEDS) $(CONFIG_SOURCE_FEEDS_REV)        
 
        $(MAKE) package/index
 
 package/symlinks:
        $(SCRIPT_DIR)/feeds.sh $(CONFIG_SOURCE_FEEDS) $(CONFIG_SOURCE_FEEDS_REV)        
 

+.PHONY: clean dirclean prereq prepare world package/symlinks
+

 endif
 endif