From 93bdd996176c3237696e554d6d1b567ba29aca23 Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 9 May 2005 09:33:23 +0000 Subject: 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 --- package/popt/Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'package/popt') diff --git a/package/popt/Makefile b/package/popt/Makefile index 7297ce7b0..64e2e169b 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 -- cgit v1.2.3