fix disruptancies between tools location in src (utils<>examples) and…

… in Debian packages (libnfc-bin<>libnfc-examples)
dzyk · May 17, 2012 · 4bfd6ac · 4bfd6ac
1 parent 2c5bac1
commit 4bfd6ac
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
diff --git a/debian/libnfc-bin.install b/debian/libnfc-bin.install
@@ -1,8 +1,8 @@
-debian/tmp/usr/bin/nfc-emulate-forum-tag2
 debian/tmp/usr/bin/nfc-emulate-forum-tag4
 debian/tmp/usr/bin/nfc-list
 debian/tmp/usr/bin/nfc-mfclassic
 debian/tmp/usr/bin/nfc-mfultralight
+debian/tmp/usr/bin/nfc-probe
 debian/tmp/usr/bin/nfc-relay-picc
 debian/tmp/usr/bin/nfc-read-forum-tag3
 debian/tmp/usr/share/man/man1/nfc-emulate-forum-tag4.1

diff --git a/debian/libnfc-examples.install b/debian/libnfc-examples.install
@@ -1,6 +1,7 @@
 debian/tmp/usr/bin/nfc-anticol
 debian/tmp/usr/bin/nfc-dep-initiator
 debian/tmp/usr/bin/nfc-dep-target
+debian/tmp/usr/bin/nfc-emulate-forum-tag2
 debian/tmp/usr/bin/nfc-emulate-tag
 debian/tmp/usr/bin/nfc-emulate-uid
 debian/tmp/usr/bin/nfc-mfsetuid

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -5,6 +5,7 @@ SET(EXAMPLES-SOURCES
   nfc-emulate-forum-tag2
   nfc-emulate-tag
   nfc-emulate-uid
+  nfc-mfsetuid
   nfc-poll
   nfc-relay
 )

diff --git a/examples/Makefile.am b/examples/Makefile.am
@@ -7,6 +7,7 @@ bin_PROGRAMS = \
 		nfc-emulate-forum-tag2 \
 		nfc-emulate-tag \
 		nfc-emulate-uid \
+		nfc-mfsetuid \
 		nfc-poll \
 		nfc-relay \
 		pn53x-diagnose \
@@ -57,6 +58,10 @@ nfc_dep_initiator_SOURCES = nfc-dep-initiator.c
 nfc_dep_initiator_LDADD = $(top_builddir)/libnfc/libnfc.la \
 			  $(top_builddir)/utils/libnfcutils.la
 
+nfc_mfsetuid_SOURCES = nfc-mfsetuid.c
+nfc_mfsetuid_LDADD = $(top_builddir)/libnfc/libnfc.la \
+			  $(top_builddir)/utils/libnfcutils.la
+
 pn53x_diagnose_SOURCES = pn53x-diagnose.c
 pn53x_diagnose_LDADD = $(top_builddir)/libnfc/libnfc.la \
 		       $(top_builddir)/utils/libnfcutils.la
@@ -83,6 +88,7 @@ dist_man_MANS = \
 		nfc-emulate-uid.1 \
 		nfc-poll.1 \
 		nfc-relay.1 \
+		nfc-mfsetuid.1 \
 		pn53x-diagnose.1 \
 		pn53x-sam.1 \
 		pn53x-tamashell.1

diff --git a/utils/nfc-mfsetuid.1 → examples/nfc-mfsetuid.1 b/utils/nfc-mfsetuid.1 → examples/nfc-mfsetuid.1
diff --git a/utils/nfc-mfsetuid.c → examples/nfc-mfsetuid.c b/utils/nfc-mfsetuid.c → examples/nfc-mfsetuid.c
@@ -50,7 +50,7 @@
 
 #include <nfc/nfc.h>
 
-#include "nfc-utils.h"
+#include "utils/nfc-utils.h"
 
 #define SAK_FLAG_ATS_SUPPORTED 0x20
 

diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
@@ -2,7 +2,6 @@ SET(UTILS-SOURCES
   nfc-emulate-forum-tag4
   nfc-list
   nfc-mfclassic
-  nfc-mfsetuid
   nfc-mfultralight
   nfc-probe
   nfc-read-forum-tag3

diff --git a/utils/Makefile.am b/utils/Makefile.am
@@ -2,7 +2,6 @@ bin_PROGRAMS = \
 		nfc-emulate-forum-tag4 \
 		nfc-list \
 		nfc-mfclassic \
-		nfc-mfsetuid \
 		nfc-mfultralight \
 		nfc-probe \
 		nfc-read-forum-tag3 \
@@ -30,10 +29,6 @@ nfc_mfclassic_SOURCES = nfc-mfclassic.c mifare.c mifare.h
 nfc_mfclassic_LDADD = $(top_builddir)/libnfc/libnfc.la \
 		    libnfcutils.la
 
-nfc_mfsetuid_SOURCES = nfc-mfsetuid.c
-nfc_mfsetuid_LDADD = $(top_builddir)/libnfc/libnfc.la \
-		    libnfcutils.la
-
 nfc_mfultralight_SOURCES = nfc-mfultralight.c mifare.c mifare.h
 nfc_mfultralight_LDADD = $(top_builddir)/libnfc/libnfc.la
 
@@ -53,7 +48,6 @@ dist_man_MANS = \
 		nfc-emulate-forum-tag4.1 \
 		nfc-list.1 \
 		nfc-mfclassic.1 \
-		nfc-mfsetuid.1 \
 		nfc-mfultralight.1 \
 		nfc-relay-picc.1