change handling of the Build/Clean template

[openwrt.git] / package / rules.mk

diff --git a/package/rules.mk b/package/rules.mk
index 5d604c5..77a6595 100644 (file)
--- a/package/rules.mk
+++ b/package/rules.mk
@@ -6,12 +6,16 @@ endif
 
 define Build/DefaultTargets
   ifeq ($(DUMP),)
 
 define Build/DefaultTargets
   ifeq ($(DUMP),)

-    ifeq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) . | tee /tmp/xy1),.)
-      $(PKG_BUILD_DIR)/.prepared: package-clean
+    ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) . $(TOPDIR)/package/rules.mk),$(PKG_BUILD_DIR))
+      ifeq ($(CONFIG_AUTOREBUILD),y)
+        $(PKG_BUILD_DIR)/.prepared: package-clean
+      endif

     endif
 
     endif
 

-    ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $(IPKG_$(1)) $(PKG_BUILD_DIR) | tee /tmp/xy2),$(IPKG_$(1)))
-      $(PKG_BUILD_DIR)/.built: package-rebuild
+    ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1)))
+      ifeq ($(CONFIG_AUTOREBUILD),y)
+        $(PKG_BUILD_DIR)/.built: package-rebuild
+      endif

     endif
   endif
 
     endif
   endif
 


@@ -29,13 +33,18 @@ define Build/DefaultTargets
        $(call Build/Compile)
        touch $$@
 
        $(call Build/Compile)
        touch $$@
 

-  $(PKG_BUILD_DIR)/.dev-installed: $(PKG_BUILD_DIR)/.built
+  $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(PKG_BUILD_DIR)/.built

        $(call Build/InstallDev)
        touch $$@
        $(call Build/InstallDev)
        touch $$@

+       
+  ifdef Build/InstallDev
+    compile-targets: $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed
+  endif

 
   package-clean: FORCE
        $(call Build/Clean)
        $(call Build/UninstallDev)
 
   package-clean: FORCE
        $(call Build/Clean)
        $(call Build/UninstallDev)

+       rm -f $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed

 
   package-rebuild: FORCE
        @-rm $(PKG_BUILD_DIR)/.built
 
   package-rebuild: FORCE
        @-rm $(PKG_BUILD_DIR)/.built


@@ -51,7 +60,15 @@ define Package/Default
   DEPENDS:=
   MAINTAINER:=OpenWrt Developers Team <openwrt-devel@openwrt.org>
   SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd})
   DEPENDS:=
   MAINTAINER:=OpenWrt Developers Team <openwrt-devel@openwrt.org>
   SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd})

-  VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
+  ifneq ($(PKG_VERSION),)
+    ifneq ($(PKG_RELEASE),)
+      VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
+    else
+      VERSION:=$(PKG_VERSION)
+    endif
+  else
+    VERSION:=$(PKG_RELEASE)
+  endif

   PKGARCH:=$(ARCH)
   PRIORITY:=optional
   DEFAULT:=
   PKGARCH:=$(ARCH)
   PRIORITY:=optional
   DEFAULT:=


@@ -228,12 +245,11 @@ endef
 
 define Build/Compile/Default
        $(MAKE) -C $(PKG_BUILD_DIR) \
 
 define Build/Compile/Default
        $(MAKE) -C $(PKG_BUILD_DIR) \

+               $(TARGET_CONFIGURE_OPTS) \

                CC=$(TARGET_CC) \
                CROSS="$(TARGET_CROSS)" \
                CC=$(TARGET_CC) \
                CROSS="$(TARGET_CROSS)" \

-               PREFIX="$$(IDIR_$(1))" \
-               EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
+               EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include" \

                ARCH="$(ARCH)" \
                ARCH="$(ARCH)" \

-               DESTDIR="$$(IDIR_$(1))" \

                $(1);
 endef
 
                $(1);
 endef
 


@@ -241,16 +257,6 @@ define Build/Compile
   $(call Build/Compile/Default,)
 endef
 
   $(call Build/Compile/Default,)
 endef
 

-define Build/InstallDev
-endef
-
-define Build/Clean
-       $(MAKE) clean
-endef
-
-define Build/UninstallDev
-endef
-

 ifneq ($(DUMP),)
   dumpinfo: FORCE
        @$(DUMPINFO)
 ifneq ($(DUMP),)
   dumpinfo: FORCE
        @$(DUMPINFO)


@@ -263,11 +269,7 @@ else
   prepare: $(PKG_BUILD_DIR)/.prepared
   configure: $(PKG_BUILD_DIR)/.configured
 
   prepare: $(PKG_BUILD_DIR)/.prepared
   configure: $(PKG_BUILD_DIR)/.configured
 

-ifdef Build/InstallDev
-  compile-targets: $(PKG_BUILD_DIR)/.dev-installed
-else

   compile-targets:
   compile-targets:

-endif

   compile: compile-targets
 
   install-targets:
   compile: compile-targets
 
   install-targets:


@@ -276,5 +278,6 @@ endif
   clean-targets:
   clean: FORCE
        @$(MAKE) clean-targets
   clean-targets:
   clean: FORCE
        @$(MAKE) clean-targets

+       $(call Build/Clean)

        rm -rf $(PKG_BUILD_DIR)
 endif
        rm -rf $(PKG_BUILD_DIR)
 endif