X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/468b09e529c0aa35465e78d976cda696ee5b74bc..23770f95c361e40ceaaa54e8c3dfa6436b9c26fe:/openwrt/package/pcre/Makefile

diff --git a/openwrt/package/pcre/Makefile b/openwrt/package/pcre/Makefile
index f07410652..b5ebd80d7 100644
--- a/openwrt/package/pcre/Makefile
+++ b/openwrt/package/pcre/Makefile
@@ -7,28 +7,26 @@ PKG_VERSION:=5.0
 PKG_RELEASE:=3
 PKG_MD5SUM:=53976b62032fd5c76678274e5fd196b4
 
-PKG_SOURCE_URL:=\
+PKG_SOURCE_URL:= \
 	ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ \
 	http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-IPKG_LIBPCRE:=$(PACKAGE_DIR)/lib$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-IDIR_LIBPCRE:=$(PKG_BUILD_DIR)/ipkg/lib$(PKG_NAME)
-INFO_LIBPCRE:=$(IPKG_STATE_DIR)/info/lib$(PKG_NAME).list
+include $(TOPDIR)/package/templates.mk
 
-$(DL_DIR)/$(PKG_SOURCE):
-	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
+$(eval $(call PKG_template,LIBPCRE,libpcre,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
-	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-#	$(PATCH) $(PKG_BUILD_DIR) ./patches
-	touch $(PKG_BUILD_DIR)/.prepared
+include $(TOPDIR)/package/rules.mk
+
+COMPILE_TARGETS += install-dev
+CLEAN_TARGETS += uninstall-dev
 
 $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
-	(cd $(PKG_BUILD_DIR); rm -rf config.cache config.status; \
+	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
@@ -67,8 +65,7 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
 		dftables
 	$(MAKE) \
 		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-	  
+		CFLAGS="$(TARGET_CFLAGS)"
 	touch $(PKG_BUILD_DIR)/.built
 
 $(STAGING_DIR)/usr/lib/libpcre.so: $(PKG_BUILD_DIR)/.built
@@ -77,27 +74,19 @@ $(STAGING_DIR)/usr/lib/libpcre.so: $(PKG_BUILD_DIR)/.built
 		install
 	rm -f $(STAGING_DIR)/usr/lib/libpcre*.la
 
-$(IPKG_LIBPCRE): $(STAGING_DIR)/usr/lib/libpcre.so
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBPCRE) lib$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+$(IPKG_LIBPCRE): $(IDIR_LIBPCRE)/CONTROL/control $(STAGING_DIR)/usr/lib/libpcre.so
 	mkdir -p $(IDIR_LIBPCRE)/usr/lib
-	cp -fp $(STAGING_DIR)/usr/lib/libpcre*.so.* $(IDIR_LIBPCRE)/usr/lib/
-	$(STRIP) $(IDIR_LIBPCRE)/usr/lib/lib*.so*
+	cp -fpR $(STAGING_DIR)/usr/lib/libpcre*.so.* $(IDIR_LIBPCRE)/usr/lib/
+	$(RSTRIP) $(IDIR_LIBPCRE)
 	mkdir -p $(PACKAGE_DIR)
 	$(IPKG_BUILD) $(IDIR_LIBPCRE) $(PACKAGE_DIR)
 
-$(INFO_LIBPCRE): $(IPKG_LIBPCRE)
-	$(IPKG) install $(IPKG_LIBPCRE)
-
-source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.prepared
-compile: $(IPKG_LIBPCRE)
-install: $(INFO_LIBPCRE)
+install-dev: $(STAGING_DIR)/usr/lib/libpcre.so
 
-clean:
+uninstall-dev:
 	rm -rf \
 	  $(STAGING_DIR)/usr/bin/pcre-config \
 	  $(STAGING_DIR)/usr/include/pcre* \
 	  $(STAGING_DIR)/usr/lib/libpcre* \
 	  $(STAGING_DIR)/usr/lib/pkgconfig/libpcre.pc \
 	  $(STAGING_DIR)/usr/share/man/man*/pcre* \
-	  $(PKG_BUILD_DIR) $(IPKG_LIBPCRE)