projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
change phony targets to FORCE (easier to read)
[openwrt.git] / package / rules.mk
diff --git a/package/rules.mk b/package/rules.mk
index 9f52f17..3d2f957 100644 (file)
--- a/package/rules.mk
+++ b/package/rules.mk
@@ -1,4 +1,3 @@
-# default target
 ifneq ($(DUMP),)
 all: dumpinfo
 else
 ifneq ($(DUMP),)
 all: dumpinfo
 else
@@ -12,20 +11,32 @@ $(PKG_BUILD_DIR)/.prepared:
        $(call Build/Prepare)
        touch $$@
 
        $(call Build/Prepare)
        touch $$@
 
-$(PKG_BUILD_DIR)/.configured:
+$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
        $(call Build/Configure)
        touch $$@
 
        $(call Build/Configure)
        touch $$@
 
-$(PKG_BUILD_DIR)/.built:
+ifeq ($(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),.)
+$(PKG_BUILD_DIR)/.prepared: clean
+endif
+
+$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
        $(call Build/Compile)
        touch $$@
 
        $(call Build/Compile)
        touch $$@
 
+package-clean:
+       $(call Build/Clean)
+       rm -f $(PKG_BUILD_DIR)/.built
+
+package-recompile:
+       rm -f $(PKG_BUILD_DIR)/.built
+
+.PHONY: package-clean package-recompile
+
 define Build/DefaultTargets
 endef
 endef
 
 define Build/DefaultTargets
 endef
 endef
 
-
-define BuildPackage
+define Package/Default
 CONFIGFILE:=
 SECTION:=opt
 CATEGORY:=Extra packages
 CONFIGFILE:=
 SECTION:=opt
 CATEGORY:=Extra packages
@@ -35,43 +46,87 @@ SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd})
 VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
 PKGARCH:=$(ARCH)
 PRIORITY:=optional
 VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
 PKGARCH:=$(ARCH)
 PRIORITY:=optional
+DEFAULT:=
+MENU:=
 TITLE:=
 DESCRIPTION:=
 TITLE:=
 DESCRIPTION:=
+endef
 
 
-$$(eval $$(call Package/$(1)))
+define BuildPackage
+$(eval $(call Package/Default))
+$(eval $(call Package/$(1)))
 
 
-ifeq ($$(TITLE),)
+ifeq ($(TITLE),)
 $$(error Package $(1) has no TITLE)
 endif
 $$(error Package $(1) has no TITLE)
 endif
-ifeq ($$(CATEGORY),)
+ifeq ($(CATEGORY),)
 $$(error Package $(1) has no CATEGORY)
 endif
 $$(error Package $(1) has no CATEGORY)
 endif
-ifeq ($$(PRIORITY),)
+ifeq ($(PRIORITY),)
 $$(error Package $(1) has no PRIORITY)
 endif
 $$(error Package $(1) has no PRIORITY)
 endif
-ifeq ($$(VERSION),)
+ifeq ($(VERSION),)
 $$(error Package $(1) has no VERSION)
 endif
 $$(error Package $(1) has no VERSION)
 endif
-ifeq ($$(PKGARCH),)
+ifeq ($(PKGARCH),)
 PKGARCH:=$(ARCH)
 endif
 PKGARCH:=$(ARCH)
 endif
+$(eval 
+ifeq ($(DESCRIPTION),)
+DESCRIPTION:=$(TITLE)
+endif
+)
 
 IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk
 IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1)
 INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list
 
 
 IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk
 IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1)
 INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list
 
-ifneq ($(PACKAGE_$(1)),)
-compile-targets: $$(IPKG_$(1))
+ifneq ($(CONFIG_PACKAGE_$(1)),)
+COMPILE_$(1):=1
 endif
 ifneq ($(DEVELOPER),)
 endif
 ifneq ($(DEVELOPER),)
-compile-targets: $$(IPKG_$(1))
+COMPILE_$(1):=1
 endif
 endif
-ifeq ($(PACKAGE_$(1)),y)
+ifeq ($(CONFIG_PACKAGE_$(1)),y)
 install-targets: $$(INFO_$(1))
 endif
 
 install-targets: $$(INFO_$(1))
 endif
 
