[Pcsclite-cvs-commit] PCSC/src Makefile.am,1.27,1.28
aet-guest@quantz.debian.org
aet-guest@quantz.debian.org
Sun, 07 Sep 2003 19:57:36 +0200
Update of /cvsroot/pcsclite/PCSC/src
In directory quantz:/tmp/cvs-serv31136/src
Modified Files:
Makefile.am
Log Message:
- Polish and unify Makefiles a bit
- More work towards working src/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/Makefile.am,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- Makefile.am 7 Sep 2003 17:34:42 -0000 1.27
+++ Makefile.am 7 Sep 2003 17:57:34 -0000 1.28
@@ -1,88 +1,106 @@
-## Process this file with automake to create Makefile.in.
-# $Id$
-
-pcdir= $(libdir)/pkgconfig
-pc_DATA = libpcsclite.pc
+# Process this file with automake to create Makefile.in.
SUBDIRS = . utils
-lib_LTLIBRARIES = libpcsclite.la libmusclecard.la
-noinst_LTLIBRARIES = libpcsclite-core.la
-sbin_PROGRAMS = pcscd
-check_PROGRAMS = testpcsc muscletest
+if HAVE_MUSCLECARD
+MC_LIBS = libmusclecard.la
+MC_BIN = muscletest
+endif
-include_HEADERS = \
- pcsclite.h winscard.h wintypes.h debuglog.h \
- mscdefines.h musclecard.h
+lib_LTLIBRARIES = libpcsclite.la $(MC_LIBS)
+noinst_LTLIBRARIES = libpcsclite-core.la
-if PCSC_ARCH_OSX
-PCSC_INCLUDE_LIBS = -Wl,-framework,IOKit
-PCSCD_INCLUDE_LIBS = -Wl,-framework,IOKit -Wl,-framework,CoreFoundation
-endif
+sbin_PROGRAMS = pcscd
+noinst_PROGRAMS = testpcsc $(MC_BIN)
-PCSC_DYNLOAD_SOURCE = dyn_unix.c dyn_hpux.c dyn_macosx.c dyn_generic.h
-PCSC_SYSTEM_SOURCE = sys_unix.c sys_generic.h
-PCSC_THREAD_SOURCE = thread_unix.c thread_generic.h
+PCSC_DYNLOAD_SRC = dyn_unix.c dyn_hpux.c dyn_macosx.c
+PCSC_SYSTEM_SRC = sys_unix.c
+PCSC_THREAD_SRC = thread_unix.c
if MSC_ENABLE_SCF
-PCSC_CLIENT_SRC = winscard_scf.c
-SCF_LIBS = -lsmartcard
-SCF_CFLAGS = -I/usr/include/smartcard
-else
-PCSC_CLIENT_SRC = winscard_clnt.c
-endif
-
-if PCSC_USE_LIBUSB
-PCSC_HOTPLUG_SOURCE = hotplug_libusb.c hotplug.h
-elif PCSC_LINUX_USB
-PCSC_HOTPLUG_SOURCE = hotplug_linux.c hotplug.h
-elif PCSC_ARCH_OSX
-PCSC_HOTPLUG_SOURCE = hotplug_macosx.c hotplug.h powermgt_macosx.c powermgt_generic.h
+PCSC_CLIENT_SRC = winscard_scf.c
else
-PCSC_HOTPLUG_SOURCE = hotplug_generic.c hotplug.h
+PCSC_CLIENT_SRC = winscard_clnt.c
endif
if PCSC_THR_SAFE
-PCSC_CLIENT = $(PCSC_THREAD_SOURCE)
+PCSC_CLIENT = $(PCSC_THREAD_SRC)
else
-PCSC_CLIENT =
+PCSC_CLIENT =
endif
-libpcsclite_core_la_SOURCES = atrhandler.c atrhandler.h \
- configfile.l configfile.h \
- debuglog.c debuglog.h \
- eventhandler.c eventhandler.h \
- ifdhandler.h \
- ifdwrapper.c ifdwrapper.h \
- prothandler.c prothandler.h \
- readerfactory.c readerfactory.h \
- tokenparser.l parser.h \
- winscard.c winscard.h \
- winscard_msg.c winscard_msg.h \
- $(PCSC_SYSTEM_SOURCE) $(PCSC_THREAD_SOURCE) $(PCSC_HOTPLUG_SOURCE) \
- $(PCSC_DYNLOAD_SOURCE)
-libpcsclite_core_la_LDADD = @LIBDL@
-libpcsclite_core_la_LDFLAGS = -version-info 0:2:0 $(PCSC_INCLUDE_LIBS)
+# <TO BE REMOVED>
+#if PCSC_ARCH_OSX
+#PCSC_INCLUDE_LIBS = -Wl,-framework,IOKit
+#PCSCD_INCLUDE_LIBS = -Wl,-framework,IOKit -Wl,-framework,CoreFoundation
+#endif
+#if PCSC_USE_LIBUSB
+#PCSC_HOTPLUG_SRC = hotplug_libusb.c
+#elif PCSC_LINUX_USB
+#PCSC_HOTPLUG_SRC = hotplug_linux.c
+#elif PCSC_ARCH_OSX
+#PCSC_HOTPLUG_SRC = hotplug_macosx.c powermgt_macosx.c
+#else
+#PCSC_HOTPLUG_SRC = hotplug_generic.c
+#endif
+# </TO BE REMOVED>
-libpcsclite_la_SOURCES = $(PCSC_CLIENT_SRC) debuglog.c $(PCSC_SYSTEM_SOURCE) \
- winscard_msg.c $(PCSC_CLIENT)
-libpcsclite_la_LDFLAGS = -version-info 0:1:0 $(PCSC_INCLUDE_LIBS)
+libpcsclite_core_la_SOURCES = \
+ atrhandler.c \
+ configfile.l \
+ debuglog.c \
+ eventhandler.c \
+ ifdwrapper.c \
+ prothandler.c \
+ readerfactory.c \
+ tokenparser.l \
+ winscard.c \
+ winscard_msg.c \
+ $(PCSC_SYSTEM_SRC) \
+ $(PCSC_THREAD_SRC) \
+ $(PCSC_DYNLOAD_SRC) \
+ $(PCSC_HOTPLUG_SRC)
+libpcsclite_core_la_LDFLAGS = -version-info 0:2:0
+libpcsclite_core_la_LIDADD = @LIBDL@
-libmusclecard_la_SOURCES = musclecard.c tokenparser.l tokenfactory.c \
- tokenfactory.h $(PCSC_DYNLOAD_SOURCE)
-libmusclecard_la_LDFLAGS = -lpcsclite
+libpcsclite_la_SOURCES = \
+ debuglog.c \
+ winscard_msg.c \
+ $(PCSC_CLIENT_SRC) \
+ $(PCSC_SYSTEM_SRC) \
+ $(PCSC_CLIENT)
+libpcsclite_la_LDFLAGS = -version-info 0:1:0
+libpcsclite_la_LIBADD = @LIBSMARTCARD@
-pcscd_SOURCES = pcscdaemon.c winscard_svc.c winscard_svc.h
-pcscd_LDADD = libpcsclite-core.la @LIBUSB@ @LIBDL@
-pcscd_LDFLAGS = -rdynamic $(PCSCD_INCLUDE_LIBS)
+libmusclecard_la_SOURCES = \
+ musclecard.c \
+ tokenparser.l \
+ tokenfactory.c \
+ $(PCSC_DYNLOAD_SRC)
+libmusclecard_la_LIBADD = libpcsclite.la @LIBDL@
-AM_CFLAGS = -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\"
+pcscd_SOURCES = pcscdaemon.c winscard_svc.c
+pcscd_LDFLAGS = -rdynamic $(PCSCD_INCLUDE_LIBS)
+pcscd_LDADD = libpcsclite-core.la @LIBUSB@ @LIBDL@
testpcsc_SOURCES = testpcsc.c
testpcsc_LDADD = libpcsclite.la
muscletest_SOURCES = muscletest.c
muscletest_LDADD = libmusclecard.la
+
+include_HEADERS = \
+ debuglog.h mscdefines.h musclecard.h \
+ pcsclite.h winscard.h wintypes.h
+noinst_HEADERS = \
+ atrhandler.h configfile.h dyn_generic.h eventhandler.h \
+ hotplug.h ifdhandler.h ifdwrapper.h parser.h \
+ powermgt_generic.h prothandler.h readerfactory.h \
+ sys_generic.h thread_generic.h tokenfactory.h \
+ winscard_msg.h winscard_svc.h
+
+pcdir= $(libdir)/pkgconfig
+pc_DATA = libpcsclite.pc
# Hack to be able to use flex -P to enable linking of multiple lexer
# sources into one library, until we find a way to make automake handle