cleanup build files

examples/makefile.am

@@ -10,22 +10,6 @@ noinst_PROGRAMS = pcsc-demo cryptoki-sign-demo cryptoki-demo		\
 
 AM_CPPFLAGS += -I${top_srcdir}/src
 AM_LDFLAGS = -L${top_builddir}/src -lpcscxx
-if MINGW32
-AM_LDFLAGS += -lwinscard -lws2_32 -lgdi32
-endif
-
-if MAC
-AM_CPPFLAGS+=-I/Library/OpenSC/include
-AM_LDFLAGS += -F/System/Library/Frameworks/PCSC.framework -framework PCSC -L/opt/local/lib -lcrypto
-endif
-if !MINGW32
-if !MAC
-AM_LDFLAGS += -lpcsclite
-endif
-endif
-if !MINGW32
-AM_LDFLAGS += -ldl -lpthread -lssl -lcrypto
-endif
 
 pcsc_demo_SOURCES = pcsc-demo.cxx
 cryptoki_demo_SOURCES = cryptoki-demo.cxx
@@ -41,5 +25,5 @@ noinst_PROGRAMS += suisse-id-demo
 noinst_HEADERS = suisse-id-demo.hxx
 suisse_id_demo_SOURCES = suisse-id-demo.cxx
 endif
-CLEANFILES = ${BUILT_SOURCES}
+
 MAINTAINERCLEANFILES = makefile.in

src/makefile.am

@@ -10,43 +10,20 @@ include_HEADERS = pcsc.hxx cryptoki.hxx openssl.hxx cryptaux.hxx	\
 
 noinst_HEADERS = cardgui.hxx cardgui-model.hxx
 
-if MINGW32
+EXTRA_DIST = ${top_srcdir}/src/*.doc
-AM_LDFLAGS = -lwinscard
-endif
-if !MINGW32
-if MAC
-AM_CPPFLAGS += -I/Library/OpenSC/include
-AM_LDFLAGS = -F/System/Library/Frameworks/PCSC.framework -framework PCSC
-endif
-endif
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libpcscxx.pc
-pkgconfig2dir = $(datarootdir)/pkgconfig
-pkgconfig2_DATA = $(pkgconfig_DATA)
-
-EXTRA_DIST = $(pkgconfig_DATA).in ${top_srcdir}/src/*.doc
 
 lib_LTLIBRARIES = libpcscxx.la
 
 libpcscxx_la_SOURCES = cryptoki.cxx cryptoki.hxx pcsc.cxx version.cxx	\
                        openssl-engine.cxx
 libpcscxx_la_LDFLAGS = -version-info ${LIB_VERSION}
-libpcscxx_la_LIBADD = -lssl -lcrypto
-if MINGW32
-libpcscxx_la_LIBADD += 
-else
-libpcscxx_la_LIBADD += -ldl
-if !MAC
-libpcscxx_la_LIBADD += -lpcsclite
-endif
-endif
 
 bin_PROGRAMS =
 
 if HAVE_QTNETWORK
 bin_PROGRAMS += cert2text
 cert2text_SOURCES = cert2text.cxx
+cert2text_LDADD = libpcscxx.la
 endif
 
 if HAVE_QTGUI
@@ -56,12 +33,11 @@ cardgui_SOURCES = cardgui.cxx cardgui.hxx password.hxx cardgui-model.hxx \
 nodist_cardgui_SOURCES = ui_cardgui.hxx ui_password.hxx \
                          moc_cardgui.cxx moc_password.cxx moc_cardgui-model.cxx
 BUILT_SOURCES = ${nodist_cardgui_SOURCES}
-cardgui_LDADD = libpcscxx.la ${libpcscxx_la_LIBADD}
+cardgui_LDADD = libpcscxx.la
 endif
 
 noinst_PROGRAMS = versiontest
 versiontest_SOURCES = versiontest.cxx
 
 CLEANFILES = ${BUILT_SOURCES}
-DISTCLEANFILES = $(pkgconfig_DATA)
 MAINTAINERCLEANFILES = makefile.in