madwifi: add support for the ahdemo (ad-hoc demo) mode in /etc/config/wireless. using...

[openwrt.git] / package / Makefile

diff --git a/package/Makefile b/package/Makefile
index bf7090d..c3fc01c 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/host.mk
 
 all: compile
 
 
 all: compile
 

-include $(TMP_DIR)/.pkgdeps
+include $(TMP_DIR)/.packagedeps

 
 PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(prereq-y) $(prereq-m))
 DOWNLOAD_PACKAGES:=$(patsubst %,%-download,$(package-y) $(package-m))
 
 PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(prereq-y) $(prereq-m))
 DOWNLOAD_PACKAGES:=$(patsubst %,%-download,$(package-y) $(package-m))


@@ -22,17 +22,20 @@ INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))
 $(STAMP_DIR) $(TARGET_DIR):
        mkdir -p $@
 
 $(STAMP_DIR) $(TARGET_DIR):
        mkdir -p $@
 

-%-prereq: $(STAMP_DIR) $(TARGET_DIR)
-       $(MAKE) -C $(patsubst %-prereq,%,$@) prereq
+ifeq ($(QUIET),1)
+%-compile %-install: FORCE
+       $(MAKE) -C $* $(patsubst $*-%,%,$@) || { $(call MESSAGE, "*** $* $(patsubst $*-%,%,$@) failed"); false; }

 
 

-$(eval $(call default_subtargets,$(TARGET_DIR)))
-
-ifeq ($(SDK),1)
-GENDEP_OPTS := -s
+%-prepare %-prereq %-download %-clean: FORCE
+else
+%-prepare %-prereq %-download %-clean %-compile %-install: FORCE

 endif
 endif

+       $(MAKE) -C $* $(patsubst $*-%,%,$@)
+
+# .IGNORE: $(COMPILE_PACKAGES) 

 
 

-$(TMP_DIR)/.pkgdeps: $(TMP_DIR)/.pkginfo
-       @$(TOPDIR)/scripts/metadata.pl package_mk $(GENDEP_OPTS) < $< > $@ || rm -f $@
+$(TMP_DIR)/.packagedeps: $(TMP_DIR)/.packageinfo
+       @$(TOPDIR)/scripts/metadata.pl package_mk < $< > $@ || rm -f $@

 
 preconfig:
 clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
 
 preconfig:
 clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))


@@ -55,6 +58,9 @@ install:
                        IPKG_INSTROOT=$(BUILD_DIR)/root $(which bash) ./etc/rc.common $$script enable; \
                done || true \
        )
                        IPKG_INSTROOT=$(BUILD_DIR)/root $(which bash) ./etc/rc.common $$script enable; \
                done || true \
        )

+       @-find $(BUILD_DIR)/root -name CVS   | $(XARGS) rm -rf
+       @-find $(BUILD_DIR)/root -name .svn  | $(XARGS) rm -rf
+       @-find $(BUILD_DIR)/root -name '.#*' | $(XARGS) rm -f

 
 index: $(PACKAGE_DIR)/Packages
 
 
 index: $(PACKAGE_DIR)/Packages