add source url

[openwrt.git] / package / rules.mk

diff --git a/package/rules.mk b/package/rules.mk
index a95c4e4..9bbf4fa 100644 (file)
--- a/package/rules.mk
+++ b/package/rules.mk
@@ -1,16 +1,18 @@
+# invoke ipkg with configuration in $(STAGING_DIR)/etc/ipkg.conf 
+

 define PKG_template
 IPKG_$(1):=$(PACKAGE_DIR)/$(2)_$(3)_$(4).ipk
 IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(2)
 INFO_$(1):=$(IPKG_STATE_DIR)/info/$(2).list
 
 ifneq ($(BR2_PACKAGE_$(1)),)
 define PKG_template
 IPKG_$(1):=$(PACKAGE_DIR)/$(2)_$(3)_$(4).ipk
 IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(2)
 INFO_$(1):=$(IPKG_STATE_DIR)/info/$(2).list
 
 ifneq ($(BR2_PACKAGE_$(1)),)

-compile: $$(IPKG_$(1))
+compile-targets: $$(IPKG_$(1))

 endif
 ifneq ($(DEVELOPER),)
 endif
 ifneq ($(DEVELOPER),)

-compile: $$(IPKG_$(1))
+compile-targets: $$(IPKG_$(1))

 endif
 ifeq ($(BR2_PACKAGE_$(1)),y)
 endif
 ifeq ($(BR2_PACKAGE_$(1)),y)

-install: $$(INFO_$(1))
+install-targets: $$(INFO_$(1))

 endif
 
 IDEPEND_$(1):=$$(strip $(5))
 endif
 
 IDEPEND_$(1):=$$(strip $(5))


@@ -32,16 +34,22 @@ $(2)-clean:
 clean: $(2)-clean
 endef
 
 clean: $(2)-clean
 endef
 

+

 ifneq ($(strip $(PKG_SOURCE)),)
 $(DL_DIR)/$(PKG_SOURCE):
 ifneq ($(strip $(PKG_SOURCE)),)
 $(DL_DIR)/$(PKG_SOURCE):

-       $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL)
+       @$(CMD_TRACE) "downloading... "
+       $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL) $(MAKE_TRACE) 

 endif
 
 ifneq ($(strip $(PKG_CAT)),)
 $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
        rm -rf $(PKG_BUILD_DIR)
        mkdir -p $(PKG_BUILD_DIR)
 endif
 
 ifneq ($(strip $(PKG_CAT)),)
 $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
        rm -rf $(PKG_BUILD_DIR)
        mkdir -p $(PKG_BUILD_DIR)

-       $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) -
+       if [ "$(PKG_CAT)" = "unzip" ]; then \
+               unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE) ; \
+       else \
+               $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) - ; \
+       fi                                                

        if [ -d ./patches ]; then \
                $(PATCH) $(PKG_BUILD_DIR) ./patches ; \
        fi
        if [ -d ./patches ]; then \
                $(PATCH) $(PKG_BUILD_DIR) ./patches ; \
        fi


@@ -51,24 +59,47 @@ endif
 all: compile
 
 source: $(DL_DIR)/$(PKG_SOURCE)
 all: compile
 
 source: $(DL_DIR)/$(PKG_SOURCE)

-prepare: $(PKG_BUILD_DIR)/.prepared
-compile:
+prepare: source
+       @[ -f $(PKG_BUILD_DIR)/.prepared ] || { \
+               $(CMD_TRACE) "preparing... "; \
+               $(MAKE) $(PKG_BUILD_DIR)/.prepared $(MAKE_TRACE); \
+       }
+
+configure: prepare
+       @[ -f $(PKG_BUILD_DIR)/.configured ] || { \
+               $(CMD_TRACE) "configuring... "; \
+               $(MAKE) $(PKG_BUILD_DIR)/.configured $(MAKE_TRACE); \
+       }
+
+compile-targets:
+compile: configure
+       @$(CMD_TRACE) "compiling... " 
+       @$(MAKE) compile-targets $(MAKE_TRACE)
+
+install-targets:

 install:
 install:

+       @$(CMD_TRACE) "installing... "
+       @$(MAKE) install-targets $(MAKE_TRACE)
+

 mostlyclean:
 rebuild:
 mostlyclean:
 rebuild:

-       -$(MAKE) mostlyclean
+       $(CMD_TRACE) "rebuilding... "
+       @-$(MAKE) mostlyclean 2>&1 >/dev/null

        if [ -f $(PKG_BUILD_DIR)/.built ]; then \
        if [ -f $(PKG_BUILD_DIR)/.built ]; then \

-               $(MAKE) clean; \
+               $(MAKE) clean $(MAKE_TRACE); \

        fi
        fi

-       $(MAKE) compile
+       $(MAKE) compile $(MAKE_TRACE)

 
 

-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.configured:
+$(PKG_BUILD_DIR)/.built:

 
 $(PACKAGE_DIR):
        mkdir -p $@
 
 
 $(PACKAGE_DIR):
        mkdir -p $@
 

+clean-targets:

 clean: 
 clean: 

+       @$(CMD_TRACE) "cleaning... " 
+       @$(MAKE) clean-targets $(MAKE_TRACE)

        rm -rf $(PKG_BUILD_DIR)
 
 .PHONY: all source prepare compile install clean
        rm -rf $(PKG_BUILD_DIR)
 
 .PHONY: all source prepare compile install clean