+ifneq ($$(COMPILE_$(1)),)
+ifeq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $$(IPKG_$(1)) $(PKG_BUILD_DIR)),$(PKG_BUILD_DIR))
+$(PKG_BUILD_DIR)/.built: package-recompile
+endif
+
+compile-targets: $$(IPKG_$(1))
+endif
+
+
 IDEPEND_$(1):=$$(strip $$(DEPENDS))
 
 IDEPEND_$(1):=$$(strip $$(DEPENDS))
 
+DUMPINFO += \
+       echo "Package: $(1)"; 
+ifneq ($(MENU),)
+DUMPINFO += \
+       echo "Menu: $(MENU)";
+endif
+ifneq ($(DEFAULT),)
+DUMPINFO += \
+       echo "Default: $(DEFAULT)";
+endif
+DUMPINFO += \
+       echo "Version: $(VERSION)"; \
+       echo "Depends: $$(IDEPEND_$(1))"; \
+       echo "Category: $(CATEGORY)"; \
+       echo "Title: $(TITLE)"; \
+       echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g';
+ifneq ($(URL),)
+DUMPINFO += \
+       echo; \
+       echo "$(URL)";
+endif
+DUMPINFO += \
+       echo "@@";
+
+
 $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared
        mkdir -p $$(IDIR_$(1))/CONTROL
        echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
 $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared
        mkdir -p $$(IDIR_$(1))/CONTROL
        echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
@@ -82,36 +137,25 @@ $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared
        echo "Priority: $(PRIORITY)" >> $$(IDIR_$(1))/CONTROL/control
        echo "Maintainer: $(MAINTAINER)" >> $$(IDIR_$(1))/CONTROL/control
        echo "Architecture: $(PKGARCH)" >> $$(IDIR_$(1))/CONTROL/control
        echo "Priority: $(PRIORITY)" >> $$(IDIR_$(1))/CONTROL/control
        echo "Maintainer: $(MAINTAINER)" >> $$(IDIR_$(1))/CONTROL/control
        echo "Architecture: $(PKGARCH)" >> $$(IDIR_$(1))/CONTROL/control
-       echo "Description: $(TITLE)" >> $$(IDIR_$(1))/CONTROL/control
-       echo "$(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(IDIR_$(1))/CONTROL/control
+       echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(IDIR_$(1))/CONTROL/control
        chmod 644 $$(IDIR_$(1))/CONTROL/control
        for file in conffiles preinst postinst prerm postrm; do \
                [ -f ./ipkg/$(1).$$$$file ] && cp ./ipkg/$(1).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file || true; \
        done
 
        chmod 644 $$(IDIR_$(1))/CONTROL/control
        for file in conffiles preinst postinst prerm postrm; do \
                [ -f ./ipkg/$(1).$$$$file ] && cp ./ipkg/$(1).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file || true; \
        done
 
-$$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $(PKG_BUILD_DIR)/.built $(PACKAGE_DIR)
+$$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $(PKG_BUILD_DIR)/.built
        $(call Package/$(1)/install,$$(IDIR_$(1)))
        $(call Package/$(1)/install,$$(IDIR_$(1)))
+       mkdir -p $(PACKAGE_DIR)
+       $(RSTRIP) $$(IDIR_$(1))
        $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
 
 $$(INFO_$(1)): $$(IPKG_$(1))
        $(IPKG) install $$(IPKG_$(1))
 
 $(1)-clean:
        $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
 
 $$(INFO_$(1)): $$(IPKG_$(1))
        $(IPKG) install $$(IPKG_$(1))
 
 $(1)-clean:
-       rm -f $$(IPKG_$(1))
+       rm -f $(PACKAGE_DIR)/$(1)_*
 clean: $(1)-clean
 
 clean: $(1)-clean
 
-DUMPINFO += \
-       echo "Package: $(1)"; \
-       echo "Version: $(VERSION)"; \
-       echo "Depends: $(IDEPEND_$(1))"; \
-       echo "Title: $(TITLE)"; \
-       echo "$(DESCRIPTION)" | sed -e 's,\\,\n,g'; \
-       echo; \
-       echo "$(URL)"; \
-       echo "@@";
-
-PACKAGES += $(1)
-
 ifneq ($(__DEFAULT_TARGETS),1)
 $(eval $(call Build/DefaultTargets))
 endif
 ifneq ($(__DEFAULT_TARGETS),1)
 $(eval $(call Build/DefaultTargets))
 endif
