X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=utils%2Fhplip%2FMakefile;h=5df59c752bdc07ad4534f19a2d5d38603d4634bb;hp=6c17d5aa117010aeda7e13263c4c989b58602a40;hb=34c7c7b113b1abed39da750ef98345a524b24d45;hpb=1821a85c5470485c7d0c17174023e0e780530860

diff --git a/utils/hplip/Makefile b/utils/hplip/Makefile
index 6c17d5aa11..5df59c752b 100644
--- a/utils/hplip/Makefile
+++ b/utils/hplip/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,14 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hplip
-PKG_VERSION:=2.8.9
+PKG_VERSION:=3.9.12
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/hplip
-PKG_MD5SUM:=2e20dba86abb99a3ca59d05e814ce9a1
+PKG_MD5SUM:=2b0906b4a57b437988829557ca62adfd
 
 PKG_BUILD_DEPENDS := python
+PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -44,7 +45,7 @@ define Build/Configure
 	$(call Build/Configure/Default,\
 		$(CONFIGURE_ARGS),\
 		ac_cv_lib_cups_cupsDoFileRequest=yes \
-		LIBS="-ljpeg -lusb" \
+		LIBS="-lz -ljpeg -lusb -lcups -lpng -ltiff" \
 	)
 endef
 
@@ -52,7 +53,7 @@ define Package/hplip/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_BUILD_DIR)/.libs/libhpip.so* $(1)/usr/lib/
 	$(CP) $(PKG_BUILD_DIR)/.libs/libhpmud.so* $(1)/usr/lib/
-	
+
 	$(INSTALL_DIR) $(1)/usr/lib/cups/backend
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/hp $(1)/usr/lib/cups/backend
 
@@ -64,6 +65,12 @@ define Package/hplip/install
 
 	$(INSTALL_DIR) $(1)/usr/share/hplip/data/models/
 	$(CP) $(PKG_BUILD_DIR)/data/models/models.dat $(1)/usr/share/hplip/data/models/
+
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/usb/
+	$(INSTALL_BIN) ./files/20-hplip $(1)/etc/hotplug.d/usb/
+
+	$(INSTALL_DIR) $(1)/etc/sane.d/dll.d/
+	$(INSTALL_DATA) ./files/hplib.conf $(1)/etc/sane.d/dll.d/hplib
 endef
 
 $(eval $(call BuildPackage,hplip))