X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=libs%2Flibnfc%2FMakefile;h=e22ecf0f4e390359150af53cc4c8e4a373e2753d;hb=3153d01b4310d2e63f2afd93e7c56610c4a8b5db;hp=cd505f39281bccc3752c1c6887145d90b57571ac;hpb=45feed650b5d4d6b377738e7dd1bcd39103b5df5;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/libs/libnfc/Makefile b/libs/libnfc/Makefile
index cd505f3928..e22ecf0f4e 100644
--- a/libs/libnfc/Makefile
+++ b/libs/libnfc/Makefile
@@ -1,14 +1,22 @@
+#
+# Copyright (C) 2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libnfc
-PKG_VERSION:=1.2.1
+PKG_VERSION:=1.3.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://libnfc.googlecode.com/files/
-PKG_MD5SUM:=90ce5d0445c6228f0e80ae3b62709f96
+PKG_MD5SUM:=f89f58e70b72bf4aac0567d0741719c8
 
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -18,7 +26,7 @@ define Package/libnfc/Default
 endef
 
 define Package/libnfc
-  $(call Package/libnfc/Default)
+$(call Package/libnfc/Default)
   SECTION:=libs
   CATEGORY:=Libraries
   DEPENDS:=+libpcsclite +libusb +pcscd +ccid
@@ -35,24 +43,25 @@ define Package/libnfc/description
   on the NXP PN53x NFC Controller.
 endef
 
-define Package/nfc-tools
-  $(call Package/libnfc/Default)
+define Package/libnfc-examples
+$(call Package/libnfc/Default)
   SECTION:=utils
   CATEGORY:=Utilities
   DEPENDS:=+libnfc
 endef
 
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
+define Package/libnfc-examples/description
+  libnfc is provided with some examples like:
+   * tag listing
+   * relaying NFC
+   * simple UID emulation
 endef
 
+TARGET_CFLAGS += $(FPIC)
+
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libnfc $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/nfc $(1)/usr/include/
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnfc.{a,so*} $(1)/usr/lib/
 	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
@@ -64,14 +73,10 @@ define Package/libnfc/install
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnfc.so.* $(1)/usr/lib/
 endef
 
-define Package/nfc-tools/install
+define Package/libnfc-examples/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-anticol $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-list $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-mftool $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-relay $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-emulate $(1)/usr/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc* $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,libnfc))
-$(eval $(call BuildPackage,nfc-tools))
+$(eval $(call BuildPackage,libnfc-examples))