From 6587728f5ef748aa6978ae9085e5cf71142e2ecb Mon Sep 17 00:00:00 2001 From: Romain Tartiere Date: Mon, 14 May 2012 14:19:59 +0000 Subject: [PATCH] Don't link to the libnfc (twice) since the libfreefare itself is linked against it. --- examples/Makefile.am | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/examples/Makefile.am b/examples/Makefile.am index 67825a0..a1beec5 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,7 +1,6 @@ # $Id$ AM_CFLAGS = -I. -I$(top_srcdir)/libfreefare @LIBNFC_CFLAGS@ -AM_LDFLAGS = @LIBNFC_LIBS@ bin_PROGRAMS = mifare-classic-format \ mifare-classic-write-ndef \ @@ -17,39 +16,39 @@ bin_PROGRAMS = mifare-classic-format \ mifare-desfire-write-ndef mifare_classic_format_SOURCES = mifare-classic-format.c -mifare_classic_format_LDADD = -lnfc $(top_builddir)/libfreefare/libfreefare.la +mifare_classic_format_LDADD = $(top_builddir)/libfreefare/libfreefare.la mifare_classic_read_ndef_SOURCES = mifare-classic-read-ndef.c -mifare_classic_read_ndef_LDADD = -lnfc $(top_builddir)/libfreefare/libfreefare.la +mifare_classic_read_ndef_LDADD = $(top_builddir)/libfreefare/libfreefare.la mifare_classic_write_ndef_SOURCES = mifare-classic-write-ndef.c -mifare_classic_write_ndef_LDADD = -lnfc $(top_builddir)/libfreefare/libfreefare.la +mifare_classic_write_ndef_LDADD = $(top_builddir)/libfreefare/libfreefare.la mifare_desfire_access_SOURCES = mifare-desfire-access.c -mifare_desfire_access_LDADD = -lnfc $(top_builddir)/libfreefare/libfreefare.la +mifare_desfire_access_LDADD = $(top_builddir)/libfreefare/libfreefare.la mifare_desfire_create_ndef_SOURCES = mifare-desfire-create-ndef.c -mifare_desfire_create_ndef_LDADD = -lnfc $(top_builddir)/libfreefare/libfreefare.la +mifare_desfire_create_ndef_LDADD = $(top_builddir)/libfreefare/libfreefare.la mifare_desfire_ev1_configure_ats_SOURCES = mifare-desfire-ev1-configure-ats.c -mifare_desfire_ev1_configure_ats_LDADD = -lnfc $(top_builddir)/libfreefare/libfreefare.la +mifare_desfire_ev1_configure_ats_LDADD = $(top_builddir)/libfreefare/libfreefare.la mifare_desfire_ev1_configure_default_key_SOURCES = mifare-desfire-ev1-configure-default-key.c -mifare_desfire_ev1_configure_default_key_LDADD = -lnfc $(top_builddir)/libfreefare/libfreefare.la +mifare_desfire_ev1_configure_default_key_LDADD = $(top_builddir)/libfreefare/libfreefare.la mifare_desfire_ev1_configure_random_uid_SOURCES = mifare-desfire-ev1-configure-random-uid.c -mifare_desfire_ev1_configure_random_uid_LDADD = -lnfc $(top_builddir)/libfreefare/libfreefare.la +mifare_desfire_ev1_configure_random_uid_LDADD = $(top_builddir)/libfreefare/libfreefare.la mifare_desfire_format_SOURCES = mifare-desfire-format.c -mifare_desfire_format_LDADD = -lnfc $(top_builddir)/libfreefare/libfreefare.la +mifare_desfire_format_LDADD = $(top_builddir)/libfreefare/libfreefare.la mifare_desfire_info_SOURCES = mifare-desfire-info.c -mifare_desfire_info_LDADD = -lnfc $(top_builddir)/libfreefare/libfreefare.la -lm +mifare_desfire_info_LDADD = $(top_builddir)/libfreefare/libfreefare.la -lm mifare_desfire_read_ndef_SOURCES = mifare-desfire-read-ndef.c -mifare_desfire_read_ndef_LDADD = -lnfc $(top_builddir)/libfreefare/libfreefare.la +mifare_desfire_read_ndef_LDADD = $(top_builddir)/libfreefare/libfreefare.la mifare_desfire_write_ndef_SOURCES = mifare-desfire-write-ndef.c -mifare_desfire_write_ndef_LDADD = -lnfc $(top_builddir)/libfreefare/libfreefare.la +mifare_desfire_write_ndef_LDADD = $(top_builddir)/libfreefare/libfreefare.la CLEANFILES= *.gcno