@@ -120,8 +164,7 @@ endef
 
 ifneq ($(strip $(PKG_SOURCE)),)
 $(DL_DIR)/$(PKG_SOURCE):
 
 ifneq ($(strip $(PKG_SOURCE)),)
 $(DL_DIR)/$(PKG_SOURCE):
-       @$(CMD_TRACE) "downloading... "
-       $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL) $(MAKE_TRACE) 
+       $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL)
        
 $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
 endif
        
 $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
 endif
@@ -144,66 +187,74 @@ $(call Build/Prepare/Default)
 endef
 
 define Build/Configure/Default
 endef
 
 define Build/Configure/Default
-# TODO: add configurable default command
+       (cd $(PKG_BUILD_DIR); \
+       [ -x configure ] && \
+               $(TARGET_CONFIGURE_OPTS) \
+               CFLAGS="$(TARGET_CFLAGS)" \
+               ./configure \
+               --target=$(GNU_TARGET_NAME) \
+               --host=$(GNU_TARGET_NAME) \
+               --build=$(GNU_HOST_NAME) \
+               --prefix=/usr \
+               --exec-prefix=/usr \
+               --bindir=/usr/bin \
+               --sbindir=/usr/sbin \
+               --libexecdir=/usr/lib \
+               --sysconfdir=/etc \
+               --datadir=/usr/share \
+               --localstatedir=/var \
+               --mandir=/usr/man \
+               --infodir=/usr/info \
+               $(DISABLE_NLS) \
+               $(1); \
+       )
 endef
 
 define Build/Configure
 endef
 
 define Build/Configure
-$(call Build/Configure/Default)
+$(call Build/Configure/Default,)
 endef
 
 define Build/Compile/Default
 endef
 
 define Build/Compile/Default
-# TODO: add configurable default command
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               CC=$(TARGET_CC) \
+               CROSS="$(TARGET_CROSS)" \
+               PREFIX="$$(IDIR_$(1))" \
+               EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
+               ARCH="$(ARCH)" \
+               DESTDIR="$$(IDIR_$(1))"
 endef
 
 define Build/Compile
 $(call Build/Compile/Default)
 endef
 
 endef
 
 define Build/Compile
 $(call Build/Compile/Default)
 endef
 
+define Build/Clean
+       $(MAKE) clean
+endef
+
 ifneq ($(DUMP),)
 dumpinfo:
        $(DUMPINFO)
 else
 ifneq ($(DUMP),)
 dumpinfo:
        $(DUMPINFO)
 else
-
-source: $(DL_DIR)/$(PKG_SOURCE)
-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:
-       @$(CMD_TRACE) "installing... "
-       @$(MAKE) install-targets $(MAKE_TRACE)
-
-mostlyclean:
-rebuild:
-       $(CMD_TRACE) "rebuilding... "
-       @-$(MAKE) mostlyclean 2>&1 >/dev/null
-       if [ -f $(PKG_BUILD_DIR)/.built ]; then \
-               $(MAKE) clean $(MAKE_TRACE); \
-       fi
-       $(MAKE) compile $(MAKE_TRACE)
-
+               
 $(PACKAGE_DIR):
        mkdir -p $@
 
 $(PACKAGE_DIR):
        mkdir -p $@
 
-clean-targets:
-clean: 
-       @$(CMD_TRACE) "cleaning... " 
-       @$(MAKE) clean-targets $(MAKE_TRACE)
+source: FORCE $(DL_DIR)/$(PKG_SOURCE)
+prepare: FORCE $(PKG_BUILD_DIR)/.prepared
+configure: FORCE $(PKG_BUILD_DIR)/.configured
+
+compile-targets: FORCE
+compile: FORCE compile-targets
+
+install-targets: FORCE
+install: FORCE install-targets
+
+clean-targets: FORCE
+clean: FORCE
+       @$(MAKE) clean-targets
        rm -rf $(PKG_BUILD_DIR)
 endif
 
        rm -rf $(PKG_BUILD_DIR)
 endif
 
-.PHONY: all source prepare compile install clean dumpinfo
+.PHONY: FORCE
+FORCE:
Personal OpenWRT clone
This page took 0.025153 seconds and 4 git commands to generate.