crewID/libnfc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix disruptancies between tools location in src (utils<>examples) and in Debian packages (libnfc-bin<>libnfc-examples)

Browse source
This commit is contained in:
Philippe Teuwen 2012-05-17 19:22:25 +00:00
parent 2c5bac191f
commit 4bfd6ac874
8 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debian/libnfc-bin.install vendored
View file

@ -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-emulate-forum-tag4
debian/tmp/usr/bin/nfc-list debian/tmp/usr/bin/nfc-list
debian/tmp/usr/bin/nfc-mfclassic debian/tmp/usr/bin/nfc-mfclassic
debian/tmp/usr/bin/nfc-mfultralight debian/tmp/usr/bin/nfc-mfultralight
debian/tmp/usr/bin/nfc-probe
debian/tmp/usr/bin/nfc-relay-picc debian/tmp/usr/bin/nfc-relay-picc
debian/tmp/usr/bin/nfc-read-forum-tag3 debian/tmp/usr/bin/nfc-read-forum-tag3
debian/tmp/usr/share/man/man1/nfc-emulate-forum-tag4.1 debian/tmp/usr/share/man/man1/nfc-emulate-forum-tag4.1

1
debian/libnfc-examples.install vendored
View file

@ -1,6 +1,7 @@
debian/tmp/usr/bin/nfc-anticol debian/tmp/usr/bin/nfc-anticol
debian/tmp/usr/bin/nfc-dep-initiator debian/tmp/usr/bin/nfc-dep-initiator
debian/tmp/usr/bin/nfc-dep-target 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-tag
debian/tmp/usr/bin/nfc-emulate-uid debian/tmp/usr/bin/nfc-emulate-uid
debian/tmp/usr/bin/nfc-mfsetuid debian/tmp/usr/bin/nfc-mfsetuid

1
examples/CMakeLists.txt
View file

@ -5,6 +5,7 @@ SET(EXAMPLES-SOURCES
nfc-emulate-forum-tag2 nfc-emulate-forum-tag2
nfc-emulate-tag nfc-emulate-tag
nfc-emulate-uid nfc-emulate-uid
nfc-mfsetuid
nfc-poll nfc-poll
nfc-relay nfc-relay
) )

6
examples/Makefile.am
View file

@ -7,6 +7,7 @@ bin_PROGRAMS = \
nfc-emulate-forum-tag2 \ nfc-emulate-forum-tag2 \
nfc-emulate-tag \ nfc-emulate-tag \
nfc-emulate-uid \ nfc-emulate-uid \
nfc-mfsetuid \
nfc-poll \ nfc-poll \
nfc-relay \ nfc-relay \
pn53x-diagnose \ pn53x-diagnose \
@ -57,6 +58,10 @@ nfc_dep_initiator_SOURCES = nfc-dep-initiator.c
nfc_dep_initiator_LDADD = $(top_builddir)/libnfc/libnfc.la \ nfc_dep_initiator_LDADD = $(top_builddir)/libnfc/libnfc.la \
$(top_builddir)/utils/libnfcutils.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_SOURCES = pn53x-diagnose.c
pn53x_diagnose_LDADD = $(top_builddir)/libnfc/libnfc.la \ pn53x_diagnose_LDADD = $(top_builddir)/libnfc/libnfc.la \
$(top_builddir)/utils/libnfcutils.la $(top_builddir)/utils/libnfcutils.la
@ -83,6 +88,7 @@ dist_man_MANS = \
nfc-emulate-uid.1 \ nfc-emulate-uid.1 \
nfc-poll.1 \ nfc-poll.1 \
nfc-relay.1 \ nfc-relay.1 \
nfc-mfsetuid.1 \
pn53x-diagnose.1 \ pn53x-diagnose.1 \
pn53x-sam.1 \ pn53x-sam.1 \
pn53x-tamashell.1 pn53x-tamashell.1

0
utils/nfc-mfsetuid.1 → examples/nfc-mfsetuid.1
View file

2
utils/nfc-mfsetuid.c → examples/nfc-mfsetuid.c
View file

@ -50,7 +50,7 @@
#include <nfc/nfc.h> #include <nfc/nfc.h>
#include "nfc-utils.h" #include "utils/nfc-utils.h"
#define SAK_FLAG_ATS_SUPPORTED 0x20 #define SAK_FLAG_ATS_SUPPORTED 0x20

1
utils/CMakeLists.txt
View file

@ -2,7 +2,6 @@ SET(UTILS-SOURCES
nfc-emulate-forum-tag4 nfc-emulate-forum-tag4
nfc-list nfc-list
nfc-mfclassic nfc-mfclassic
nfc-mfsetuid
nfc-mfultralight nfc-mfultralight
nfc-probe nfc-probe
nfc-read-forum-tag3 nfc-read-forum-tag3

6
utils/Makefile.am
View file

@ -2,7 +2,6 @@ bin_PROGRAMS = \
nfc-emulate-forum-tag4 \ nfc-emulate-forum-tag4 \
nfc-list \ nfc-list \
nfc-mfclassic \ nfc-mfclassic \
nfc-mfsetuid \
nfc-mfultralight \ nfc-mfultralight \
nfc-probe \ nfc-probe \
nfc-read-forum-tag3 \ 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 \ nfc_mfclassic_LDADD = $(top_builddir)/libnfc/libnfc.la \
libnfcutils.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_SOURCES = nfc-mfultralight.c mifare.c mifare.h
nfc_mfultralight_LDADD = $(top_builddir)/libnfc/libnfc.la nfc_mfultralight_LDADD = $(top_builddir)/libnfc/libnfc.la
@ -53,7 +48,6 @@ dist_man_MANS = \
nfc-emulate-forum-tag4.1 \ nfc-emulate-forum-tag4.1 \
nfc-list.1 \ nfc-list.1 \
nfc-mfclassic.1 \ nfc-mfclassic.1 \
nfc-mfsetuid.1 \
nfc-mfultralight.1 \ nfc-mfultralight.1 \
nfc-relay-picc.1 nfc-relay-picc.1