From 3817a7225bf45ebd6085c673c6a146ec4f67d1c7 Mon Sep 17 00:00:00 2001 From: nico Date: Mon, 18 Apr 2005 06:33:29 +0000 Subject: Use common rules and templates, uniformize package Makefile, move ipkg related files to ./ipkg git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@664 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/popt/ipkg/libpopt-dev/CONTROL/control | 8 -- package/popt/ipkg/libpopt.control | 8 ++ package/popt/ipkg/libpopt/CONTROL/control | 8 -- package/popt/ipkg/rules | 130 -------------------------- package/popt/ipkg/version | 1 - 5 files changed, 8 insertions(+), 147 deletions(-) delete mode 100644 package/popt/ipkg/libpopt-dev/CONTROL/control create mode 100644 package/popt/ipkg/libpopt.control delete mode 100644 package/popt/ipkg/libpopt/CONTROL/control delete mode 100644 package/popt/ipkg/rules delete mode 100644 package/popt/ipkg/version (limited to 'package/popt/ipkg') diff --git a/package/popt/ipkg/libpopt-dev/CONTROL/control b/package/popt/ipkg/libpopt-dev/CONTROL/control deleted file mode 100644 index 47faa7ab8..000000000 --- a/package/popt/ipkg/libpopt-dev/CONTROL/control +++ /dev/null @@ -1,8 +0,0 @@ -Package: libpopt-dev -Priority: optional -Section: devel -Version: [TBDL] -Architecture: [TBDL] -Maintainer: Nico -Source: http://nthill.free.fr/openwrt/sources/popt/ -Description: a command line option parsing library (development) diff --git a/package/popt/ipkg/libpopt.control b/package/popt/ipkg/libpopt.control new file mode 100644 index 000000000..b932c4a48 --- /dev/null +++ b/package/popt/ipkg/libpopt.control @@ -0,0 +1,8 @@ +Package: libpopt +Priority: optional +Section: libs +Version: [TBDL] +Architecture: [TBDL] +Maintainer: Nico +Source: http://nthill.free.fr/openwrt/sources/popt/ +Description: a command line option parsing library diff --git a/package/popt/ipkg/libpopt/CONTROL/control b/package/popt/ipkg/libpopt/CONTROL/control deleted file mode 100644 index b932c4a48..000000000 --- a/package/popt/ipkg/libpopt/CONTROL/control +++ /dev/null @@ -1,8 +0,0 @@ -Package: libpopt -Priority: optional -Section: libs -Version: [TBDL] -Architecture: [TBDL] -Maintainer: Nico -Source: http://nthill.free.fr/openwrt/sources/popt/ -Description: a command line option parsing library diff --git a/package/popt/ipkg/rules b/package/popt/ipkg/rules deleted file mode 100644 index 7a615a5f2..000000000 --- a/package/popt/ipkg/rules +++ /dev/null @@ -1,130 +0,0 @@ -#!/usr/bin/make -f - -ifneq ($(strip ${IPKG_RULES_INC}),) - include $(IPKG_RULES_INC) -endif - -## - -PKG_VERSION := $(shell cat ./ipkg/version) -CURRENT_DIR := $(shell pwd) -INSTALL_DIR ?= $(CURRENT_DIR)/ipkg-install - -unexport INSTALL_DIR - -I_LIBPOPT := ipkg/libpopt -I_LIBPOPT_DEV := ipkg/libpopt-dev - -BUILD_DEPS := \ - -CONFIGURE_OPTS = \ - --enable-shared \ - --enable-static \ - -## - -all: package - - -.stamp-configured: $(BUILD_DEPS) - - rm -rf config.cache - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - am_cv_func_iconv=no \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --program-prefix="" \ - --program-suffix="" \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --datadir=/usr/share \ - --includedir=/usr/include \ - --infodir=/usr/share/info \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --mandir=/usr/share/man \ - --sbindir=/usr/sbin \ - --sysconfdir=/etc \ - $(DISABLE_LARGEFILE) \ - $(DISABLE_NLS) \ - $(CONFIGURE_OPTS) \ - - touch .stamp-configured - - -.stamp-built: .stamp-configured - - $(MAKE) - - touch .stamp-built - - -$(INSTALL_DIR)/usr/include/popt.h: .stamp-built - - mkdir -p $(INSTALL_DIR) - - $(MAKE) \ - DESTDIR="$(INSTALL_DIR)" \ - install - - rm -f $(INSTALL_DIR)/usr/lib/libpopt.la - - -configure: .stamp-configured - - -build: .stamp-built - - -install: $(INSTALL_DIR)/usr/include/popt.h - - -package: $(INSTALL_DIR)/usr/include/popt.h - - mkdir -p $(I_LIBPOPT)/usr/lib - cp -fpR $(INSTALL_DIR)/usr/lib/libpopt*.so.* $(I_LIBPOPT)/usr/lib/ - $(STRIP) $(I_LIBPOPT)/usr/lib/lib*.so.* - - mkdir -p $(I_LIBPOPT_DEV)/usr/include - cp -fpR $(INSTALL_DIR)/usr/include/popt.h $(I_LIBPOPT_DEV)/usr/include/ - mkdir -p $(I_LIBPOPT_DEV)/usr/lib - cp -fpR $(INSTALL_DIR)/usr/lib/libpopt*.a $(I_LIBPOPT_DEV)/usr/lib/ - cp -fpR $(INSTALL_DIR)/usr/lib/libpopt*.so* $(I_LIBPOPT_DEV)/usr/lib/ - - chmod 0755 ipkg/*/CONTROL/ - chmod 0644 ipkg/*/CONTROL/control - - perl -pi -e "s/^Arch.*:.*/Architecture: $(ARCH)/g" ipkg/*/CONTROL/control -ifneq ($(strip $(PKG_VERSION)),) - perl -pi -e "s/^Vers.*:.*/Version: $(PKG_VERSION)/g" ipkg/*/CONTROL/control -endif - - $(IPKG_BUILD) $(I_LIBPOPT) $(IPKG_TARGET_DIR) - $(IPKG_BUILD) $(I_LIBPOPT_DEV) $(IPKG_TARGET_DIR) - - -clean: - - -$(MAKE) \ - DESTDIR="$(INSTALL_DIR)" \ - uninstall clean - - rm -rf .stamp-* \ - $(I_LIBPOPT)/usr \ - $(I_LIBPOPT_DEV)/usr \ - - -control: - - @cat $(I_LIBPOPT)/CONTROL/control - @echo - @cat $(I_LIBPOPT_DEV)/CONTROL/control - @echo - - -.PHONY: configure build install package clean control diff --git a/package/popt/ipkg/version b/package/popt/ipkg/version deleted file mode 100644 index 75b182709..000000000 --- a/package/popt/ipkg/version +++ /dev/null @@ -1 +0,0 @@ -1.7-4 -- cgit v1.2.3