[Pcsclite-cvs-commit] PCSC/src Makefile.am,1.30,1.31

[aet-guest@quantz.debian.org]

Update of /cvsroot/pcsclite/PCSC/src
In directory quantz:/tmp/cvs-serv12439/src

Modified Files:
	Makefile.am 
Log Message:
- Make hotpluging / power management to compile again
- Add MacOS X build fixes


Index: Makefile.am
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/Makefile.am,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- Makefile.am	8 Sep 2003 10:06:48 -0000	1.30
+++ Makefile.am	8 Sep 2003 11:25:08 -0000	1.31
@@ -5,6 +5,7 @@
 if HAVE_MUSCLECARD
 MC_LIBS = libmusclecard.la
 MC_BIN = muscletest
+MC_HDR = mscdefines.h musclecard.h
 endif
 
 lib_LTLIBRARIES = libpcsclite.la $(MC_LIBS)
@@ -17,11 +18,9 @@
 PCSC_SYSTEM_SRC  = sys_unix.c
 PCSC_THREAD_SRC  = thread_unix.c
 PCSC_HOTPLUG_SRC  = \
-	hotplug_generic.c
-# hotplug_libusb.c \
-#	hotplug_linux.c hotplug_macosx.c
-PCSC_POWERMGT_SRC = powermgt_generic.c
-# powermgt_macosx.c
+	hotplug_generic.c hotplug_libusb.c \
+	hotplug_linux.c hotplug_macosx.c
+PCSC_POWERMGT_SRC = powermgt_generic.c powermgt_macosx.c
 
 if MSC_ENABLE_SCF
 PCSC_CLIENT_SRC  = winscard_scf.c
@@ -33,9 +32,6 @@
 PCSC_CLIENT_THR = $(PCSC_THREAD_SRC)
 endif
 
-#PCSC_INCLUDE_LIBS   = -Wl,-framework,IOKit
-#PCSCD_INCLUDE_LIBS  = -Wl,-framework,IOKit -Wl,-framework,CoreFoundation
-
 libpcsclite_core_la_SOURCES = \
 	atrhandler.c \
 	configfile.l \
@@ -61,7 +57,7 @@
 	$(PCSC_SYSTEM_SRC) \
 	$(PCSC_CLIENT_THR)
 libpcsclite_la_LDFLAGS = -version-info 0:1:0
-libpcsclite_la_LIBADD = @LIBSMARTCARD@
+libpcsclite_la_LIBADD = @COREFOUNDATION@ @LIBSMARTCARD@
 
 libmusclecard_la_SOURCES = \
 	musclecard.c \
@@ -72,7 +68,9 @@
 
 pcscd_SOURCES = pcscdaemon.c winscard_svc.c
 pcscd_CFLAGS = @CFLAGS@ @PTHREAD_CFLAGS@
-pcscd_LDADD = libpcsclite-core.la @LIBUSB@ @LIBDL@ @LIBFL@ @PTHREAD_LIBS@
+pcscd_LDADD = libpcsclite-core.la \
+	@PTHREAD_LIBS@ @COREFOUNDATION@ \
+	@LIBUSB@ @LIBDL@ @LIBFL@ @IOKIT@
 
 testpcsc_SOURCES = testpcsc.c
 testpcsc_LDADD = libpcsclite.la
@@ -81,8 +79,8 @@
 muscletest_LDADD = libmusclecard.la
 
 include_HEADERS = \
-	debuglog.h mscdefines.h musclecard.h \
-	pcsclite.h winscard.h wintypes.h
+	debuglog.h pcsclite.h winscard.h wintypes.h \
+	$(MC_HDR)
 noinst_HEADERS = \
 	atrhandler.h configfile.h dyn_generic.h eventhandler.h \
 	hotplug.h ifdhandler.h ifdwrapper.h parser.h \