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

@@ -3,10 +3,9 @@
## 1 2 3 4 5 6 7 8
## 45678901234567890123456789012345678901234567890123456789012345678901234567890
noinst_HEADERS = suisse-id-demo.hxx
noinst_PROGRAMS = pcsc-demo cryptoki-sign-demo cryptoki-demo \
openssl-tcp-demo openssl-ssl-demo \
openssl-engine-demo suisse-id-demo cardos-demo \
openssl-engine-demo cardos-demo \
create-files-demo
AM_CPPFLAGS += -I${top_srcdir}/src -I/usr/include/PCSC
@@ -35,11 +34,15 @@ openssl_tcp_demo_SOURCES = openssl-tcp-demo.cxx
openssl_ssl_demo_SOURCES = openssl-ssl-demo.cxx
openssl_engine_demo_SOURCES = openssl-engine-demo.cxx
cardos_demo_SOURCES = cardos-demo.cxx
create_files_demo_SOURCES = create-files-demo.cxx
if HAVE_QTNETWORK
noinst_PROGRAMS += suisse-id-demo
noinst_HEADERS = suisse-id-demo.hxx
suisse_id_demo_SOURCES = suisse-id-demo.cxx
# moc_suisse-id-demo.cxx
suisse_id_demo_CXXFLAGS = ${QT_NETWORK_CFLAGS} -fPIC
suisse_id_demo_LDADD = ${QT_NETWORK_LIBS}
create_files_demo_SOURCES = create-files-demo.cxx
endif
%_ui.hxx: %.ui
uic -o $@ $<