[packages] tiff: add a tiff-utils subpackage

[openwrt/svn-archive/archive.git] / libs / tiff / Makefile

diff --git a/libs/tiff/Makefile b/libs/tiff/Makefile
index a3432c438827b33548a5a830aa33dd1766760207..1b24cd0a08bc563567173e51944142d083a97a5e 100644 (file)
--- a/libs/tiff/Makefile
+++ b/libs/tiff/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,35 +10,57 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tiff
 PKG_VERSION:=3.8.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:= http://libtiff.maptools.org/dl/
-PKG_FIXUP := libtool
+PKG_SOURCE_URL:=http://libtiff.maptools.org/dl/
+PKG_MD5SUM:=fbb6f446ea4ed18955e2714934e5b698
+PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
+PKG_INSTALL=1
+
+define Package/tiff/Default
+  TITLE:=TIFF
+  URL:=http://www.remotesensing.org/libtiff/
+endef
+
 define Package/libtiff
+$(call Package/tiff/Default)
   SECTION:=libs
   CATEGORY:=Libraries
-  TITLE:=TIFF libraries
+  TITLE+= libraries
   DEPENDS:=+zlib +libjpeg
 endef
 
+define Package/tiff-utils
+$(call Package/tiff/Default)
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE+= utilities
+  DEPENDS:=+libtiff
+endef
+
 TARGET_CFLAGS += $(FPIC)
 
 CONFIGURE_ARGS += --without-x
-MAKE_FLAGS += all install DESTDIR=$(PKG_INSTALL_DIR)
 
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/{lib,include}
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
 endef
 
-define Package/tiff/Install
+define Package/libtiff/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.so.* $(1)/usr/lib/
+endef
+
+define Package/tiff-utils/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,libtiff))
+$(eval $(call BuildPackage,tiff-utils))