- only link with openct if we need it

- don't try to build the utilities if we're cross-compiling for in-firmware

git-svn-id: https://svn.gnumonks.org/trunk/librfid@1931 e0336214-984f-0b4b-a45f-81c69e1f0ede

diff --git a/src/Makefile.am b/src/Makefile.am
index 3e2bf95..6a4ce6e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,6 +27,7 @@ endif
 
 if ENABLE_OPENCT
 READER_LOW_OPENCT=rfid_reader_cm5121_openct.c
+LDFLAGS_OPENCT=-lopenct
 endif
 
 endif
@@ -37,7 +38,7 @@ AM_CFLAGS = -std=gnu99 -D__LIBRFID__ $(AM_CFLAGS_FIRMWARE) $(AM_CFLAGS_STATIC) \
            $(AM_CFLAGS_CM5121)
 
 lib_LTLIBRARIES = librfid.la
-librfid_la_LDFLAGS = -Wc,-nostartfiles -version-info $(LIBVERSION) -lopenct
+librfid_la_LDFLAGS = -Wc,-nostartfiles -version-info $(LIBVERSION) $(LDFLAGS_OPENCT)
 librfid_la_SOURCES = $(CORE) $(L2) $(PROTO) $(ASIC) $(MISC) \
                     $(READER) \
                     $(READER_CM5121) $(READER_LOW_CCID) $(READER_LOW_OPENCT)

diff --git a/utils/Makefile.am b/utils/Makefile.am
index 7ad826e..7786f77 100644 (file)
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,5 +1,7 @@
 INCLUDES = $(all_includes) -I$(top_srcdir)/include
 
+if ENABLE_FIRMWARE
+else
 bin_PROGRAMS = librfid-tool mifare-tool send_script 
 
 librfid_tool_SOURCES = librfid-tool.c common.c
@@ -13,5 +15,4 @@ send_script_LDFLAGS = -dynamic
 mifare_tool_SOURCES = mifare-tool.c common.c
 mifare_tool_LDADD = ../src/librfid.la
 mifare_tool_LDFLAGS = -dynamic
-
-
+endif