diff options
| author | ploetz <ploetz@e0336214-984f-0b4b-a45f-81c69e1f0ede> | 2007-02-14 23:06:42 +0000 |
|---|---|---|
| committer | ploetz <ploetz@e0336214-984f-0b4b-a45f-81c69e1f0ede> | 2007-02-14 23:06:42 +0000 |
| commit | aab25b804f3ff519efe88b390650ee7cc1346f5d (patch) | |
| tree | 91a029bb6aaa7a4ebd95a6967bce817ff5dda2c6 | |
| parent | 65eef7a9742097179ea52341130424b2f3139a55 (diff) | |
Simplify compile options (either --enable-ccid or --enable-openct implies --enable-reader-cm5121, so that is not needed as an explicit option) (Andreas Jellinghaus <aj@dungeon.inka.de>)
git-svn-id: https://svn.gnumonks.org/trunk/librfid@1977 e0336214-984f-0b4b-a45f-81c69e1f0ede
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 20 |
2 files changed, 7 insertions, 19 deletions
diff --git a/configure.in b/configure.in index 4c28a2a..da52275 100644 --- a/configure.in +++ b/configure.in @@ -51,12 +51,6 @@ AC_ARG_ENABLE(firmware, [ENABLE_FIRMWARE=1], [ENABLE_FIRMWARE=0]) AM_CONDITIONAL(ENABLE_FIRMWARE, test "$ENABLE_FIRMWARE" == "1") -AC_ARG_ENABLE(reader-cm5x21, - [ --enable-reader-cm5x21 Support for Omnikey Cardman 5121/5321], - [ENABLE_CM5121=1], [ENABLE_CM5121=0]) -AM_CONDITIONAL(ENABLE_CM5121, test "$ENABLE_CM5121" == "1") - - AC_ARG_WITH() #AC_CHECK_HEADERS(usb.h, [have_libusb="yes"], [ AC_MSG_WARN([usb.h not found, use --enable-libusb=PATH. Otherwise, INDI will compile without Apogee USB support.]) ]) diff --git a/src/Makefile.am b/src/Makefile.am index 78f9645..7c87dde 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,31 +18,25 @@ ASIC=rfid_asic_rc632.c READER=rfid_reader_openpcd.c MISC=rfid_access_mifare_classic.c -if ENABLE_CM5121 -READER_CM5121=rfid_reader_cm5121.c -AM_CFLAGS_CM5121= -DENABLE_CM5121 - if ENABLE_CCID -READER_LOW_CCID=ccid/rfid_reader_cm5121_ccid_direct.c ccid/ccid-driver.c +READER_CM5121=rfid_reader_cm5121.c ccid/rfid_reader_cm5121_ccid_direct.c ccid/ccid-driver.c +AM_CFLAGS_CM5121= -DENABLE_CM5121 endif if HAVE_OPENCT -READER_LOW_OPENCT=rfid_reader_cm5121_openct.c -LDFLAGS_OPENCT=-lopenct -endif - +READER_CM5121=rfid_reader_cm5121.c rfid_reader_cm5121_openct.c +AM_CFLAGS_CM5121= -DENABLE_CM5121 endif INCLUDES = $(all_includes) -I$(top_srcdir)/include $(INCLUDES_FIRMWARE) \ - $(INCLUDES_STATIC) $(OPENCT_CFLAGS) + $(INCLUDES_STATIC) @OPENCT_CFLAGS@ 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) $(LDFLAGS_OPENCT) +librfid_la_LDFLAGS = -Wc,-nostartfiles -version-info $(LIBVERSION) @OPENCT_LIBS@ librfid_la_SOURCES = $(CORE) $(L2) $(PROTO) $(ASIC) $(MISC) \ - $(READER) \ - $(READER_CM5121) $(READER_LOW_CCID) $(READER_LOW_OPENCT) + $(READER) $(READER_CM5121) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = librfid.pc |