X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=utils%2Fsane-backends%2FMakefile;h=177ff122b1bbf7824b11d35f85a048dda8baf54a;hb=405b5997e4b3df7e166a03e996364c4a13ff7539;hp=39d105dc2df8be43421df02ba0a3739248e9146e;hpb=25b680300e4045f2715128a41efe215ec8689568;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/utils/sane-backends/Makefile b/utils/sane-backends/Makefile
index 39d105dc2d..177ff122b1 100644
--- a/utils/sane-backends/Makefile
+++ b/utils/sane-backends/Makefile
@@ -1,23 +1,19 @@
 #
-# 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.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sane-backends
-PKG_VERSION:=1.0.17
-PKG_RELEASE:=2
+PKG_VERSION:=1.0.20
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.sane-project.org/pub/sane/$(PKG_NAME)-$(PKG_VERSION)/
-PKG_MD5SUM:=b51c10da8a81a04e1bae88c9e6556df2
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=a0cfdfdebca2feb4f2ba5d3418b15a42
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -26,39 +22,66 @@ define Package/sane-backends/Default
   URL:=http://www.sane-project.org/
 endef
 
+define Package/sane-backends/Default/description
+ SANE (Scanner Access Now Easy) is a universal scanner interface.
+endef
+
 define Package/sane-backends
-  $(call Package/sane-backends/Default)
+$(call Package/sane-backends/Default)
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=+sane-libs
+  DEPENDS:=+sane-libs +libtiff
   TITLE+= (backends)
 endef
 
 define Package/sane-backends/description
-	SANE (Scanner Access Now Easy) is a universal scanner interface.
+$(call Package/sane-backends/Default/description)
+ This package contains the SANE daemon.
 endef
 
 define Package/sane-libs
   $(call Package/sane-backends/Default)
   SECTION:=libs
   CATEGORY:=Libraries
+  DEPENDS:=+libjpeg +libpthread +libusb
   TITLE+= (libraries)
 endef
 
 define Package/sane-libs/description
-	SANE (Scanner Access Now Easy) is a universal scanner interface.
+$(call Package/sane-backends/Default/description)
+ This package contains the SANE shared libraries.
+endef
+
+define Package/sane-frontends
+  $(call Package/sane-backends/Default)
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+sane-backends
+  TITLE+= (frontends)
 endef
- 
+
+define Package/sane-frontends/description
+$(call Package/sane-backends/Default/description)
+ This package contains the SANE frontends.
+endef
+
+TARGET_LDFLAGS += \
+	-Wl,-rpath-link $(STAGING_DIR)/usr/lib \
+	-Wl,-rpath-link $(PKG_BUILD_DIR)/backend/.libs
+
+CONFIGURE_ARGS+= \
+	--enable-shared \
+	--enable-static \
+	--disable-translations \
+	--without-gphoto2 \
+	--disable-debug \
+
 define Build/Configure
-	$(call Build/Configure/Default, \
-		--disable-ipv6 \
-		--disable-translations \
-		--without-gphoto2 \
-		--disable-debug \
-	)
+	mkdir -p $(PKG_BUILD_DIR)/backend/.libs
+	$(Build/Configure/Default)
 endef
 
-define Build/Compile	
+define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
@@ -68,11 +91,11 @@ define Package/sane-backends/conffiles
 /etc/sane.d/saned.conf
 endef
 
-define Package/sane-backends/install	
+define Package/sane-backends/install
 	$(INSTALL_DIR) $(1)/etc/sane.d
-	$(CP) $(PKG_INSTALL_DIR)/etc/sane.d/*.conf $(1)/etc/sane.d/
+	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/sane.d/*.conf $(1)/etc/sane.d/
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/saned $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/
 endef
 
 define Package/sane-libs/install
@@ -82,5 +105,18 @@ define Package/sane-libs/install
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/sane/libsane-*.so.* $(1)/usr/lib/sane/
 endef
 
+define Package/sane-frontends/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+endef
+
+define Build/InstallDev
+	mkdir -p $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/sane $(1)/usr/include/
+	mkdir -p $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsane.{a,so*} $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,sane-backends))
 $(eval $(call BuildPackage,sane-libs))
+$(eval $(call BuildPackage,sane-frontends))