massive Makefile cleanup, add missing 'svn:keywords' property

git-svn-id: svn://svn.openwrt.org/openwrt/packages@5348 3c298f89-4303-0410-b956-a3cf2f4a3e73
2006-10-30 13:51:50 +00:00
parent d6c03f5259
commit 5cb332fb35
139 changed files with 1341 additions and 1322 deletions
--- a/libs/bzip2/Makefile
+++ b/libs/bzip2/Makefile
@ -4,38 +4,33 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$

 include $(TOPDIR)/rules.mk

 PKG_NAME:=bzip2
 PKG_VERSION:=1.0.3
 PKG_RELEASE:=1
-PKG_MD5SUM:=8a716bebecb6e647d2e8a29ea5d8447f

-PKG_SOURCE_URL:=http://www.bzip.org/$(PKG_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.bzip.org/$(PKG_VERSION)/
+PKG_MD5SUM:=8a716bebecb6e647d2e8a29ea5d8447f
 PKG_CAT:=zcat

 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install

 include $(INCLUDE_DIR)/package.mk

 define Package/libbzip2
-SECTION:=libs
-CATEGORY:=Libraries
-TITLE:=bzip2 is a freely available, patent free, high-quality data compressor.
-DESCRIPTION:=bzip2 is a freely available, patent free, high-quality data compressor.
-URL:=http://www.bzip.org
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=bzip2 is a freely available, patent free, high-quality data compressor.
+  URL:=http://www.bzip.org
 endef

 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
 		libbz2.a
 endef

@ -48,8 +43,8 @@ endef
 	
 define Build/UninstallDev
 	rm -rf \
-	  $(STAGING_DIR)/usr/include/bzlib.h \
-	  $(STAGING_DIR)/usr/lib/libbz2.a
+		$(STAGING_DIR)/usr/include/bzlib.h \
+		$(STAGING_DIR)/usr/lib/libbz2.a
 endef

 $(eval $(call BuildPackage,libbzip2))
--- a/libs/cgilib/Makefile
+++ b/libs/cgilib/Makefile
@ -1,46 +1,43 @@
-# $Id: Makefile 3843 2006-05-30 18:55:52Z nbd $
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id$

 include $(TOPDIR)/rules.mk

 PKG_NAME:=cgilib
 PKG_VERSION:=0.5
 PKG_RELEASE:=1
-PKG_MD5SUM:=5187ba11b2ec165b6c5b6629087733b0

-PKG_SOURCE_URL:=http://www.infodrom.org/projects/cgilib/download
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.infodrom.org/projects/cgilib/download
+PKG_MD5SUM:=5187ba11b2ec165b6c5b6629087733b0
 PKG_CAT:=zcat

 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install

 include $(INCLUDE_DIR)/package.mk

 define Package/cgilib
-SECTION:=libs
-CATEGORY:=Libraries
-TITLE:=Simple CGI Library
-DESCRIPTION:=Simple CGI Library.
-URL:=http://www.infodrom.org/projects/cgilib/
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Simple CGI Library
+  URL:=http://www.infodrom.org/projects/cgilib/
 endef

 define Build/Configure
 endef

 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
                OFLAGS="$(TARGET_CFLAGS)" \
                all
 endef

-define Package/cgilib/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libcgi.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
 	$(CP) $(PKG_BUILD_DIR)/cgi.h $(STAGING_DIR)/usr/include/
@ -51,8 +48,13 @@ endef
 	
 define Build/UninstallDev
 	rm -rf \
-	  $(STAGING_DIR)/usr/include/cgi.h \
-	  $(STAGING_DIR)/usr/lib/libcgi.{a,so*}
+		$(STAGING_DIR)/usr/include/cgi.h \
+		$(STAGING_DIR)/usr/lib/libcgi.{a,so*}
+endef
+
+define Package/cgilib/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libcgi.so.* $(1)/usr/lib/
 endef

 $(eval $(call BuildPackage,cgilib))
--- a/libs/libexif/Makefile
+++ b/libs/libexif/Makefile
@ -4,8 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-#  Makefile for libexif
-# $Id: $
+# $Id$

 include $(TOPDIR)/rules.mk

@ -13,12 +12,12 @@ PKG_NAME:=libexif
 PKG_VERSION:=0.6.13
 PKG_RELEASE:=1

-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/libexif
 PKG_MD5SUM:=1b1e2b495c5aa20c08725f30545a110b
 PKG_CAT:=bzcat

+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install

 include $(INCLUDE_DIR)/package.mk
