aboutsummaryrefslogtreecommitdiffstats
path: root/package/popt
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2005-05-09 09:33:23 +0000
committerFelix Fietkau <nbd@openwrt.org>2005-05-09 09:33:23 +0000
commit7e2f9e12669fe868c954b21c7d6a3707b50fcc95 (patch)
treee6a8c4b3d0320077610a4acff2371aa373e4245a /package/popt
parent326cae8e775a5140da25fffd3a08645b3b81daa9 (diff)
downloadupstream-7e2f9e12669fe868c954b21c7d6a3707b50fcc95.tar.gz
upstream-7e2f9e12669fe868c954b21c7d6a3707b50fcc95.tar.bz2
upstream-7e2f9e12669fe868c954b21c7d6a3707b50fcc95.zip
merge nico's package/rules.mk and package/templates.mk into one file, update packages that use this
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@817 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/popt')
-rw-r--r--package/popt/Makefile10
1 files changed, 4 insertions, 6 deletions
diff --git a/package/popt/Makefile b/package/popt/Makefile
index 7297ce7b01..64e2e169b7 100644
--- a/package/popt/Makefile
+++ b/package/popt/Makefile
@@ -16,14 +16,9 @@ PKG_CAT:=zcat
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-include $(TOPDIR)/package/templates.mk
-
-$(eval $(call PKG_template,LIBPOPT,libpopt,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-
include $(TOPDIR)/package/rules.mk
-COMPILE_TARGETS += install-dev
-CLEAN_TARGETS += uninstall-dev
+$(eval $(call PKG_template,LIBPOPT,libpopt,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
@@ -79,3 +74,6 @@ uninstall-dev:
-$(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(STAGING_DIR)" \
uninstall
+
+compile: install-dev
+clean: uninstall-dev