From ab144a40106bfd47f1e7d3842cfbc824065cd8d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Wed, 11 Mar 2015 16:00:13 +0000 Subject: [PATCH] completely new, megacool build system step 1 --- m4/ax_check_qt.m4 => ax_check_qt.m4 | 0 ...tdcxx_11.m4 => ax_cxx_compile_stdcxx_11.m4 | 0 ax_init_standard_project.m4 | 239 ++++++++++++++++++ bootstrap.sh | 101 +++++++- configure.ac | 172 ++----------- debian/changelog.in | 2 +- doc/doxyfile.in | 6 +- doc/makefile.am | 49 +--- {doc/examples => examples}/cardos-demo.cxx | 0 .../create-files-demo.cxx | 0 {doc/examples => examples}/cryptoki-demo.cxx | 0 .../cryptoki-sign-demo.cxx | 0 {doc/examples => examples}/makefile.am | 0 .../moc_cardgui-model.cxx | 0 .../openssl-engine-demo.cxx | 0 .../openssl-ssl-demo.cxx | 0 .../openssl-tcp-demo.cxx | 0 {doc/examples => examples}/pcsc-demo.cxx | 0 {doc/examples => examples}/suisse-id-demo.cxx | 0 {doc/examples => examples}/suisse-id-demo.hxx | 0 makefile.am | 66 +---- src/makefile.am | 8 +- 22 files changed, 367 insertions(+), 276 deletions(-) rename m4/ax_check_qt.m4 => ax_check_qt.m4 (100%) rename m4/ax_cxx_compile_stdcxx_11.m4 => ax_cxx_compile_stdcxx_11.m4 (100%) create mode 100644 ax_init_standard_project.m4 rename {doc/examples => examples}/cardos-demo.cxx (100%) rename {doc/examples => examples}/create-files-demo.cxx (100%) rename {doc/examples => examples}/cryptoki-demo.cxx (100%) rename {doc/examples => examples}/cryptoki-sign-demo.cxx (100%) rename {doc/examples => examples}/makefile.am (100%) rename {doc/examples => examples}/moc_cardgui-model.cxx (100%) rename {doc/examples => examples}/openssl-engine-demo.cxx (100%) rename {doc/examples => examples}/openssl-ssl-demo.cxx (100%) rename {doc/examples => examples}/openssl-tcp-demo.cxx (100%) rename {doc/examples => examples}/pcsc-demo.cxx (100%) rename {doc/examples => examples}/suisse-id-demo.cxx (100%) rename {doc/examples => examples}/suisse-id-demo.hxx (100%) diff --git a/m4/ax_check_qt.m4 b/ax_check_qt.m4 similarity index 100% rename from m4/ax_check_qt.m4 rename to ax_check_qt.m4 diff --git a/m4/ax_cxx_compile_stdcxx_11.m4 b/ax_cxx_compile_stdcxx_11.m4 similarity index 100% rename from m4/ax_cxx_compile_stdcxx_11.m4 rename to ax_cxx_compile_stdcxx_11.m4 diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4 new file mode 100644 index 0000000..3f9fd31 --- /dev/null +++ b/ax_init_standard_project.m4 @@ -0,0 +1,239 @@ +## @id $Id$ + +## 1 2 3 4 5 6 7 8 +## 45678901234567890123456789012345678901234567890123456789012345678901234567890 + +m4_define(x_least, m4_esyscmd_s( + LEAST="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout" + for path in . .. ../..; do + if svn info $path 2>&1 > /dev/null; then + LEAST=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') + (cd $path && svn2cl) + break; + fi + done + echo -n $LEAST +)) +m4_define(x_bugreport, m4_esyscmd_s( + head -1 AUTHORS | \ + sed -n 's,.*<\([-_.a-z0-9A-Z]*@[-_.a-z0-9A-Z]*\)>.*,\1,gp' +)) + +m4_include(ax_check_qt.m4) + +AC_ALIAS([AC_DEFINE_DIR], [AX_DEFINE_DIR]) +AC_DEFUN([AX_DEFINE_DIR], [ + prefix_NONE= + exec_prefix_NONE= + test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix + test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix +dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn +dnl refers to ${prefix}. Thus we have to use `eval' twice. + eval ax_define_dir="\"[$]$2\"" + eval ax_define_dir="\"$ax_define_dir\"" + AC_SUBST($1, "$ax_define_dir") + AC_DEFINE_UNQUOTED($1, "$ax_define_dir", [$3]) + test "$prefix_NONE" && prefix=NONE + test "$exec_prefix_NONE" && exec_prefix=NONE +]) + +AC_DEFUN([AX_ADD_MAKEFILE_TARGET_DEP], [ + sh_add_makefile_target_dep() { + sed -i ':a;/^'${1}':.*\\$/{N;s/\\\n//;ta};s/^'${1}':.*$/& '${2}'/' "${3}" + if ! egrep -q "${1}:.* ${2}" "${3}"; then + echo "${1}: ${2}" >> "${3}" + fi + } + sh_add_makefile_target_dep "$1" "$2" "$3" + if test "$1" != ".PHONY"; then + sh_add_makefile_target_dep ".PHONY" "$2" "$3" + fi +]) + +AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ + AC_SUBST(HOME) + README=$(tail -n +3 README) + DESCRIPTION=$(head -1 README) + AUTHOR=$(head -1 AUTHORS) + AC_SUBST(AUTHOR) + _AM_SUBST_NOTMAKE([AUTHOR]) + AC_SUBST(DESCRIPTION) + _AM_SUBST_NOTMAKE([DESCRIPTION]) + AC_SUBST(README) + _AM_SUBST_NOTMAKE([README]) + DISTRO=$(lsb_release -sc) + AC_SUBST(DISTRO) + BUILD_NUMBER=${BUILD_NUMBER:-1} + AC_SUBST(BUILD_NUMBER) + BUILD_DATE=$(date -R) + AC_SUBST(BUILD_DATE) + AC_CONFIG_FILES([makefile]) + AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-standard-project-targets], [makefile.in]) + AX_ADD_MAKEFILE_TARGET_DEP([distclean-am], [distclean-standard-project-targets], [makefile.in]) + AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-standard-project-targets], [makefile.in]) + test -f makefile.in && cat >> makefile.in <> makefile.in <> makefile.in <> doc/makefile.in < running: $* ..." + result=$($* 2>&1) + res=$? + if test $res -ne 0; then + if test $check -eq 1; then + echo " error" + echo "*** Failed with return code: $res" + if test -n "$result"; then + echo "$result" + fi + exit 1 + else + echo " ignored" + fi + else + echo " success" + fi +} + +function to { + cat > "$1" + run svn add "$1" + run svn propset svn:keywords "Id" "$1" +} + +# Initialize the environment: +if ! test -f configure.ac; then + echo "->generating configure.ac" + to configure.ac < generating makefile.am" + SUBDIRS="" + for d in src test doc examples; do + test -d $d && SUBDIRS="${SUBDIRS} $d" + done + echo "${HEADER}SUBDIRS =${SUBDIRS}" | to makefile.am +fi +if ( test -d doc || grep -q AX_USE_DOXYGEN configure.ac ) \ + && ! test -f doc/makefile.am; then + echo "-> generating doc/makefile.am" + test -d doc || ( mkdir doc && svn add doc ) + echo "${HEADER}" | to doc/makefile.am +fi + +if test -f makefile; then + run --no-check make distclean +fi +run aclocal +run libtoolize --force +run automake -a +run autoconf diff --git a/configure.ac b/configure.ac index d9a5baa..d457d1b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,93 +1,29 @@ # $Id$ -AC_CONFIG_MACRO_DIR([m4]) - -# prevent HAVE_QTxxx does not appear in AM_CONDITIONAL -# in old ubuntu / debian distros -m4_include(m4/ax_check_qt.m4) -m4_include(m4/ax_cxx_compile_stdcxx_11.m4) m4_define(x_package_name, libpcscxx) m4_define(x_major, 3) m4_define(x_minor, 1) - -AC_ALIAS([AC_DEFINE_DIR], [AX_DEFINE_DIR]) -AC_DEFUN([AX_DEFINE_DIR], [ - prefix_NONE= - exec_prefix_NONE= - test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix - test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix -dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn -dnl refers to ${prefix}. Thus we have to use `eval' twice. - eval ax_define_dir="\"[$]$2\"" - eval ax_define_dir="\"$ax_define_dir\"" - AC_SUBST($1, "$ax_define_dir") - AC_DEFINE_UNQUOTED($1, "$ax_define_dir", [$3]) - test "$prefix_NONE" && prefix=NONE - test "$exec_prefix_NONE" && exec_prefix=NONE -]) - -m4_define(x_least, m4_esyscmd_s( - LEAST="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout" - for path in . .. ../..; do - if svn info $path 2>&1 > /dev/null; then - LEAST=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') - (cd $path && svn2cl) - break; - fi - done - echo -n $LEAST -)) -m4_define(x_bugreport, m4_esyscmd_s( - head -1 AUTHORS | \ - sed -n 's,.*<\([-_.a-z0-9A-Z]*@[-_.a-z0-9A-Z]*\)>.*,\1,gp' -)) +m4_include(ax_init_standard_project.m4) AC_INIT(x_package_name, x_major.x_minor.x_least, x_bugreport, x_package_name) - AM_INIT_AUTOMAKE([1.9 tar-pax]) - -SRC_DIR=src -TST_DIR= -DOC_DIR=doc - -# files to create -AC_CONFIG_FILES([makefile ${PACKAGE_NAME}.spec - src/makefile - doc/doxyfile doc/examples/makefile doc/makefile - src/${PACKAGE_NAME}.pc debian/changelog debian/control]) - -# libtool versioning -LIB_MAJOR=m4_eval(x_major+x_minor) -LIB_MINOR=x_least -LIB_LEAST=x_minor -LIB_VERSION="${LIB_MAJOR}:${LIB_MINOR}:${LIB_LEAST}" -AC_SUBST(LIB_VERSION) - -# home -AC_SUBST(HOME) - -# datadir for languages -AX_DEFINE_DIR([DATADIR], [datadir]) -#AC_SUBST(DATADIR) - -AM_CPPFLAGS="-DPACKAGE_VERSION='\"${PACKAGE_VERSION}\"' -DPACKAGE_NAME='\"${PACKAGE_NAME}\"'" - -# Get rid of that stupid -O2 -g opions! -CXXFLAGS="${CXXFLAGS:-}" +AX_INIT_STANDARD_PROJECT # languages -AC_LANG(C++) -AX_CXX_COMPILE_STDCXX_11(noext, optional) +AX_USE_CXX +AX_USE_LIBTOOL +AX_USE_DOXYGEN +AX_USE_DEBIAN_PACKAGING +AX_USE_RPM_PACKAGING +#AX_USE_CPPUNIT +AX_BUILD_EXAMPLES + +# qt features +AX_CXX_CHECK_QT([QTGUI], [QtCore QtGui]) +AX_CXX_CHECK_QT([QTWIDGETS], [QtWidgets]) # optional, needed only for qt5 +AX_CXX_CHECK_QT([QTNETWORK], [QtNetwork]) # programs -AC_PROG_CXX -AC_PROG_CPP -AC_PROG_INSTALL -AC_PROG_LN_S -AC_PROG_MAKE_SET -AC_PROG_LIBTOOL -AC_CHECK_PROG(have_doxygen, doxygen, yes, no) -AC_CHECK_PROG(have_dot, dot, yes, no) -PKG_PROG_PKG_CONFIG +#PKG_PROG_PKG_CONFIG # libraries AC_ARG_ENABLE(pkcs11-download, @@ -109,84 +45,6 @@ dnl auto.hpp: -Wno-ctor-dtor-privacy (removed) AC_CHECK_HEADER([pkcs11.h], [], [AC_MSG_ERROR([Header pkcs11.h is required])]) AC_CHECK_HEADER([wintypes.h], [], [AC_MSG_ERROR([Header wintypes.h is required])]) AC_CHECK_HEADER([mrw/checkcxx11.hxx], [], [AC_MSG_ERROR([please install mrw-c++])]) -AX_CXX_CHECK_QT([QTGUI], [QtCore QtGui]) -AX_CXX_CHECK_QT([QTWIDGETS], [QtWidgets]) # optional, needed only for qt5 -AX_CXX_CHECK_QT([QTNETWORK], [QtNetwork]) - -AC_ARG_ENABLE(pedantic, - [AS_HELP_STRING([--enable-pedantic], - [enable all warnings and checks, abort on warnings])], - [have_pedantic="$enableval"; test "$enableval" = "yes" && \ - AM_CXXFLAGS="${AM_CXXFLAGS:-} -pedantic-errors -Wall -W -Wfloat-equal -Wundef -Wendif-labels -Wpointer-arith -Wcast-align -Wwrite-strings -Wconversion -Wsign-compare -Wmissing-format-attribute -Wno-multichar -Wpacked -Wredundant-decls -Werror -Wshadow -Wcast-qual -Wno-ctor-dtor-privacy"]) -dnl problem in libs: -Wshadow -Wcast-qual -dnl auto.hpp: -Wno-ctor-dtor-privacy (removed) -AM_CONDITIONAL(PEDANTIC, test "$enableval" = "yes") -AC_ARG_ENABLE(dot, - [AS_HELP_STRING([--disable-dot], - [disable dot graphic tools for documentation])], - [have_dot="$enableval"]) -test "$enableval" = "yes" && HAVE_DOT="YES" || HAVE_DOT="NO"; -AM_PATH_CPPUNIT([1.0.0], [have_cppunit="yes"], [have_cppunit="no"]) - -MINGW32=no -MAC=no -case $host_os in - *mingw32*) MINGW32=yes;; - *darwin* | *rhapsody* | *macosx*) MAC=yes;; -esac -AM_CONDITIONAL(MINGW32, test "$MINGW32" = "yes") -AM_CONDITIONAL(MAC, test "$MAC" = "yes") - -# macros -README=$(tail -n +3 README) -README_DEB=$(tail -n +3 README | sed -e 's/^$/./g' -e 's/^/ /g') -DESCRIPTION=$(head -1 README) -AUTHOR=$(head -1 AUTHORS) -AC_SUBST(AUTHOR) -_AM_SUBST_NOTMAKE([AUTHOR]) -AC_SUBST(DESCRIPTION) -_AM_SUBST_NOTMAKE([DESCRIPTION]) -AC_SUBST(README) -_AM_SUBST_NOTMAKE([README]) -AC_SUBST(README_DEB) -_AM_SUBST_NOTMAKE([README_DEB]) -DISTRO=$(lsb_release -sc) -AC_SUBST(DISTRO) -BUILD_NUMBER=${BUILD_NUMBER:-1} -AC_SUBST(BUILD_NUMBER) -BUILD_DATE=$(date -R) -AC_SUBST(BUILD_DATE) - -# export macros -SRCDIR=${srcdir} -AC_SUBST(SRCDIR) -AC_SUBST(SRC_DIR) -AC_SUBST(TST_DIR) -AC_SUBST(DOC_DIR) -AC_SUBST(HAVE_DOT) -AC_SUBST(THREADS) -AC_SUBST(AM_CXXFLAGS) -AC_SUBST(AM_CPPFLAGS) -AC_SUBST(LIBS) # create output AC_OUTPUT - -# infos and warnings -if test "$have_doxygen" = "no"; then -AC_MSG_WARN([Missing program doxygen! - - you cannot rebuild the documentation with make doc - - there are precompiled derived files in the distribution]); fi -if test "$have_dot" = "no"; then -AC_MSG_WARN([Missing program dot! - - when you rebild documentation with make doc, there are no generated images - - there are precompiled derived files in the distribution]); fi -if test "$have_cppunit" = "no"; then -AC_MSG_WARN([Missing cppunit development library! - - you cannot check the library using "make check" - - everything else works perfectly]); fi -if test "$have_pedantic" == "yes"; then -AC_MSG_NOTICE([Pedantic compile mode enabled! - - all warnings for GNU g++ are enabled - - all warnings result in an error - - doxygen warnings are treated as error too]); fi diff --git a/debian/changelog.in b/debian/changelog.in index 8382038..7b10448 100644 --- a/debian/changelog.in +++ b/debian/changelog.in @@ -1,5 +1,5 @@ @PACKAGE@ (@PACKAGE_VERSION@~@DISTRO@.@BUILD_NUMBER@) @DISTRO@; urgency=low - * See https://dev.marc.waeckerlin.org/projects/@PACKAGE@ for changes + * Please see ChangeLog of @PACKAGE@ -- @AUTHOR@ @BUILD_DATE@ diff --git a/doc/doxyfile.in b/doc/doxyfile.in index 0c8e1c1..9b4ee4e 100644 --- a/doc/doxyfile.in +++ b/doc/doxyfile.in @@ -660,7 +660,7 @@ WARN_LOGFILE = doxygen.errors # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = @SRCDIR@/../src +INPUT = @top_srcdir@/src # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is @@ -723,7 +723,7 @@ EXCLUDE_SYMBOLS = # directories that contain example code fragments that are included (see # the \include command). -EXAMPLE_PATH = examples +EXAMPLE_PATH = @top_srcdir@/examples # If the value of the EXAMPLE_PATH tag contains directories, you can use the # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp @@ -1220,7 +1220,7 @@ SERVER_BASED_SEARCH = NO # If the GENERATE_LATEX tag is set to YES (the default) Doxygen will # generate Latex output. -GENERATE_LATEX = YES +GENERATE_LATEX = NO # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. # If a relative path is entered the value of OUTPUT_DIRECTORY will be diff --git a/doc/makefile.am b/doc/makefile.am index 5c473fc..d022660 100644 --- a/doc/makefile.am +++ b/doc/makefile.am @@ -1,48 +1,9 @@ -## @file -## -## $Id$ -## +## @id $Id$ +# +# This file has been added by bootstrap.sh on Wed, 11 Mar 2015 16:57:43 +0100 +# Feel free to change it or even remove and rebuild it, up to your needs +# ## 1 2 3 4 5 6 7 8 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890 -SUBDIRS = examples -ALL_SRC = ${top_srcdir}/src/*.[ch]xx ${top_srcdir}/src/*.doc -# ${top_srcdir}/src/*.doc -DIRS = html -#latex - -all: ${DIRS} - -.PHONY: doc clean-local distclean-local dist-hool install-data-hook \ - uninstall-hook - -deps = ${top_srcdir}/COPYING ${top_srcdir}/README \ - ${top_srcdir}/INSTALL ${top_srcdir}/NEWS ${top_srcdir}/ChangeLog - -html: ${ALL_SRC} doxyfile ${deps} - doxygen doxyfile -if PEDANTIC - test \! -s doxygen.errors -endif -# cd latex && make -# mv latex/refman.pdf @PACKAGE_NAME@-@PACKAGE_VERSION@.pdf - -CLEANFILES = doxygen.errors @PACKAGE_NAME@-@PACKAGE_VERSION@.pdf -DISTCLEANFILES = @PACKAGE_NAME@.doxytag -MAINTAINERCLEANFILES = makefile.in - -distclean-local: - - rm -r html latex - -dist-hook: html -# cp -r html latex ${distdir}/ - -install-data-hook: - test -d $(DESTDIR)${docdir} || mkdir -p $(DESTDIR)${docdir} - chmod -R u+w $(DESTDIR)${docdir} - cp -r html $(DESTDIR)${docdir}/ - -uninstall-hook: - -chmod -R u+w $(DESTDIR)${docdir} - -rm -rf $(DESTDIR)${docdir}/* diff --git a/doc/examples/cardos-demo.cxx b/examples/cardos-demo.cxx similarity index 100% rename from doc/examples/cardos-demo.cxx rename to examples/cardos-demo.cxx diff --git a/doc/examples/create-files-demo.cxx b/examples/create-files-demo.cxx similarity index 100% rename from doc/examples/create-files-demo.cxx rename to examples/create-files-demo.cxx diff --git a/doc/examples/cryptoki-demo.cxx b/examples/cryptoki-demo.cxx similarity index 100% rename from doc/examples/cryptoki-demo.cxx rename to examples/cryptoki-demo.cxx diff --git a/doc/examples/cryptoki-sign-demo.cxx b/examples/cryptoki-sign-demo.cxx similarity index 100% rename from doc/examples/cryptoki-sign-demo.cxx rename to examples/cryptoki-sign-demo.cxx diff --git a/doc/examples/makefile.am b/examples/makefile.am similarity index 100% rename from doc/examples/makefile.am rename to examples/makefile.am diff --git a/doc/examples/moc_cardgui-model.cxx b/examples/moc_cardgui-model.cxx similarity index 100% rename from doc/examples/moc_cardgui-model.cxx rename to examples/moc_cardgui-model.cxx diff --git a/doc/examples/openssl-engine-demo.cxx b/examples/openssl-engine-demo.cxx similarity index 100% rename from doc/examples/openssl-engine-demo.cxx rename to examples/openssl-engine-demo.cxx diff --git a/doc/examples/openssl-ssl-demo.cxx b/examples/openssl-ssl-demo.cxx similarity index 100% rename from doc/examples/openssl-ssl-demo.cxx rename to examples/openssl-ssl-demo.cxx diff --git a/doc/examples/openssl-tcp-demo.cxx b/examples/openssl-tcp-demo.cxx similarity index 100% rename from doc/examples/openssl-tcp-demo.cxx rename to examples/openssl-tcp-demo.cxx diff --git a/doc/examples/pcsc-demo.cxx b/examples/pcsc-demo.cxx similarity index 100% rename from doc/examples/pcsc-demo.cxx rename to examples/pcsc-demo.cxx diff --git a/doc/examples/suisse-id-demo.cxx b/examples/suisse-id-demo.cxx similarity index 100% rename from doc/examples/suisse-id-demo.cxx rename to examples/suisse-id-demo.cxx diff --git a/doc/examples/suisse-id-demo.hxx b/examples/suisse-id-demo.hxx similarity index 100% rename from doc/examples/suisse-id-demo.hxx rename to examples/suisse-id-demo.hxx diff --git a/makefile.am b/makefile.am index 177d21c..75f9cda 100644 --- a/makefile.am +++ b/makefile.am @@ -1,63 +1,9 @@ -## @file -## -## $Id$ -## -## $Date: 2008-08-26 13:09:21 $ -## $Author: marc $ -## -## @copy © Marc Wäckerlin -## @license LGPL, see file COPYING -## +## @id $Id$ +# +# This file has been added by bootstrap.sh on Wed, 11 Mar 2015 16:57:43 +0100 +# Feel free to change it or even remove and rebuild it, up to your needs +# ## 1 2 3 4 5 6 7 8 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890 -SUBDIRS = @SRC_DIR@ @TST_DIR@ @DOC_DIR@ - -nobase_include_HEADERS = - -EXTRA_DIST = bootstrap.sh debian - -DISTCLEANFILES = debian/changelog - -deb: dist - tar xzvf @PACKAGE_TARNAME@-@VERSION@.tar.gz - cd @PACKAGE_TARNAME@-@VERSION@ && dpkg-buildpackage - rm -rf @PACKAGE_TARNAME@-@VERSION@ - -doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog @PACKAGE_NAME@.spec - -RPMS = /usr/src/packages/RPMS/i586/@PACKAGE_NAME@-@PACKAGE_VERSION@-1.i586.rpm \ - /usr/src/packages/RPMS/i586/@PACKAGE_NAME@-devel-@PACKAGE_VERSION@-1.i586.rpm \ - /usr/src/packages/SRPMS/@PACKAGE_NAME@-@PACKAGE_VERSION@-1.src.rpm - -.PHONY: release tag rpm webserver \ - doc clean-local distclean-local dist-hool install-data-hook \ - uninstall-hook - -release: tag webserver - -rpm: dist - cp @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz \ - /usr/src/packages/SOURCES/ - rpmbuild -ba --clean @PACKAGE_NAME@.spec - -deps = ${top_srcdir}/COPYING ${top_srcdir}/README ${top_srcdir}/INSTALL ${top_srcdir}/NEWS ${top_srcdir}/ChangeLog - -clean-local: - - rm doxygen.err lib@PACKAGE_NAME@.doxytag - - rm @PACKAGE_NAME@-dev_@PACKAGE_VERSION@-*.deb \ - @PACKAGE_NAME@_@PACKAGE_VERSION@-*.changes \ - @PACKAGE_NAME@_@PACKAGE_VERSION@-1.tar.gz \ - @PACKAGE_NAME@_@PACKAGE_VERSION@-1.dsc \ - @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz \ - @PACKAGE_NAME@_@PACKAGE_VERSION@-*.deb - -distclean-local: - - rm -r ${top_builddir}/@DOC_DIR@/html/* ${top_builddir}/@DOC_DIR@/latex/* - - rm makefile makefile.in doxygen.err libmrw.doxytag - - find . -name '*~' | xargs rm - - rm -r autom4te.cache - - rm aclocal.m4 config.guess config.sub configure depcomp \ - install-sh ltmain.sh makefile makefile.in missing \ - mkinstalldirs m4/libtool.m4 m4/ltoptions.m4 \ - m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4 compile \ No newline at end of file +SUBDIRS = src doc examples diff --git a/src/makefile.am b/src/makefile.am index f107f9a..9835a61 100644 --- a/src/makefile.am +++ b/src/makefile.am @@ -5,10 +5,8 @@ ## 1 2 3 4 5 6 7 8 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890 -#MOC_FILES=moc_certimport.cxx include_HEADERS = pcsc.hxx cryptoki.hxx openssl.hxx cryptaux.hxx \ openssl-engine.hxx suisseid.hxx cardos.hxx -#certimport.hxx noinst_HEADERS = cardgui.hxx cardgui-model.hxx @@ -33,7 +31,6 @@ lib_LTLIBRARIES = libpcscxx.la libpcscxx_la_SOURCES = cryptoki.cxx cryptoki.hxx pcsc.cxx version.cxx \ openssl-engine.cxx -#moc_certimport.cxx libpcscxx_la_LDFLAGS = -version-info ${LIB_VERSION} libpcscxx_la_LIBADD = -lssl -lcrypto if MINGW32 @@ -58,9 +55,6 @@ endif noinst_PROGRAMS = versiontest versiontest_SOURCES = versiontest.cxx -clean-local: - -rm -r ${QMAKE_TARGET}.app - -CLEANFILES = ${MOC_FILES} ${BUILT_SOURCES} +CLEANFILES = ${BUILT_SOURCES} DISTCLEANFILES = $(pkgconfig_DATA) MAINTAINERCLEANFILES = makefile.in