@ -27,35 +26,26 @@ define Package/libexif
  SECTION:=libs
  CATEGORY:=Libraries
  TITLE:=library for jpeg files with exif tags
-  DESCRIPTION:=library for jpeg files with exif tags\\\
  URL:=http://libexif.sourceforge.net/
 endef

-BIG_ENDIAN:=no
-ifeq ($(CONFIG_BIG_ENDIAN),y)
-BIG_ENDIAN:=yes
-endif
-
 define Build/Configure
-$(call Build/Configure/Default,--enable-shared \
-	--enable-static \
-	--without-libiconv-prefix,ac_cv_c_bigendian=$(BIG_ENDIAN))
+	$(call Build/Configure/Default, \
+		--enable-shared \
+		--enable-static \
+		--disable-rpath \
+		--without-libiconv-prefix \
+		--without-libintl-prefix \
+	)
 endef

 define Build/Compile
-$(call Build/Compile/Default, \
-	DESTDIR="$(PKG_INSTALL_DIR)" \
-	all install \
-)
-endef
-
-define Package/libexif/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libexif*.so.* $(1)/usr/lib/
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		all install
 endef

 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/bin
 	mkdir -p $(STAGING_DIR)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/libexif $(STAGING_DIR)/usr/include/
 	mkdir -p $(STAGING_DIR)/usr/lib
@ -68,4 +58,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/libexif*.{a,so*}
 endef

+define Package/libexif/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libexif*.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libexif))
--- a/libs/libffi-sable/Makefile
+++ b/libs/libffi-sable/Makefile
@ -1,3 +1,4 @@
+#
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@ -10,10 +11,10 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=libffi-sable
 PKG_VERSION:=3325
 PKG_RELEASE:=3
-PKG_MD5SUM:=0c32eaaea0269c5fbe156fcd0be3e5bd

-PKG_SOURCE_URL:=http://sablevm.org/download/snapshot/2005-01-21/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://sablevm.org/download/snapshot/2005-01-21/
+PKG_MD5SUM:=0c32eaaea0269c5fbe156fcd0be3e5bd
 PKG_CAT:=zcat

 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@ -25,32 +26,28 @@ define Package/libffi-sable
  SECTION:=libs
  CATEGORY:=Libraries
  TITLE:=Foreign Function Interface library (for sablevm)
-  DESCRIPTION:=The libffi library provides a portable, high level programming\\\
-interface to various calling conventions. This allows a programmer to\\\
-call any function specified by a call interface description at run\\\
-time.\\\
+  DESCRIPTION:=\
+	The libffi library provides a portable, high level programming \\\
+	interface to various calling conventions. This allows a programmer to \\\
+	call any function specified by a call interface description at run \\\
+	time.
  URL:=http://sources.redhat.com/libffi/
 endef

 define Build/Configure
-$(call Build/Configure/Default,--enable-shared \
--enable-static \
--disable-debug)
+	$(call Build/Configure/Default, \
+		--enable-shared \
+		--enable-static \
+		--disable-debug \
+	)
 endef

 define Build/Compile	
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef

-define Package/libffi-sable/install	
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libffi.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev	
 	mkdir -p $(STAGING_DIR)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/ffi{,target}.h $(STAGING_DIR)/usr/include/
@ -64,4 +61,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/libffi.{a,so*}
 endef

+define Package/libffi-sable/install	
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libffi.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libffi-sable))
--- a/libs/libgphoto2/Makefile
+++ b/libs/libgphoto2/Makefile
@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$

 include $(TOPDIR)/rules.mk

--- a/libs/libiconv/Makefile
+++ b/libs/libiconv/Makefile
@ -1,3 +1,4 @@
+#
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
--- a/libs/libjpeg/Makefile
+++ b/libs/libjpeg/Makefile
@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: Makefile 4153 2006-07-18 16:58:52Z florian $
+# $Id$

 include $(TOPDIR)/rules.mk

--- a/libs/libupnp/Makefile
+++ b/libs/libupnp/Makefile
@ -12,12 +12,12 @@ PKG_NAME:=libupnp
 PKG_VERSION:=1.2.1a
 PKG_RELEASE:=1

-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/upnp
 PKG_MD5SUM:=e72b3550bf064eedf080f16f09688891
 PKG_CAT:=zcat

+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install

 include $(INCLUDE_DIR)/package.mk
@ -27,10 +27,10 @@ define Package/libupnp
  CATEGORY:=Libraries
  DEPENDS:=+libpthread
  TITLE:=UPnP SDK library
