compile-fix: support Qt4 - cleanup of connection management, new major version number 3, use static connection methods; refs #26, refs #28, refs #29

This commit is contained in:
Marc Wäckerlin
2014-03-28 13:54:40 +00:00
parent 1d03f5c34d
commit b2406a1750
3 changed files with 18 additions and 8 deletions

View File

@@ -31,8 +31,6 @@ pkgconfig2_DATA = $(pkgconfig_DATA)
EXTRA_DIST = $(pkgconfig_DATA).in ${top_srcdir}/src/*.doc
bin_PROGRAMS = cardgui
lib_LTLIBRARIES = libpcscxx.la
libpcscxx_la_SOURCES = cryptoki.cxx cryptoki.hxx pcsc.cxx version.cxx \
@@ -49,12 +47,15 @@ libpcscxx_la_LIBADD += -lpcsclite
endif
endif
if HAVE_QTGUI
bin_PROGRAMS = cardgui
cardgui_SOURCES = cardgui.cxx
nodist_cardgui_SOURCES = cardgui_ui.hxx password_ui.hxx \
moc_cardgui.cxx moc_password.cxx moc_cardgui-model.cxx
BUILT_SOURCES = ${nodist_cardgui_SOURCES}
cardgui_CXXFLAGS = ${QT_GUI_CFLAGS} -fPIC
cardgui_LDADD = ${QT_GUI_LIBS} libpcscxx.la ${libpcscxx_la_LIBADD}
endif
noinst_PROGRAMS = versiontest
versiontest_SOURCES = versiontest.cxx