-  DESCRIPTION:=UPnP (Universal Plug and Play) SDK library.\\\
-    The Universal Plug and Play (UPnP) SDK for Linux provides support \\\
-    for building UPnP-compliant control points, devices, and bridges \\\
-    on Linux.
+  DESCRIPTION:=\
+	The Universal Plug and Play (UPnP) SDK for Linux provides support \\\
+	for building UPnP-compliant control points, devices, and bridges \\\
+	on Linux.
  URL:=http://upnp.sourceforge.net/
 endef

@ -44,11 +44,6 @@ define Build/Compile
 		STRIP=/bin/true
 endef

-define Package/libupnp/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/upnp/bin/lib{ixml,threadutil,upnp}.so $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include/upnp
 	$(CP) $(PKG_BUILD_DIR)/upnp/inc/*.h $(STAGING_DIR)/usr/include/upnp/
@ -62,4 +57,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/lib{ixml,threadutil,upnp}.so
 endef

+define Package/libupnp/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/upnp/bin/lib{ixml,threadutil,upnp}.so $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libupnp))
--- a/libs/matrixssl/Makefile
+++ b/libs/matrixssl/Makefile
@ -12,13 +12,12 @@ PKG_NAME:=matrixssl
 PKG_VERSION:=1.2.4
 PKG_RELEASE:=1

-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://nbd.vd-s.ath.cx/openwrt
 PKG_MD5SUM:=771c1489488e62668d673478311d63ca
 PKG_CAT:=zcat

-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

 include $(INCLUDE_DIR)/package.mk

@ -27,7 +26,6 @@ define Package/libmatrixssl
  CATEGORY:=Libraries
  DEPENDS:=+libpthread
  TITLE:=Embedded SSL implementation
-  DESCRIPTION:=An embedded SSL implementation.
  URL:=http://www.matrixssl.org/
 endef

@ -40,11 +38,6 @@ define Build/Compile
 		DFLAGS="$(TARGET_CFLAGS) -Wall"
 endef

-define Package/libmatrixssl/install
-	install -d -m0755 $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/src/libmatrixssl.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include/matrixSsl
 	$(CP) $(PKG_BUILD_DIR)/matrixSsl.h $(STAGING_DIR)/usr/include/matrixSsl
@ -59,4 +52,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/libmatrixssl.so*
 endef

+define Package/libmatrixssl/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/src/libmatrixssl.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libmatrixssl))
--- a/libs/popt/Makefile
+++ b/libs/popt/Makefile
@ -1,14 +1,20 @@
-# $Id: Makefile 3843 2006-05-30 18:55:52Z nbd $
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id$

 include $(TOPDIR)/rules.mk

 PKG_NAME:=popt
 PKG_VERSION:=1.7
 PKG_RELEASE:=4
-PKG_MD5SUM:=5988e7aeb0ae4dac8d83561265984cc9

-PKG_SOURCE_URL:=ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/
+PKG_MD5SUM:=5988e7aeb0ae4dac8d83561265984cc9
 PKG_CAT:=zcat

 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@ -17,30 +23,25 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 include $(INCLUDE_DIR)/package.mk

 define Package/libpopt
-SECTION:=libs
-CATEGORY:=Libraries
-TITLE:=A command line option parsing library
-DESCRIPTION:=A command line option parsing library
-URL:=ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=A command line option parsing library
+  URL:=ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/
 endef

 define Build/Configure
-$(call Build/Configure/Default,--enable-shared --enable-static)
+	$(call Build/Configure/Default, \
+		--enable-shared \
+		--enable-static \
+	)
 endef

 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef

-define Package/libpopt/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpopt.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/popt.h $(STAGING_DIR)/usr/include/
@ -51,8 +52,13 @@ endef
 	
 define Build/UninstallDev
 	rm -rf \
-	  $(STAGING_DIR)/usr/include/popt.h \
-	  $(STAGING_DIR)/usr/lib/libpopt.{a,so*}
+		$(STAGING_DIR)/usr/include/popt.h \
+		$(STAGING_DIR)/usr/lib/libpopt.{a,so*}
+endef
+
+define Package/libpopt/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpopt.so.* $(1)/usr/lib/
 endef

 $(eval $(call BuildPackage,libpopt))
--- a/libs/uclibc++/Makefile
+++ b/libs/uclibc++/Makefile
@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: Makefile 3843 2006-05-30 18:55:52Z florian $
+# $Id$

 include $(TOPDIR)/rules.mk