diff --git a/.travis.yml b/.travis.yml index ea030e040b..31c025abbf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ compiler: gcc env: - BUILDENV=arch BUILDTYPE=cmake-ninja - BUILDENV=ubuntu-14.04 BUILDTYPE=cmake-make - - BUILDENV=ubuntu-14.04 BUILDTYPE=autotools services: - docker install: diff --git a/CMakeLists.txt b/CMakeLists.txt index 81226a5bd9..88b9759577 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,11 +62,6 @@ OPTION (DISABLE_NLS "do not use Native Language Support" OFF) OPTION (DISABLE_DEPRECATED_GLIB "don't use deprecated glib functions" OFF) OPTION (DISABLE_DEPRECATED_GTK "don't use deprecated gtk, gdk or gdk-pixbuf functions" OFF) OPTION (DISABLE_DEPRECATED_GNOME "don't use deprecated gnome functions" OFF) - -# If AUTOTOOLS_IN_DIST is OFF, then 'dist' wont run autogen.sh, and 'distcheck' -# won't run the autotools distcheck. Note that various Makefile.am files are still -# included in the dist when this is OFF. I'll fix that at some point. -OPTION (AUTOTOOLS_IN_DIST "Add autotools support to distribution tarballs." ON) # ############################################################ # These are also settable from the command line in a similar way. @@ -739,7 +734,6 @@ SET(SCHEME_INSTALLED_CACHE_DIR ${PKGLIBDIR}/scm/ccache/${GUILE_EFFECTIVE_VERSION ADD_SUBDIRECTORY (borrowed) ADD_SUBDIRECTORY (data) ADD_SUBDIRECTORY (doc) -ADD_SUBDIRECTORY (macros) ADD_SUBDIRECTORY (po) ADD_SUBDIRECTORY (common) ADD_SUBDIRECTORY (libgnucash) @@ -762,11 +756,8 @@ SET(PACKAGE_PREFIX "${PACKAGE}-${PACKAGE_VERSION}") SET(DIST_FILE "${PACKAGE_PREFIX}.tar") SET(toplvl_DIST_local ${gnucash_DOCS} ChangeLog.2015 ChangeLog.2016 - CMakeLists.txt configure.ac Makefile.am make-gnucash-potfiles.in README) + CMakeLists.txt make-gnucash-potfiles.in README) -IF(BUILDING_FROM_VCS AND AUTOTOOLS_IN_DIST) - SET(toplvl_DIST_local ${toplvl_DIST_local} autogen.sh) -ENDIF() SET_LOCAL_DIST(toplvl_DIST ${toplvl_DIST_local}) @@ -780,7 +771,7 @@ SET_LOCAL_DIST(toplvl_DIST ${toplvl_DIST_local}) # libgnucash/app-utils/CMakeLists.txt for an example of this. SET(ALL_DIST ${bindings_DIST} ${borrowed_DIST} ${cmake_DIST} ${common_DIST} ${data_DIST} - ${doc_DIST} ${gnucash_DIST} ${libgnucash_DIST} ${macros_DIST} ${packaging_DIST} + ${doc_DIST} ${gnucash_DIST} ${libgnucash_DIST} ${packaging_DIST} ${po_DIST} ${test_templates_DIST} ${toplvl_DIST} ${util_DIST}) @@ -788,14 +779,6 @@ IF (BUILDING_FROM_VCS) SET(BUILD_SOURCE_DIR ${CMAKE_BINARY_DIR}) ELSE() SET(BUILD_SOURCE_DIR ${CMAKE_SOURCE_DIR}) - IF(AUTOTOOLS_IN_DIST) - # Include autotools generated file in the dist - LIST(APPEND ALL_DIST compile config.guess config.sub configure depcomp install-sh missing - libgnucash/doc/design/mdate-sh libgnucash/doc/design/texinfo.tex) - IF (EXISTS ${CMAKE_SOURCE_DIR}/test-driver) # test-driver only created for automake 1.12+. - LIST(APPEND ALL_DIST test-driver) - ENDIF() - ENDIF() ENDIF() # Write a dist manifest @@ -818,7 +801,6 @@ ADD_CUSTOM_COMMAND(OUTPUT ${DIST_FILE}.gz ${DIST_FILE}.bz2 -D SHELL=${SHELL} -D AUTOTOOLS_IN_DIST=${AUTOTOOLS_IN_DIST} -D WITH_GNUCASH=${WITH_GNUCASH} - -P ${CMAKE_SOURCE_DIR}/common/cmake_modules/MakeDist.cmake DEPENDS @@ -834,7 +816,6 @@ ADD_CUSTOM_TARGET(distcheck DEPENDS dist -D PACKAGE_PREFIX=${PACKAGE_PREFIX} -D CMAKE_C_FLAGS=${CMAKE_C_FLAGS} -D CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} - -D AUTOTOOLS_IN_DIST=${AUTOTOOLS_IN_DIST} -P ${CMAKE_SOURCE_DIR}/common/cmake_modules/MakeDistCheck.cmake ) diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index d351b8fbfe..0000000000 --- a/Makefile.am +++ /dev/null @@ -1,244 +0,0 @@ -if GNUCASH_ENABLE_GUI - GNUCASH_SUBDIR = gnucash -else - GNUCASH_SUBDIR = -endif -SUBDIRS = . borrowed common libgnucash bindings ${GNUCASH_SUBDIR} doc po data - -GNC_CTAGS_FILE = @GNC_CTAGS_FILE@ -GNC_ETAGS_FILE = @GNC_ETAGS_FILE@ - -noinst_DATA = make-gnucash-potfiles - -noinst_PROGRAMS = gnc-guile -gnc_guile_SOURCES = util/guile.c -gnc_guile_CFLAGS = ${GUILE_CFLAGS} -gnc_guile_LDADD = ${GUILE_LIBS} - -dist_doc_DATA = \ - AUTHORS \ - COPYING \ - ChangeLog \ - ChangeLog.2017 \ - ChangeLog.2016 \ - ChangeLog.2015 \ - ChangeLog.2014 \ - ChangeLog.2013 \ - ChangeLog.2012 \ - ChangeLog.2011 \ - ChangeLog.2010 \ - ChangeLog.2009 \ - ChangeLog.2008 \ - ChangeLog.2007 \ - ChangeLog.2006 \ - ChangeLog.2005 \ - ChangeLog.2004 \ - ChangeLog.2003 \ - ChangeLog.2002 \ - ChangeLog.2001 \ - ChangeLog.2000 \ - ChangeLog.1999 \ - DOCUMENTERS \ - HACKING \ - INSTALL \ - LICENSE \ - NEWS \ - README \ - README.dependencies - -# All the other files that go in the distribution tarfile that aren't -# included some other way... - -# Most directories handle their own EXTRA_DIST setting, but for some, -# it's not worth the trouble and for others, there's no Makefile.am -# (i.e. ./intl and ./po -- these handle their own Makefile.in and -# Makefile.in.in files...), so we list their files here. - -# Don't list any directories or you'll get *everything*, including the -# CVS dirs. - -EXTRA_DIST = \ - CMakeLists.txt \ - cmake/cmake_uninstall.cmake.in \ - cmake/README_CMAKE.txt \ - cmake/CMakeLists.txt \ - make-gnucash-potfiles.in \ - macros/binreloc.m4 \ - macros/compiler-flags.m4 \ - macros/ax_pkg_swig.m4 \ - macros/ax_python_devel.m4 \ - macros/ax_swig_python.m4 \ - macros/legacy_macros.m4 \ - macros/CMakeLists.txt \ - po/CMakeLists.txt \ - po/check-po.cmake \ - po/glossary/CMakeLists.txt \ - po/gnucash.pot \ - po/POTFILES.in \ - po/POTFILES.skip \ - po/POTFILES.ignore \ - po/README \ - po/glossary/bg.po \ - po/glossary/ca.po \ - po/glossary/da.po \ - po/glossary/de.po \ - po/glossary/el.po \ - po/glossary/es.po \ - po/glossary/es_NI-policy.txt \ - po/glossary/fr.po \ - po/glossary/gnc-glossary.txt \ - po/glossary/he.po \ - po/glossary/hu.po \ - po/glossary/it.po \ - po/glossary/nb.po \ - po/glossary/nl.po \ - po/glossary/pl.po \ - po/glossary/pt.po \ - po/glossary/pt_BR.po \ - po/glossary/ru.po \ - po/glossary/rw.po \ - po/glossary/sk.po \ - po/glossary/sv.po \ - po/glossary/txt-to-pot.sh \ - po/glossary/vi.po \ - po/glossary/zh_CN.po \ - po/glossary/zh_TW.po \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in \ - test-templates/CMakeLists.txt \ - test-templates/Makefile.am \ - util/gnc-vcs-info \ - util/CMakeLists.txt - -make-gnucash-potfiles: make-gnucash-potfiles.in Makefile - rm -f $@.tmp - sed < $< > $@.tmp \ - -e 's:[@]SRCDIR[@]:${srcdir}:g' \ - -e 's:[@]PERL[@]:${PERL}:g' - chmod +x $@.tmp - mv $@.tmp $@ - -DISTCLEANFILES = \ - intltool-extract intltool-update intltool-merge\ - cscope.files cscope.out etags.files \ - make-gnucash-potfiles po/.intltool-merge-cache - -cscope.files: - find bindings common libgnucash gnucash lib -name '*.[ch]' > cscope.files -if GNUCASH_SEPARATE_BUILDDIR - find ${srcdir}/bindings ${srcdir}/common ${srcdir}/libgnucash ${srcdir}/gnucash ${srcdir}/lib -name '*.[ch]' >> cscope.files -endif - -${srcdir}/cscope.out: cscope.files - cscope -b -f ${srcdir}/cscope.out - - -# make sure etags.files is up to date. -# and use the contents of etags.files to re-make TAGS if needed. -etags: -if GNC_ETAGS_FILE - ${MAKE} -f Makefile.TAGS etags.files - ${MAKE} -f Makefile.TAGS TAGS -else - @echo "You must ./configure with --enable-etags to use etags." -endif - - -# make sure etags.files is up to date. -# and use the contents of etags.files to re-make tags if needed. -ctags: -if GNC_CTAGS_FILE - ${MAKE} -f Makefile.TAGS etags.files - ${MAKE} -f Makefile.TAGS tags -else - @echo "You must ./configure with --enable-ctags to use ctags." -endif - -.PHONY: etags ctags - -ACLOCAL_AMFLAGS = -I macros - -.PHONY: doc -doc: - $(MAKE) -C src/doc doc - -distcleancheck_listfiles = \ - find -type f -exec sh -c 'test -f ${srcdir}/{} || echo {}' ';' -distuninstallcheck_listfiles = \ - find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache | grep -v ./share/info/dir - -#dist-hook: po/POTFILES.in - -distcheck-hook: - @e=''; \ - for X in `grep -v \# ${distdir}/po/POTFILES.in | sed 's/\[type:.*\]//'` ; do \ - if [ ! -f ${distdir}/$$X ] ; then \ - echo $$X " is in POTFILES.in but not in the dist."; \ - e='yes'; \ - fi; \ - done; \ - for X in `grep -v '\(^\#\|.scm\$\)' ${distdir}/po/POTFILES.skip` ; do \ - if [ -f ${distdir}/$$X ] ; then \ - echo $$X " is in POTFILES.skip but also in the dist.";\ - e='yes'; \ - fi; \ - done; \ - if test "$$e" = "yes" ; then exit 1; fi; - -distclean-local: - -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - -.PHONY: pot -pot: Makefile po/POTFILES.in - rm -f po/$(PACKAGE).pot - ${MAKE} -C po $(PACKAGE).pot - - -$(srcdir)/po/POTFILES.in: make-gnucash-potfiles .potfiles - if test -w $(srcdir)/po/POTFILES.in ; then ./make-gnucash-potfiles > $(srcdir)/po/POTFILES.in ; fi - -# Creation rules so that po/gnucash.pot can always be created for -# make dist. -po/gnucash.pot: po/POTFILES.in - ${MAKE} -C po gnucash.pot - -.potfiles: - -SVN = svn - -if BUILDING_FROM_VCS -# This rule will generate a ChangeLog of gnucash/trunk commits, plus -# all additional branches that are added in -# ./macros/svn2cl.xsl. (FIXME: Is the dependency on NEWS really a good -# idea? Before a release, NEWS will get updated because of the version -# change, so this should fit just fine.) -ChangeLog: NEWS - cd $(abs_srcdir) ; \ - if test x$(VCS_TYPE) = xsvn ; then \ - $(SVN) log -v --xml -r HEAD:'{2015-01-01}' http://svn.gnucash.org/repo/gnucash | \ - $(XSLTPROC) --stringparam strip-prefix "gnucash/trunk" \ - --stringparam include-rev "yes" $(abs_srcdir)/macros/svn2cl.xsl - > $(abs_builddir)/$@ ; \ - else \ - if test x$(VCS_TYPE) = xgit ; then \ - "$(GIT_CMD)" log --format="%ad %aN %n%n%x09* %s%d%n" --date=short --since=2018-01-01 > $(abs_builddir)/$@ ; \ - else \ - touch $(abs_builddir)/$@ ; \ - echo "Note: not in svn or git. ChangeLog not regenerated." ; \ - fi ; \ - fi ; \ - cd $(abs_builddir) -endif - -ASTYLE = /usr/bin/astyle -.PHONY: indent -indent: - $(ASTYLE) --indent=spaces=4 --brackets=break --suffix=none `find ${srcdir}/{bindings,common,libgnucash,gnucash} -name '*.[hc]'` -# Use the following line if you've got astyle-1.24, but don't use -# --pad=oper with astyle 1.22 as it will reformat e.g. "return +1;" in -# a very ugly way. -# $(ASTYLE) --indent=spaces=4 --brackets=break --pad-oper -pad-header --suffix=none `find ${srcdir}/{bindings,common,libgnucash,gnucash} -name '*.[hc]'` - @echo "### GnuCash development hint: The above command might have re-indented much more files than what you intended. Please commit only those which you really want to have changed, and revert the changes in the others so that other devevelopers do not have unnecessary merge conflicts. Thanks! ###" - diff --git a/README b/README index 3f479df9fa..ed24e0e9a9 100644 --- a/README +++ b/README @@ -209,17 +209,18 @@ Building & Installing (For additional build system details, see doc/README.build-system.) -GnuCash uses GNU Automake to handle the build process, so for most of -the details, see the generic instructions in INSTALL. (If you are -building directly from Git, read the README.git file for more instructions.) -Below we detail the GnuCash specific bits. +GnuCash uses CMake to handle the build process. Details are available +in cmake/README_CMAKE.txt (If you are building directly from Git, read +the README.git file for more instructions.) Prior to building GnuCash, you will have to obtain and install the following packages: + cmake: Available https://cmake.org. - autoconf, automake, and libtool: Available at ftp://ftp.gnu.org/gnu. - RPM's and debs are widely available with most distributions. + ninja: Optional, available at http://ninja-build.org. CMake can + generated build rules for Ninja, and generally using Ninja results + in faster builds that Makefile based ones. gnome development system: headers, libraries, etc. @@ -240,44 +241,32 @@ you'll need for the systems we know about: guile libguile9-dev +Generally, up-to-date build instructions for various Linux +distributions can be found on the GnuCash wiki at +https://wiki.gnucash.org/wiki/Building - SuSE: - see README.dependencies +The options that the CMake build system understands are documented in +cmake/README_CMAKE.txt and in the Building wiki page mentioned above. -GnuCash understands a few non-standard ./configure options. You -should run ./configure --help for the most up to date summary of the -supported options. +Note that while you need the Gnome libraries installed, you don't need +to have a Gnome desktop. -If you only want a particular language installed, you can set the -LINGUAS environment variable before you run configure. For example, -to only install the French translations, run - - $ export LINGUAS=fr - $ ./configure - -If you want to make sure that all languages get installed, run - - $ unset LINGUAS - $ ./configure - -Note that while you need the Gnome libraries installed, you don't -need to have a Gnome desktop. - -Runtime and install destinations are separate. The --prefix you -specify to configure determines where the resulting binary will look +Runtime and install destinations are separate. The CMake option +CMAKE_INSTALL_PREFIX determines where the resulting binary will look for things at runtime. Normally this determines where a "make -install" will put all the files. However, automake also supports the -variable. DESTDIR is used during the `make install' step to relocate -install objects into a staging area. Each object and path is prefixed -with the value of `DESTDIR' before being copied into the install area. -Here is an example of typical DESTDIR usage: +install" will put all the files. However, cmake also supports the +DESTDIR variable. DESTDIR is used during the `make install' step to +relocate install objects into a staging area. Each object and path is +prefixed with the value of `DESTDIR' before being copied into the +install area. Here is an example of typical DESTDIR usage: make DESTDIR=/tmp/staging install - This places install objects in a directory tree built under +This places install objects in a directory tree built under `/tmp/staging'. If `/gnu/bin/foo' and `/gnu/share/aclocal/foo.m4' are to be installed, the above command would install -`/tmp/staging/gnu/bin/foo' and `/tmp/staging/gnu/share/aclocal/foo.m4'. +`/tmp/staging/gnu/bin/foo' and +`/tmp/staging/gnu/share/aclocal/foo.m4'. DESTDIR can be helpful when trying to build install images and packages. diff --git a/README.git b/README.git index 4298ec785d..14c13d67cd 100644 --- a/README.git +++ b/README.git @@ -3,41 +3,8 @@ They have been adapted from the guidelines for gnome-libs by Miguel de Icaza who adapted them from guidelines written by Owen Taylor. - + In order to build GnuCash from git, you need to run the autogen.sh - command to generate a configure script: - - ./autogen.sh - - After the ./configure script has been created, you need to run it - with all the usual options. See ./configure --help for a - reminder. For example: - - ./configure --enable-ofx --enable-opt-style-install --prefix=/opt/gnucash - - If in doubt, you can run autogen.sh, run ./configure --help, - then re-run ./configure with your options. - - (Note: Previously, autogen.sh automatically called configure as - well. This behaviour was dropped in favor of two separate calls - because autogen should be an additional step taken by only by - developers using git sources. Configure is a step taken by - everyone compiling the sources, be it from git or a tarball.) - - + Some versions of gettextize don't deal well with re-running themselves. - You will see this as an error like: - - configure.ac:1141: error: `intl/Makefile' is already registered with - AC_CONFIG_FILES. autoconf/status.m4:844: AC_CONFIG_FILES is expanded - from... configure.ac:1141: the top level - autom4te: /usr/bin/m4 failed with exit status: 1 - autoheader: /usr/bin/autom4te failed with exit status: 1 - **Error**: autoheader failed. - - If you see this error, it most likely means that you've made some - local changes to configure.ac or one or more Makefile.am. You can - reset changes on a file-by-file basis with git checkout, e.g. - - git checkout configure.ac Makefile.am +Autotools specific information in this file was removed in Jan 2018 +by Rob Gowin as part of the transition to CMake. When making changes to GnuCash and trying to commit to the repository: @@ -51,7 +18,7 @@ When making changes to GnuCash and trying to commit to the repository: you can submit your changes as a patch to gnucash-devel@gnucash.org. See README for details. - If you are making changes to gnucash SVN, you should be subscribed + If you are making changes to gnucash, you should be subscribed to gnucash-devel@gnucash.org and to gnucash-changes@gnucash.org. (Subscription address: http://www.gnucash.org/en/lists.phtml) gnucash-devel@gnucash.org is a good place to ask about intended @@ -66,10 +33,13 @@ When making changes to GnuCash and trying to commit to the repository: run git pull, build and make distcheck. If that passes, it's safe to push. - + It's wise to do major work in a branch. That allows you to keep the rest of your repo up to date. It's also better to commit small changes often rather than to make a single large change. Run make check often so that you can quickly find errors. + + It's wise to do major work in a branch. That allows you to keep the + rest of your repo up to date. It's also better to commit small + changes often rather than to make a single large change. Run make + check often so that you can quickly find errors. - + When code is added from new developers, add them to AUTHORS and - to doc/sgml/C/xacc-about.sgml. + + When code is added from new developers, add them to AUTHORS and to + doc/sgml/C/xacc-about.sgml. Dave Peticolas June 21, 2002 diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 54641d53fa..0000000000 --- a/autogen.sh +++ /dev/null @@ -1,246 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -if test -z "$srcdir" ; then srcdir=`dirname $0` ; fi -if test -z "$srcdir" ; then srcdir=. ; fi -cd $srcdir - -DIE=0 - -if [ -n "${GNOME2_PATH}" ]; then - for dir in `echo ${GNOME2_PATH} | sed 's/:/ /g'`; do - if test -d "${dir}/share/aclocal"; then - ACLOCAL_FLAGS="${ACLOCAL_FLAGS} -I ${dir}/share/aclocal" - fi; - if test -d "${dir}/bin"; then - PATH="${PATH}:${dir}/bin" - fi; - done; - export PATH -fi - -# usage: test_version program version -# returns 0 if program >= version; returns 1 if not. -test_version() -{ - this_prog="$1" - want_vers="$2" - - testv=`"$this_prog" --version 2>/dev/null | head -n 1 | awk '{print $NF}'` - if test -z "$testv" ; then return 1 ; fi - - testv_major=`echo "$testv" | sed 's/\([0-9]*\).\([0-9]*\).*$/\1/'` - testv_minor=`echo "$testv" | sed 's/\([0-9]*\).\([0-9]*\).*$/\2/'` - - vers_major=`echo "$want_vers" | sed 's/\([0-9]*\).\([0-9]*\).*$/\1/'` - vers_minor=`echo "$want_vers" | sed 's/\([0-9]*\).\([0-9]*\).*$/\2/'` - - # if wanted_major > found_major, this isn't good enough - if test $vers_major -gt $testv_major ; then - return 1 - # if wanted_major < found_major, then this is fine - elif test $vers_major -lt $testv_major ; then - return 0 - # if we get here, then the majors are equal, so test the minor version - # we want found_minor >= want_minor. - # So, if want_minor > found_minor, this is bad. - elif test $vers_minor -gt $testv_minor ; then - return 1 - # this is it. - else - return 0 - fi -} - -# usage: find_program preset program version "" -# sets "program" to the name of the program to use. -# if preset is set, then use that regardless, -# otherwise check if "program" is of a good enough version and use that, -# otherwise check if "program-version" is of a good enough version and use that. -# otherwise return an error. -find_program() -{ - find="$1" - prog="$2" - vers="$3" - extravers="$4" - - if test -n "$find" ; then - test_version "$find" "$vers" - status="$?" - if test "$status" = 0 ; then - program="$find" - return 0 - fi - echo "**Error**: cannot use $find" - else - - test_version "$prog" "$vers" - status=$? - if test "$status" = 0 ; then - program="$prog" - return 0 - fi - - for test_vers in $vers $extravers ; do - test_version "$prog-$test_vers" "$vers" - status=$? - if test "$status" = 0 ; then - program="$prog-$test_vers" - return 0 - fi - done - fi - - echo - echo "**Warning**: Could not find a $prog that identifies itself >= $vers." - echo - program="$prog" -} - -############################################################ -# -# Store all required programs in variables. All of these variables -# could have been set by the developer beforehand, if he/she needs to -# override the defaults of here. - -: ${GLIB_GETTEXTIZE=glib-gettextize} -: ${INTLTOOLIZE=intltoolize} -: ${LIBTOOLIZE=libtoolize} - -find_program "$AUTOCONF" autoconf 2.59 -AUTOCONF="$program" -find_program "$AUTOHEADER" autoheader 2.59 -AUTOHEADER="$program" -find_program "$AUTOMAKE" automake 1.11 -AUTOMAKE="$program" -find_program "$ACLOCAL" aclocal 1.9 -ACLOCAL="$program" - -############################################################ -# -# All variables are set. Now check whether these programs are really -# available. - -(${GLIB_GETTEXTIZE} --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`glib-gettextize' installed to compile GnuCash." - echo "Get the development packages of the glib-2.x library from your distribution." - DIE=1 -} - -(${INTLTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`intltoolize' installed to compile GnuCash." - echo "Get the package 'intltool' of your distribution." - DIE=1 -} - -# On MacOS, libtoolize is installed as glibtoolize, so handle that here. -(${LIBTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || { - LIBTOOLIZE=glibtoolize - (${LIBTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`libtoolize' installed to compile GnuCash." - echo "Could not find either \`libtoolize' or \'glibtoolize'." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 - } -} - -(${AUTOMAKE} --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`automake' installed to compile GnuCash." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 - NO_AUTOMAKE=yes -} - - -# if no automake, don't bother testing for aclocal -test -n "$NO_AUTOMAKE" || (${ACLOCAL} --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: Missing \`aclocal'. The version of \`automake'" - echo "installed doesn't appear recent enough (older than automake-1.4)." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -(${AUTOCONF} --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`autoconf' installed to compile GnuCash." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -if test "$DIE" -eq 1; then - exit 1 -fi - -case $CC in -xlc ) - am_opt=--include-deps;; -esac - -############################################################ -# -# All programs are available. So now actually call them in the -# required order. - -echo "Creating po/POTFILES.in ..." -test -r po/POTFILES.in || touch po/POTFILES.in - -echo "Creating aclocal.m4 ..." -test -r aclocal.m4 || touch aclocal.m4 - -echo "Running ${GLIB_GETTEXTIZE} --force --copy ... " -echo "GnuCash note: Please ignore the output of ${GLIB_GETTEXTIZE} below!" -echo "no" | ${GLIB_GETTEXTIZE} --force --copy -echo "GnuCash note: Please ignore the output of ${GLIB_GETTEXTIZE} above!" -echo - -echo "Ensure aclocal.m4 is writable ..." -test -r aclocal.m4 && chmod u+w aclocal.m4 - -echo "Ensure po/POTFILES.in is writable ..." -test -r po/POTFILES.in && chmod u+w po/POTFILES.in - -echo "Running ${INTLTOOLIZE} --force --copy ..." -${INTLTOOLIZE} --force --copy || \ - { echo "**Error**: ${INTLTOOLIZE} failed."; exit 1; } - -echo "Running ${LIBTOOLIZE} --force --copy ..." -${LIBTOOLIZE} --force --copy || \ - { echo "**Error**: ${LIBTOOLIZE} failed."; exit 1; } - -aclocalinclude="$ACLOCAL_FLAGS -I macros" -echo "Running ${ACLOCAL} $aclocalinclude ..." -${ACLOCAL} $aclocalinclude || \ - { echo "**Error**: ${ACLOCAL} failed."; exit 1; } - -echo "Running ${AUTOHEADER}..." -${AUTOHEADER} || { echo "**Error**: ${AUTOHEADER} failed."; exit 1; } - -echo "Running ${AUTOMAKE} --add-missing --gnu --warnings=no-portability $am_opt ..." -${AUTOMAKE} --add-missing --gnu --warnings=no-portability $am_opt || \ - { echo "**Error**: ${AUTOMAKE} failed."; exit 1; } - -echo "Running ${AUTOCONF} ..." -${AUTOCONF} || \ - { echo "**Error**: ${AUTOCONF} failed."; exit 1; } - -############################################################ -# Done. - -conf_flags="--enable-compile-warnings" # --enable-iso-c --enable-error-on-warning - -echo "" -echo "NOTE: Just run configure. Even if something told you to run" -echo " aclocal, automake, or anything else above, IGNORE IT." -echo " Everything has been run properly. Just run configure..." -echo "" -echo You must now run $srcdir/configure $conf_flags "$@" ... diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt index f34b2da2b7..10d7e2342b 100644 --- a/bindings/CMakeLists.txt +++ b/bindings/CMakeLists.txt @@ -1,4 +1,4 @@ ADD_SUBDIRECTORY(python) -SET_LOCAL_DIST(bindings_DIST_local CMakeLists.txt Makefile.am) +SET_LOCAL_DIST(bindings_DIST_local CMakeLists.txt ) SET(bindings_DIST ${bindings_DIST_local} ${python_bindings_DIST} PARENT_SCOPE) diff --git a/bindings/Makefile.am b/bindings/Makefile.am deleted file mode 100644 index bfe93cb29b..0000000000 --- a/bindings/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -if WITH_PYTHON - PYTHON_DIR = python -endif -SUBDIRS = ${PYTHON_DIR} - -EXTRA_DIST = CMakeLists.txt diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt index 2038a35d2d..eda793185e 100644 --- a/bindings/python/CMakeLists.txt +++ b/bindings/python/CMakeLists.txt @@ -106,7 +106,7 @@ SET(python_bindings_DATA ${PYEXEC_FILES} sqlite3test.c timespec.i) -SET_LOCAL_DIST(python_bindings_DIST_local CMakeLists.txt Makefile.am +SET_LOCAL_DIST(python_bindings_DIST_local CMakeLists.txt ${python_bindings_DATA}) SET(python_bindings_DIST ${python_bindings_DIST_local} diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am deleted file mode 100644 index 1a6c883d39..0000000000 --- a/bindings/python/Makefile.am +++ /dev/null @@ -1,145 +0,0 @@ -SUBDIRS = . tests - -SWIG_FILES = gnucash_core.i timespec.i - -pkgpyexec_DATA = \ - __init__.py \ - function_class.py \ - gnucash_core.py \ - gnucash_core_c.py \ - gnucash_business.py - -pkgpyexec_LTLIBRARIES = _gnucash_core_c.la - -_gnucash_core_c_la_SOURCES = \ - gnucash_core.c - -_gnucash_core_c_la_CPPFLAGS = \ - $(PYTHON_CPPFLAGS) \ - $(GLIB_CFLAGS) \ - -I$(top_srcdir)/common \ - -I$(top_srcdir)/libgnucash/engine \ - -I${top_srcdir}/gnucash/gnome-utils \ - -I${top_srcdir}/libgnucash/app-utils \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/gnucash/gnome \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/gnc-module - -# Suppress all warnings for now, but we really only need to -Wno-implicit -AM_CFLAGS = -w - -_gnucash_core_c_la_LDFLAGS = -avoid-version -module - -_gnucash_core_c_la_LIBADD = \ - ${GLIB_LIBS} \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la -if BUILDING_FROM_VCS -_gnucash_core_c_includes= \ - ${top_builddir}/config.h \ - ${top_srcdir}/libgnucash/engine/qofsession.h \ - ${top_srcdir}/libgnucash/engine/qofbook.h \ - ${top_srcdir}/libgnucash/engine/qofbackend.h \ - ${top_srcdir}/libgnucash/engine/qoflog.h \ - ${top_srcdir}/libgnucash/engine/qofutil.h \ - ${top_srcdir}/libgnucash/engine/qofid.h \ - ${top_srcdir}/libgnucash/engine/guid.h \ - ${top_srcdir}/libgnucash/gnc-module/gnc-module.h \ - ${top_srcdir}/libgnucash/engine/gnc-engine.h \ - ${top_srcdir}/libgnucash/engine/Transaction.h \ - ${top_srcdir}/libgnucash/engine/Split.h \ - ${top_srcdir}/libgnucash/engine/Account.h \ - ${top_srcdir}/libgnucash/engine/gnc-commodity.h \ - ${top_srcdir}/libgnucash/engine/gnc-lot.h \ - ${top_srcdir}/libgnucash/engine/gnc-numeric.h \ - ${top_srcdir}/libgnucash/engine/gncCustomer.h \ - ${top_srcdir}/libgnucash/engine/gncEmployee.h \ - ${top_srcdir}/libgnucash/engine/gncVendor.h \ - ${top_srcdir}/libgnucash/engine/gncAddress.h \ - ${top_srcdir}/libgnucash/engine/gncBillTerm.h \ - ${top_srcdir}/libgnucash/engine/gncOwner.h \ - ${top_srcdir}/libgnucash/engine/gncInvoice.h \ - ${top_srcdir}/libgnucash/engine/gncJob.h \ - ${top_srcdir}/libgnucash/engine/gncEntry.h \ - ${top_srcdir}/libgnucash/engine/gncTaxTable.h \ - ${top_srcdir}/libgnucash/engine/gncIDSearch.h \ - ${top_srcdir}/libgnucash/engine/gnc-pricedb.h \ - ${top_srcdir}/libgnucash/app-utils/gnc-prefs-utils.h - - -gnucash_core.c: $(SWIG_FILES) ${top_srcdir}/common/base-typemaps.i ${top_srcdir}/libgnucash/engine/engine-common.i $(_gnucash_core_c_includes) - $(SWIG) -python -Wall -Werror \ - -I$(GLIB_CFLAGS) -I$(top_srcdir)/common \ - -I$(top_srcdir)/libgnucash/engine \ - -I$(top_srcdir)/libgnucash/app-utils -I${srcdir} -o $@ $< - -gnucash_core_c.py: gnucash_core.c $(SWIG_FILES) -endif - -EXTRA_DIST = \ - $(pkgpyexec_DATA) \ - $(SWIG_FILES) \ - example_scripts/Invoice.tex \ - example_scripts/latex_invoices.py \ - example_scripts/simple_book.py \ - example_scripts/simple_session.py \ - example_scripts/simple_test.py \ - example_scripts/simple_business_create.py \ - example_scripts/simple_invoice_insert.py \ - example_scripts/simple_sqlite_create.py \ - example_scripts/change_tax_code.py \ - example_scripts/account_analysis.py \ - example_scripts/new_book_with_opening_balances.py \ - example_scripts/test_imbalance_transaction.py \ - example_scripts/rest-api/gnucash_rest.py \ - example_scripts/rest-api/gnucash_simple.py \ - example_scripts/rest-api/README \ - example_scripts/CMakeLists.txt \ - CMakeLists.txt - -MAINTAINERCLEANFILES = gnucash_core.c - - -check_PROGRAMS = sqlite3test -sqlite3test_SOURCES = sqlite3test.c -sqlite3test_LDADD = ${_gnucash_core_c_la_LIBADD} -sqlite3test_CPPFLAGS = ${_gnucash_core_c_la_CPPFLAGS} - -PYTHON_GNUCASH_LINK_FILES = \ - $(pkgpyexec_DATA) - - -if BUILDING_FROM_VCS - PYTHON_LINK_FILES = $(filter-out gnucash_core_c.py,${PYTHON_GNUCASH_LINK_FILES}) -else - PYTHON_LINK_FILES = ${PYTHON_GNUCASH_LINK_FILES} -endif - -.py-links:$(PYTHON_GNUCASH_LINK_FILES) - $(RM) -rf gnucash - mkdir -p gnucash -if GNUCASH_SEPARATE_BUILDDIR - for X in ${PYTHON_LINK_FILES} ; do \ - $(LN_S) -f ${srcdir}/$$X . ; \ - done -endif - ( cd gnucash; for file in $(PYTHON_GNUCASH_LINK_FILES) ; do \ - $(LN_S) -f ../$$file .; \ - done ) - - -if ! OS_WIN32 - touch .py-links -endif - -noinst_DATA = .py-links - -CLEANFILES = $(BUILT_SOURCES) .py-links gnucash_core.c.py - -clean-local: - rm -rf gnucash - -uninstall-local: - rm -rf ${pkgpyexecdir} diff --git a/bindings/python/tests/CMakeLists.txt b/bindings/python/tests/CMakeLists.txt index 75bc92e93f..fffd04feef 100644 --- a/bindings/python/tests/CMakeLists.txt +++ b/bindings/python/tests/CMakeLists.txt @@ -17,4 +17,4 @@ SET(test_python_bindings_DATA test_split.py test_transaction.py) -SET_DIST_LIST(test_python_bindings_DIST CMakeLists.txt Makefile.am ${test_python_bindings_DATA}) +SET_DIST_LIST(test_python_bindings_DIST CMakeLists.txt ${test_python_bindings_DATA}) diff --git a/bindings/python/tests/Makefile.am b/bindings/python/tests/Makefile.am deleted file mode 100644 index f965265970..0000000000 --- a/bindings/python/tests/Makefile.am +++ /dev/null @@ -1,50 +0,0 @@ -GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/libgnucash/engine \ - --gnc-module-dir ${top_builddir}/libgnucash/app-utils \ - --guile-load-dir ${top_builddir}/libgnucash/core-utils \ - --guile-load-dir ${top_builddir}/libgnucash/gnc-module \ - --guile-load-dir ${top_builddir}/libgnucash/engine \ - --guile-load-dir ${top_builddir}/libgnucash/scm \ - --guile-load-dir ${top_builddir}/libgnucash/app-utils \ - --library-dir ${top_builddir}/libgnucash/core-utils \ - --library-dir ${top_builddir}/libgnucash/gnc-module \ - --library-dir ${top_builddir}/libgnucash/engine \ - --library-dir ${top_builddir}/libgnucash/backend/xml \ - --library-dir ${top_builddir}/libgnucash/backend/sql \ - --library-dir ${top_builddir}/libgnucash/app-utils \ - --library-dir ${top_builddir}/common/test-core - -TESTS_ENVIRONMENT = \ - GNC_BUILDDIR="${abs_top_builddir}" \ - PYTHON=${PYTHON} \ - PYTHONPATH=$$PYTHONPATH:$(top_builddir)/bindings/python \ - PYTHONPATH=$$PYTHONPATH:$(top_builddir)/bindings/python/.libs \ - PYTHONPATH=$$PYTHONPATH:$(top_srcdir)/bindings/python/tests \ - PYTHONPATH=$$PYTHONPATH:$(top_builddir)/common/test-core/ \ - PYTHONPATH=$$PYTHONPATH:$(top_srcdir)/common/test-core/ \ - PYTHONPATH=$$PYTHONPATH:$(top_builddir)/common/test-core/.libs \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS}) - -runTests.py: runTests.py.in ${top_builddir}/config.status Makefile - rm -f $@.tmp - sed < $< > $@.tmp \ - -e 's#[@]PYTHON[@]#${PYTHON}#' - mv $@.tmp $@ - chmod u+x $@ - -CLEANFILES = runTests.py - -TESTS = runTests.py - -clean-local: - rm -f translog.* - -EXTRA_DIST = \ - runTests.py.in \ - test_account.py \ - test_book.py \ - test_split.py \ - test_commodity.py \ - test_numeric.py \ - test_transaction.py \ - test_business.py \ - CMakeLists.txt diff --git a/borrowed/CMakeLists.txt b/borrowed/CMakeLists.txt index bae9763435..cf7e0e06ee 100644 --- a/borrowed/CMakeLists.txt +++ b/borrowed/CMakeLists.txt @@ -3,5 +3,5 @@ ADD_SUBDIRECTORY(goffice) if (WITH_AQBANKING AND NOT HAVE_GWEN_GTK3) ADD_SUBDIRECTORY(gwengui-gtk3) endif() -SET_LOCAL_DIST(borrowed_DIST_local CMakeLists.txt Makefile.am README) +SET_LOCAL_DIST(borrowed_DIST_local CMakeLists.txt README) SET(borrowed_DIST ${borrowed_DIST_local} ${libc_DIST} ${goffice_DIST} ${gwengui_gtk3_DIST} PARENT_SCOPE) diff --git a/borrowed/Makefile.am b/borrowed/Makefile.am deleted file mode 100644 index 46105f48ab..0000000000 --- a/borrowed/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -if GNUCASH_ENABLE_GUI -SUBDIRS = libc goffice -if WITH_AQBANKING -SUBDIRS += gwengui-gtk3 -endif -else -SUBDIRS = libc -endif - -EXTRA_DIST = README CMakeLists.txt - diff --git a/borrowed/goffice/CMakeLists.txt b/borrowed/goffice/CMakeLists.txt index b056787a81..157b022d14 100644 --- a/borrowed/goffice/CMakeLists.txt +++ b/borrowed/goffice/CMakeLists.txt @@ -11,5 +11,5 @@ set(goffice_SOURCES go-optionmenu.c go-charmap-sel.c go-glib-extras.c) # ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} # RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -SET_DIST_LIST(goffice_DIST CMakeLists.txt Makefile.am +SET_DIST_LIST(goffice_DIST CMakeLists.txt README ${goffice_noinst_HEADERS} ${goffice_SOURCES}) diff --git a/borrowed/goffice/Makefile.am b/borrowed/goffice/Makefile.am deleted file mode 100644 index 9953916337..0000000000 --- a/borrowed/goffice/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -noinst_LTLIBRARIES = libgnc-goffice.la - -REALSRCS = go-optionmenu.c \ - go-charmap-sel.c \ - go-glib-extras.c -REALHDRS = go-optionmenu.h \ - go-charmap-sel.h \ - go-glib-extras.h - -libgnc_goffice_la_SOURCES = ${REALSRCS} -noinst_HEADERS = ${REALHDRS} - -libgnc_goffice_la_LIBADD = $(GTK_LIBS) \ - ${LIBXML2_LIBS} - -AM_CPPFLAGS = $(GTK_CFLAGS) \ - ${LIBXML2_CFLAGS} - -EXTRA_DIST = $(REALSRCS) $(REALHDRS) CMakeLists.txt diff --git a/borrowed/gwengui-gtk3/CMakeLists.txt b/borrowed/gwengui-gtk3/CMakeLists.txt index a9b68f9d53..1a5c559a24 100644 --- a/borrowed/gwengui-gtk3/CMakeLists.txt +++ b/borrowed/gwengui-gtk3/CMakeLists.txt @@ -37,7 +37,7 @@ SET (gwengui_gtk3_EXTRA_DIST w_spinbox.c ) -SET_DIST_LIST(gwengui_gtk3_DIST CMakeLists.txt Makefile.am +SET_DIST_LIST(gwengui_gtk3_DIST CMakeLists.txt ${gwengui_gtk3_SOURCES} ${gwengui_gtk3_noinst_HEADERS} ${gwengui_gtk3_EXTRA_DIST} diff --git a/borrowed/gwengui-gtk3/Makefile.am b/borrowed/gwengui-gtk3/Makefile.am deleted file mode 100644 index b27a0dda23..0000000000 --- a/borrowed/gwengui-gtk3/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -AM_CPPFLAGS=$(GWEN_CFLAGS) $(GTK_CFLAGS) - -DEFS+=-DBUILDING_GTK3_GUI -DPACKAGE=\"$(PACKAGE)\" - -lib_LTLIBRARIES=libgwengui-gtk3.la - -libgwengui_gtk3_la_LIBADD=$(GTK_LIBS) $(GWEN_LIBS) -libgwengui_gtk3_la_LDFLAGS = -no-undefined - -noinst_HEADERS=\ - gtk3_gui.h \ - gtk3_gui_p.h \ - gtk3_gui_dialog_l.h \ - gtk3_gui_dialog_p.h - -libgwengui_gtk3_la_SOURCES=\ - gtk3_gui_dialog.c \ - gtk3_gui.c - - -EXTRA_DIST=\ - w_combobox.c \ - w_label.c \ - w_dialog.c \ - w_gridlayout.c \ - w_groupbox.c \ - w_image.c \ - w_hlayout.c \ - w_hline.c \ - w_hspacer.c \ - w_lineedit.c \ - w_vlayout.c \ - w_vline.c \ - w_vspacer.c \ - w_pushbutton.c \ - w_textbrowser.c \ - w_textedit.c \ - w_stack.c \ - w_tabbook.c \ - w_progressbar.c \ - w_listbox.c \ - w_checkbox.c \ - w_scrollarea.c \ - w_radiobutton.c \ - w_spinbox.c diff --git a/borrowed/libc/CMakeLists.txt b/borrowed/libc/CMakeLists.txt index d0fedf18a5..8295edd492 100644 --- a/borrowed/libc/CMakeLists.txt +++ b/borrowed/libc/CMakeLists.txt @@ -1,4 +1,4 @@ SET(libc_SOURCES libc-missing-noop.c setenv.c strfmon.c strptime.c) SET(libc_HEADERS pow.h setenv.h strfmon.h strptime.h) -SET_DIST_LIST(libc_DIST CMakeLists.txt Makefile.am ${libc_SOURCES} ${libc_HEADERS}) \ No newline at end of file +SET_DIST_LIST(libc_DIST CMakeLists.txt ${libc_SOURCES} ${libc_HEADERS}) \ No newline at end of file diff --git a/borrowed/libc/Makefile.am b/borrowed/libc/Makefile.am deleted file mode 100644 index a4a9f9566d..0000000000 --- a/borrowed/libc/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -noinst_LTLIBRARIES = libc-missing.la - -# All header files must be listed. -noinst_HEADERS = \ - setenv.h \ - strfmon.h \ - strptime.h \ - pow.h - -# No sources should be listed. -libc_missing_la_SOURCES = libc-missing-noop.c - -EXTRA_libc_missing_la_SOURCES = \ - setenv.c \ - strfmon.c \ - strptime.c \ - CMakeLists.txt - -# This will automatically be filled in with the necessary object file -# names. Configure does this based upon the AC_REPLACE_FUNCS macros. -LIBOBJS = @LIBOBJS@ -LTLIBOBJS = $(shell echo "$(LIBOBJS)" | sed '@LIBOBJS_SEDSCRIPT@' | \ - sed 's,\.[^.]* ,.lo ,g;s,\.[^.]*$$,.lo,') - -libc_missing_la_LIBADD = $(LTLIBOBJS) - -if OS_WIN32 - AM_CPPFLAGS = -DOS_WIN32 -endif - -print_libobjs: Makefile - @echo "LIBOBJS = $(LIBOBJS)" - @echo "LTLIBOBJS = $(LTLIBOBJS)" diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index c63e54f235..1a4833d266 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -19,6 +19,6 @@ ELSE() ENDIF() -SET_LOCAL_DIST(common_DIST_local CMakeLists.txt Makefile.am ${common_EXTRA_DIST}) +SET_LOCAL_DIST(common_DIST_local CMakeLists.txt ${common_EXTRA_DIST}) SET(common_DIST ${common_DIST_local} ${cmake_modules_DIST} ${debug_DIST} ${test_core_DIST} PARENT_SCOPE) diff --git a/common/Makefile.am b/common/Makefile.am deleted file mode 100644 index f5a7625dae..0000000000 --- a/common/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -# These directories do not contain any gtk dependencies -# Note the unusual ordering of some test directories. This is -# because test-core depends on engine and the test directories -# in turn depend on test-core. -SUBDIRS = \ - . \ - debug -# Note normally SUBDIRS should also include test-core. That directory -# however depends on libgnucash/engine and hence is included in -# libgnucash/Makefile.am for proper build oldering. This would not -# be needed if our Makefiles were structured to be included one -# in the other instead of for a recursive make invocation. - -noinst_HEADERS = \ - swig-runtime.h - -if BUILDING_FROM_VCS -swig-runtime.h: - $(SWIG) -guile -external-runtime $@ -endif -MAINTAINERCLEANFILES = swig-runtime.h - -EXTRA_DIST = \ - base-typemaps.i \ - cmake_modules/MacroAppendForeach.cmake \ - cmake_modules/GncAddSwigCommand.cmake \ - cmake_modules/GncAddTest.cmake \ - cmake_modules/MakeDist.cmake \ - cmake_modules/COPYING-CMAKE-SCRIPTS.txt \ - cmake_modules/MakeDistFiles.cmake \ - cmake_modules/MacroAddSourceFileCompileFlags.cmake \ - cmake_modules/MakeDistCheck.cmake \ - cmake_modules/GncAddSchemeTargets.cmake \ - cmake_modules/GncAddGSchemaTargets.cmake \ - cmake_modules/GncFindPkgConfig.cmake \ - cmake_modules/CMakeLists.txt \ - config.h.cmake.in \ - gnc-test-env.pl \ - guile-mappings.h \ - platform.h \ - CMakeLists.txt diff --git a/common/cmake_modules/MakeDist.cmake b/common/cmake_modules/MakeDist.cmake index 1dc0a25e01..0f531d07fb 100644 --- a/common/cmake_modules/MakeDist.cmake +++ b/common/cmake_modules/MakeDist.cmake @@ -13,35 +13,6 @@ include(${CMAKE_MODULE_PATH}/MakeDistFiles.cmake) -FUNCTION(FIND_AUTOMAKE AUTOMAKE_VAR ACLOCAL_VAR AUTOMAKE_VERSION_VAR NEED_OVERRIDE_VAR) - FIND_PROGRAM(AUTOMAKE automake) - EXECUTE_PROCESS( - COMMAND ${AUTOMAKE} --version - RESULT_VARIABLE AUTOMAKE_RESULT - OUTPUT_VARIABLE AUTOMAKE_OUTPUT - ERROR_VARIABLE AUTOMAKE_ERROR - ) - - SET(AUTOMAKE_OK TRUE) - SET(NEED_OVERRIDE FALSE) - IF(${AUTOMAKE} STREQUAL AUTOMAKE-NOTFOUND) - SET(AUTOMAKE_OK FALSE) - ELSE() - STRING(REGEX REPLACE ".*automake \\(GNU automake\\) ([0-9]\\.[0-9]+).*" "\\1" AUTOMAKE_VERSION "${AUTOMAKE_OUTPUT}") - FIND_PROGRAM(ACLOCAL aclocal) - IF(${ACLOCAL} STREQUAL ACLOCAL-NOTFOUND) - MESSAGE(FATAL_ERROR "Found ok version of automake, but can't find aclocal") - ENDIF() - ENDIF() - IF (NOT AUTOMAKE_OK) - MESSAGE(FATAL_ERROR "Can't find 'automake' or 'automake-1.11'") - MESSAGE(" You can set AUTOTOOLS_IN_DIST=OFF to exclude autotools support.") - ENDIF() - SET(${AUTOMAKE_VAR} ${AUTOMAKE} PARENT_SCOPE) - SET(${ACLOCAL_VAR} ${ACLOCAL} PARENT_SCOPE) - SET(${AUTOMAKE_VERSION_VAR} ${AUTOMAKE_VERSION} PARENT_SCOPE) - SET(${NEED_OVERRIDE_VAR} ${NEED_OVERRIDE} PARENT_SCOPE) -ENDFUNCTION() FUNCTION(MAKE_DIST PACKAGE_PREFIX GNUCASH_SOURCE_DIR BUILD_SOURCE_DIR BUILDING_FROM_VCS) @@ -84,62 +55,8 @@ FUNCTION(MAKE_DIST PACKAGE_PREFIX GNUCASH_SOURCE_DIR BUILD_SOURCE_DIR BUILDING_F ENDIF() ENDFOREACH() - CMAKE_POLICY(SET CMP0012 NEW) - IF (${BUILDING_FROM_VCS} AND AUTOTOOLS_IN_DIST) - FIND_AUTOMAKE(AUTOMAKE ACLOCAL AUTOMAKE_VERSION NEED_OVERRIDE) - # -- Run autogen.sh to cause Makefile.in files to be created. - SET(CMAKE_COMMAND_AUTOTOOLS ${SHELL} -c) - IF (${CMAKE_VERSION} VERSION_GREATER 3.1) - SET(CMAKE_COMMAND_AUTOTOOLS ${CMAKE_COMMAND} -E env) - ENDIF() - IF (${NEED_OVERRIDE}) - EXECUTE_PROCESS( - COMMAND ${CMAKE_COMMAND_AUTOTOOLS} AUTOMAKE=${AUTOMAKE} ACLOCAL=${ACLOCAL} ./autogen.sh - WORKING_DIRECTORY ${PACKAGE_PREFIX} - RESULT_VARIABLE AUTOGEN_RESULT - OUTPUT_VARIABLE AUTOGEN_OUTPUT - ) - ELSE() - EXECUTE_PROCESS( - COMMAND ${CMAKE_COMMAND_AUTOTOOLS} ./autogen.sh - WORKING_DIRECTORY ${PACKAGE_PREFIX} - RESULT_VARIABLE AUTOGEN_RESULT - OUTPUT_VARIABLE AUTOGEN_OUTPUT - ) - ENDIF() - IF(NOT ${AUTOGEN_RESULT} STREQUAL "0") - MESSAGE(FATAL_ERROR "autogen.sh step failed: ${AUTOGEN_RESULT}") - ENDIF() - # -- Remove autogen files as they are not distributed. - - FILE(REMOVE ${PACKAGE_PREFIX}/autogen.sh) - FILE(REMOVE_RECURSE ${PACKAGE_PREFIX}/autom4te.cache) - - # -- Autogen.sh creates some files a symbolic links that we turn into real files here. - - IF (UNIX) # No symbolic links on Windows - SET(LINKS missing config.guess COPYING depcomp INSTALL install-sh config.sub compile) - IF(${AUTOMAKE_VERSION} VERSION_GREATER 1.11) - LIST(APPEND LINKS test-driver) - ENDIF() - FOREACH(link ${LINKS}) - GET_FILENAME_COMPONENT(realpath ${PACKAGE_PREFIX}/${link} REALPATH) - FILE(REMOVE ${PACKAGE_PREFIX}/${link}) - FILE(COPY ${realpath} DESTINATION ${PACKAGE_PREFIX}) - ENDFOREACH(link) - - FOREACH(link libgnucash/doc/design/mdate-sh libgnucash/doc/design/texinfo.tex) - GET_FILENAME_COMPONENT(dir ${link} DIRECTORY) - GET_FILENAME_COMPONENT(realpath ${PACKAGE_PREFIX}/${link} REALPATH) - FILE(REMOVE ${PACKAGE_PREFIX}/${link}) - FILE(COPY ${realpath} DESTINATION ${PACKAGE_PREFIX}/${dir}) - ENDFOREACH(link) - ENDIF(UNIX) - - ENDIF() - # -- Create the tarball. EXECUTE_PROCESS_AND_CHECK_RESULT( diff --git a/common/cmake_modules/MakeDistCheck.cmake b/common/cmake_modules/MakeDistCheck.cmake index 6ff291e879..c172b07682 100644 --- a/common/cmake_modules/MakeDistCheck.cmake +++ b/common/cmake_modules/MakeDistCheck.cmake @@ -89,70 +89,4 @@ FUNCTION(RUN_DIST_CHECK PACKAGE_PREFIX EXT) ENDFUNCTION() -FUNCTION(RUN_AUTOTOOLS_DIST_CHECK PACKAGE_PREFIX) - # We assume that the RUN_DIST_CHECK() function has been run so that we can - # use the untarred distribution created by that step. - SET(BUILD_DIR ${PACKAGE_PREFIX}) - SET(INSTALL_DIR "_cmake_install_autotools") - FILE(REMOVE_RECURSE ${INSTALL_DIR}) - FILE(MAKE_DIRECTORY ${INSTALL_DIR}) - - SET(MY_CMAKE_COMMAND "") - IF (${CMAKE_VERSION} VERSION_GREATER 3.1) - SET(MY_CMAKE_COMMAND ${CMAKE_COMMAND} -E env) - ENDIF() - - IF(CMAKE_PREFIX_PATH) - EXECUTE_PROCESS_AND_CHECK_RESULT( - COMMAND ${MY_CMAKE_COMMAND} - LDFLAGS=-L${CMAKE_PREFIX_PATH}/lib - CFLAGS=${CMAKE_C_FLAGS} - CXXFLAGS=${CMAKE_CXX_FLAGS} - CPPFLAGS=-I${CMAKE_PREFIX_PATH}/include - PATH=${CMAKE_PREFIX_PATH}/bin:$ENV{PATH} - ./configure --prefix=${CMAKE_CURRENT_SOURCE_DIR}/${INSTALL_DIR} --enable-compile-warnings - --with-dbi-dbd-dir=${CMAKE_PREFIX_PATH}/lib/dbd - WORKING_DIRECTORY ${BUILD_DIR} - ERROR_MSG "Autotools 'configure' step failed." - ) - - ELSE() - EXECUTE_PROCESS_AND_CHECK_RESULT( - COMMAND ${MY_CMAKE_COMMAND} - ./configure --prefix=${CMAKE_CURRENT_SOURCE_DIR}/${INSTALL_DIR} --enable-compile-warnings - WORKING_DIRECTORY ${BUILD_DIR} - ERROR_MSG "Autotools 'configure' step failed." - ) - ENDIF() - EXECUTE_PROCESS_AND_CHECK_RESULT( - COMMAND ${MY_CMAKE_COMMAND} make -j 4 - WORKING_DIRECTORY ${BUILD_DIR} - ERROR_MSG "Autotools 'make' step failed." - ) - - EXECUTE_PROCESS_AND_CHECK_RESULT( - COMMAND ${MY_CMAKE_COMMAND} make check - WORKING_DIRECTORY ${BUILD_DIR} - ERROR_MSG "Autotools 'make check' step failed." - ) - - EXECUTE_PROCESS_AND_CHECK_RESULT( - COMMAND ${MY_CMAKE_COMMAND} make install - WORKING_DIRECTORY ${BUILD_DIR} - ERROR_MSG "Autotools 'make install' step failed." - ) - - EXECUTE_PROCESS_AND_CHECK_RESULT( - COMMAND ${MY_CMAKE_COMMAND} make uninstall - WORKING_DIRECTORY ${BUILD_DIR} - ERROR_MSG "Autotools 'make uninstall' step failed." - ) - - MESSAGE("Autotools distcheck complete.") - -ENDFUNCTION() - RUN_DIST_CHECK(${PACKAGE_PREFIX} .gz) -IF (AUTOTOOLS_IN_DIST) - RUN_AUTOTOOLS_DIST_CHECK(${PACKAGE_PREFIX}) -ENDIF() diff --git a/common/debug/CMakeLists.txt b/common/debug/CMakeLists.txt index bfd13bf89b..dab400c4ae 100644 --- a/common/debug/CMakeLists.txt +++ b/common/debug/CMakeLists.txt @@ -1,4 +1,4 @@ ADD_SUBDIRECTORY(valgrind) -SET_LOCAL_DIST(debug_DIST_local CMakeLists.txt Makefile.am) +SET_LOCAL_DIST(debug_DIST_local CMakeLists.txt ) SET(debug_DIST ${debug_DIST_local} ${valgrind_DIST} PARENT_SCOPE) \ No newline at end of file diff --git a/common/debug/Makefile.am b/common/debug/Makefile.am deleted file mode 100644 index a799a3a7a3..0000000000 --- a/common/debug/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -SUBDIRS = \ - valgrind - -EXTRA_DIST = CMakeLists.txt diff --git a/common/debug/valgrind/CMakeLists.txt b/common/debug/valgrind/CMakeLists.txt index 9f5897ef3d..1d40c8fabb 100644 --- a/common/debug/valgrind/CMakeLists.txt +++ b/common/debug/valgrind/CMakeLists.txt @@ -8,4 +8,4 @@ SET(valgrind_FILES valgrind-x11.supp ) -SET_DIST_LIST(valgrind_DIST CMakeLists.txt Makefile.am ${valgrind_FILES}) \ No newline at end of file +SET_DIST_LIST(valgrind_DIST CMakeLists.txt ${valgrind_FILES}) \ No newline at end of file diff --git a/common/debug/valgrind/Makefile.am b/common/debug/valgrind/Makefile.am deleted file mode 100644 index a7e7cdb15e..0000000000 --- a/common/debug/valgrind/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ - -EXTRA_DIST = \ - valgrind-gdk.supp \ - valgrind-glib.supp \ - valgrind-gnucash.supp \ - valgrind-libfontconfig.supp \ - valgrind-libgda.supp \ - valgrind-libguile.supp \ - valgrind-x11.supp \ - CMakeLists.txt diff --git a/common/test-core/CMakeLists.txt b/common/test-core/CMakeLists.txt index d9a727629a..410eedebfa 100644 --- a/common/test-core/CMakeLists.txt +++ b/common/test-core/CMakeLists.txt @@ -19,7 +19,7 @@ INCLUDE_DIRECTORIES( ) SET_DIST_LIST(test_core_DIST ${test_core_SOURCES} ${test_core_noinst_HEADERS} CMakeLists.txt - Makefile.am unittest-support.i unittest-support.scm) + unittest-support.i unittest-support.scm) ADD_LIBRARY(test-core STATIC ${test_core_SOURCES} ${test_core_noinst_HEADERS}) TARGET_LINK_LIBRARIES(test-core gncmod-engine ${GLIB2_LDFLAGS}) diff --git a/common/test-core/Makefile.am b/common/test-core/Makefile.am deleted file mode 100644 index b30af7d9d6..0000000000 --- a/common/test-core/Makefile.am +++ /dev/null @@ -1,137 +0,0 @@ -noinst_LTLIBRARIES = libtest-core.la - -SWIG_FILES = \ - unittest-support.i - -libtest_core_la_SOURCES = \ - test-stuff.c \ - unittest-support.c - -libtest_core_la_LIBADD = \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${GLIB_LIBS} - -noinst_HEADERS = \ - test-stuff.h \ - unittest-support.h - -libtest_core_la_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_srcdir}/libgnucash/engine \ - ${GLIB_CFLAGS} - -libtest_core_la_LDFLAGS = \ - -rpath ${exec_prefix}/lib - -if BUILDING_FROM_VCS -swig-unittest-support-guile.c: unittest-support.i $(top_srcdir)/common/base-typemaps.i - $(SWIG) -guile -Linkage module \ - -I${top_srcdir}/common \ - ${AM_CPPFLAGS} -o $@ $< - -swig-unittest-support-python.c: unittest-support.i $(top_srcdir)/common/base-typemaps.i - $(SWIG) -python -Wall -Werror \ - -I${GLIB_CFLAGS} -I${top_srcdir}/common \ - ${AM_CPPFLAGS} -o $@ $< - -unittest-support.py: swig-unittest-support-python.c ${SWIG_FILES} -endif -noinst_LTLIBRARIES += libtest-core-guile.la -libtest_core_guile_la_SOURCES = swig-unittest-support-guile.c -libtest_core_guile_la_LIBADD = \ - ${GUILE_LIBS} \ - ${GLIB_LIBS} \ - libtest-core.la - -libtest_core_guile_la_CFLAGS = \ - ${libtest_core_la_CPPFLAGS} \ - ${GUILE_CFLAGS} \ - ${AM_CFLAGS} - -libtest_core_guile_la_LDFLAGS = \ - -rpath ${exec-prefix}/lib - -if WITH_PYTHON - -noinst_LTLIBRARIES += _unittest_support.la - -_unittest_support_la_SOURCES = \ - swig-unittest-support-python.c -_unittest_support_la_CFLAGS = \ - ${libtest_core_la_CPPFLAGS} \ - ${PYTHON_CPPFLAGS} -_unittest_support_la_LDFLAGS = \ - ${PYTHON_LDFLAGS} \ - -module \ - -rpath ${exec-prefix}/lib - -_unittest_support_la_LIBADD = \ - ${PYTHON_LIBS} \ - ${PYTHON_EXTRA_LIBS} \ - libtest-core.la - -endif - -if GOOGLE_TEST_LIBS -noinst_LIBRARIES = libgmock.a -else -noinst_LIBRARIES = \ - libgtest.a \ - libgmock.a -nodist_libgtest_a_SOURCES = ${GTEST_SRC}/src/gtest-all.cc -libgtest_a_CPPFLAGS = ${AM_CPPFLAGS} -I${GTEST_HEADERS} -I${GTEST_SRC} -endif -nodist_libgmock_a_SOURCES = ${GMOCK_SRC_PATH}/gmock-all.cc -libgmock_a_CPPFLAGS = ${libgtest_a_CPPFLAGS} -I${GMOCK_HEADERS} -I${GMOCK_SRC} - -gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash -gncscmmod_DATA = unittest-support.scm - -SCM_FILES = $(gncscmmod_DATA) - -.scm-links: - $(RM) -rf gnucash - mkdir -p gnucash -if GNUCASH_SEPARATE_BUILDDIR - for X in ${SCM_FILES} ; do \ - $(LN_S) -f ${srcdir}/$$X . ; \ - done -endif - ( cd gnucash; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../$$A . ; done ) -if ! OS_WIN32 -# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567). - touch .scm-links -endif - -GUILE_COMPILE_ENV = \ - --library-dir ${top_builddir}/common/test-core \ - --library-dir ${top_builddir}/libgnucash/engine \ - --library-dir ${top_builddir}/libgnucash/gnc-module \ - --library-dir ${top_builddir}/libgnucash/core-utils - -%.go : %.scm .scm-links $(noinst_LTLIBRARIES) - GNC_UNINSTALLED=yes \ - GNC_BUILDDIR=${top_builddir} \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \ - $(GUILD) compile -o $@ $< - -gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash -gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) - -clean-local: - $(RM) -rf gnucash - -noinst_DATA = .scm-links -CLEANFILES = .scm-links ${gncscmmodcache_DATA} - -EXTRA_DIST = \ - $(SCM_FILES) \ - swig-unittest-support-python.c \ - swig-unittest-support-guile.c \ - unittest_support.py \ - unittest-support.i \ - CMakeLists.txt - -MAINTAINERCLEANFILES = \ - swig-unittest-support-guile.c \ - swig-unittest-support-python.c diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 04d43c450a..0000000000 --- a/configure.ac +++ /dev/null @@ -1,1765 +0,0 @@ -## -*-m4-*- - -dnl Process this file with autoconf to produce a configure script. - -# FILE: -# configure.in -# -# FUNCTION: -# implements checks for a variety of system-specific functions -# -# Contents: -# Headers - Autoconf header stuff -# Variables - Hardcoded variables -# Programs - Check for programs binaries -# Functions - Check for functions -# With - Check for --with/without options -# Enable - Check for --enable/disable options -# Libraries - Check for libraries -# Footer - Autoconf footer stuff - -# Autoconf initialization -AC_PREREQ(2.60) -AC_INIT([GnuCash], [2.7.3], [https://bugzilla.gnome.org/page.cgi?id=browse.html&product=GnuCash], , [http://www.gnucash.org/]) -AC_CONFIG_HEADERS(config.h) -AC_CONFIG_SRCDIR(libgnucash/engine/Transaction.h) -AC_CONFIG_MACRO_DIR([macros]) - -#Change this in development versions when changing anything that -#affects stored data structures. Reset to zero when bumping version. -GNUCASH_NANO_VERSION=0 -#This should be the earliest version in the form XXMMUUNN (XX=MAJOR, -#MM=MINOR, UU=MICRO, NN=NANO) or SVN revision if before 2.4.1 which is -#storage-compatible with the current version. See the comments in -#libgnucash/backend/dbi/gnc-backend-dbi.c:gnc_dbi_load. -GNUCASH_RESAVE_VERSION=19920 -# Initialize automake -- make sure we have at least version 1.9 Note: -# Automake 1.14 & 1.15 issue a ton of warnings about subdir-objects, which -# will become the default in automake 2.0; unfortunately this option -# is broken and prevents building without passing -# --disable-dependency-tracking to configure, which make-distcheck -# doesn't do. Fixes are in git and expected in Automake-1.16. See -# http://lists.gnu.org/archive/html/automake/2014-04/msg00002.html and -# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13928 for details. -# In the meantime the best option is to use Automake 1.13 or earlier. -AM_INIT_AUTOMAKE([1.9 tar-ustar dist-bzip2]) - -# Parse out the version number -GNUCASH_VERSION_STRING=AC_PACKAGE_VERSION -GNUCASH_MAJOR_VERSION=`echo $GNUCASH_VERSION_STRING | [ sed -e 's/^\([^\.]*\)\.\([^.]*\)\.\(.*\)$/\1/' ]` -GNUCASH_MINOR_VERSION=`echo $GNUCASH_VERSION_STRING | [ sed -e 's/^\([^\.]*\)\.\([^.]*\)\.\(.*\)$/\2/' ]` -GNUCASH_MICRO_VERSION=`echo $GNUCASH_VERSION_STRING | [ sed -e 's/^\([^\.]*\)\.\([^.]*\)\.\(.*\)$/\3/' ]` -GNUCASH_LATEST_STABLE_SERIES=$GNUCASH_MAJOR_VERSION.$(($GNUCASH_MINOR_VERSION-($GNUCASH_MINOR_VERSION%2))) - -# save any user/environment optimization flags before we muck with them in -# --enable-debug: -USER_OPTIMIZATION="" -for flag in $CFLAGS; do - tmp_flag=`echo $flag | sed -e 's,-O.,,'` - if test -z "$tmp_flag"; then - USER_OPTIMIZATION="$USER_OPTIMIZATION ${flag}" - fi -done - -## Do this first, because the other tests depend on it: - -# Check for gcc and intltool (somehow breaks the suggested content -# order, doesn't it? Whatever.) -AC_PROG_CC -AM_PROG_CC_C_O -AC_GNU_SOURCE -AC_PROG_INTLTOOL -# Ensure the C++ compiler supports C++ 11: -AX_CXX_COMPILE_STDCXX_11(ext) -# Ensure the C compiler supports C11 -AX_CHECK_COMPILE_FLAG([-std=gnu11], - [AX_APPEND_FLAG([-std=gnu11])], - [AC_MSG_ERROR([The compiler doesn't support the C11 (gnu11) standard.]) - ]) - -AC_SUBST(GNUCASH_MAJOR_VERSION) -AC_SUBST(GNUCASH_MINOR_VERSION) -AC_SUBST(GNUCASH_MICRO_VERSION) -AC_SUBST(GNUCASH_NANO_VERSION) -AC_SUBST(GNUCASH_LATEST_STABLE_SERIES) - -AC_DEFINE_UNQUOTED(GNUCASH_MAJOR_VERSION, $GNUCASH_MAJOR_VERSION, - [GnuCash Major version number]) -AC_DEFINE_UNQUOTED(GNUCASH_MINOR_VERSION, $GNUCASH_MINOR_VERSION, - [GnuCash Minor version number]) -AC_DEFINE_UNQUOTED(GNUCASH_MICRO_VERSION, $GNUCASH_MICRO_VERSION, - [GnuCash Micro version number]) -AC_DEFINE_UNQUOTED(GNUCASH_NANO_VERSION, $GNUCASH_NANO_VERSION, - [GnuCash Nano version number]) -AC_DEFINE_UNQUOTED(GNUCASH_RESAVE_VERSION, $GNUCASH_RESAVE_VERSION, - [GnuCash earliest compatible databaseversion number]) -AC_DEFINE_UNQUOTED(GNUCASH_LATEST_STABLE_SERIES, "$GNUCASH_LATEST_STABLE_SERIES", - [Most recent stable GnuCash series]) - -AC_ARG_VAR([GNUCASH_BUILD_ID],[Overrides the GnuCash build identification (Build ID) which defaults -to a description of the vcs commit from which gnucash is built. Distributions may want to insert a package -management based version number instead]) -AC_DEFINE_UNQUOTED(GNUCASH_BUILD_ID, "$GNUCASH_BUILD_ID", - [GnuCash build identification, which defaults - to a description of the vcs commit from which gnucash is built. Distributions may want - to insert a package management based version string instead.]) - -dnl Set of available languages: -dnl managed at the Translation Project: -TP_LINGUAS="az ca cs da eu fa ja nl rw sk sr sv tr uk zh_CN" -dnl already marked as external at TP: -GC_LINGUAS="ar bg de el en_GB es fi fr gu he hi hu it kn ko lt lv mr nb ne pl pt pt_BR ro ru ta te ur vi zh_TW " -dnl New or unmarked: The release manager should announce them to TP -dnl and when listed there move in the respective group above. -NEW_LINGUAS="as brx doi es_NI kok kok@latin ks mai mni mni@bengali" - -ALL_LINGUAS="$TP_LINGUAS $GC_LINGUAS $NEW_LINGUAS" - -GETTEXT_PACKAGE=gnucash -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", - [GetText version number]) - -AM_GLIB_GNU_GETTEXT - - -# Enable only when we have autoconf --version >= 2.59 -# on all platforms. Note that AC_PREREQ(2.59) may be -# insufficient to actually use v2.59 on OSX -#AC_CONFIG_MACRO_DIR(macros) - -AC_PROG_INSTALL -PKG_PROG_PKG_CONFIG - -dnl clang wants to check file encodings, and we need to tell it not to -dnl because of the unicode currency symbols. But older versions of GCC -dnl don't like the warning suppression option, so we need to set it only -dnl with clang. - -AC_MSG_CHECKING([if compiling with clang]) - -AC_COMPILE_IFELSE( -[AC_LANG_PROGRAM([], [[ -#ifndef __clang__ - not clang -#endif -]])], -[ac_cv_CLANG=yes], [ac_cv_CLANG=no]) - -AC_MSG_RESULT([$ac_cv_CLANG]) -AM_CONDITIONAL([CLANG], [test "x$ac_cv_CLANG" = "xyes"]) - -###-------------------------------------------------------- -### Begin C++ dependencies -###-------------------------------------------------------- -PKG_CHECK_MODULES(ICU4C, icu-uc, [ac_cv_ICU4C=yes], [ac_cv_ICU4C=no]) -PKG_CHECK_MODULES(ICU4C_I18N, icu-i18n, [ac_cv_ICU4C=yes], [ac_cv_ICU4C=no]) -if test x$ac_cv_ICU4C != xyes; then - AC_MSG_ERROR([ICU4C was not found and is required to build GnuCash.]) -fi -AX_BOOST_BASE([1.53.0], [ac_cv_BOOST=yes], [ac_cv_BOOST=no]) -if test x$ac_cv_BOOST != xyes; then - AC_MSG_ERROR([Boost 1.53.0 or later was not found and is required to build GnuCash]) -fi - -# This section must come before AC_PROG_LIBTOOL because libtool -# must know about the c++ compiler. -###-------------------------------------------------------- - - -AC_LIBTOOL_DLOPEN -AC_LIBTOOL_WIN32_DLL -AM_DISABLE_STATIC -AM_PROG_LIBTOOL - -AC_SUBST(LIBTOOL_DEPS) - -AC_ISC_POSIX -AC_C_BIGENDIAN -AC_PROG_MAKE_SET -AC_PROG_LN_S -AC_HEADER_STDC - -AC_CHECK_HEADERS(limits.h sys/time.h sys/times.h sys/wait.h pow.h) -oldcflags="$CFLAGS" -CFLAGS= -AC_LANG_PUSH([C++]) -oldcxxflags="$CXXFLAGS" -CXXFLAGS="-Werror -std=gnu++11 $BOOST_CPPFLAGS" -AC_MSG_CHECKING([boost/date_time/local_time/custom_time_zone.hpp]) -AC_COMPILE_IFELSE([ - AC_LANG_SOURCE([ -#include - -using duration = boost::posix_time::time_duration; -using time_zone = boost::local_time::custom_time_zone; -using dst_offsets = boost::local_time::dst_adjustment_offsets; -using TZ_Ptr = boost::local_time::time_zone_ptr; -using time_zone_names = boost::local_time::time_zone_names; - -struct TTInfo -{ -int32_t gmtoff; -uint8_t isdst; -uint8_t abbrind; -}; - -struct TZInfo -{ -TTInfo info; -std::string name; -bool isstd; -bool isgmt; -}; - -static TZ_Ptr -zone_no_dst(int year, TZInfo *std_info) -{ - time_zone_names names(std_info->name, std_info->name, "", ""); - duration std_off(0, 0, std_info->info.gmtoff); - dst_offsets offsets({0, 0, 0}, {0, 0, 0}, {0, 0, 0}); - boost::local_time::dst_calc_rule_ptr calc_rule(nullptr); - TZ_Ptr tz(new time_zone(names, std_off, offsets, calc_rule)); - return tz; -} - - ])], - [AC_MSG_RESULT([yes])], - [AC_MSG_FAILURE([ -Boost Header Fails to compile with C++11. To fix this, open -date_time/local_time/custom_time_zone.hpp, perhaps as root, -in your boost include directory (/usr/include/boost in most cases) -and change line 67 to - return (bool) dst_calc_rules_; //if calc_rule is set the tz has dst -])]) -CXXFLAGS="$oldcxxflags" -AC_LANG_POP([C++]) -oldldflags="$LDFLAGS" -LDFLAGS= -AC_CHECK_FUNCS(stpcpy memcpy timegm towupper) -AC_CHECK_FUNCS(setenv,,[ - AC_CHECK_FUNCS(putenv,,[ - AC_MSG_ERROR([Must have one of the setenv or putenv functions.]) - ]) -]) -CFLAGS="$oldcflags" -LDFLAGS="$oldldflags" -STRUCT_TM_GMTOFF_CHECK -cflags_save=${CFLAGS} -CFLAGS="${CFLAGS} -Wall -Werror" -SCANF_LLD_CHECK -if test x$am_cv_scanf_lld = "xno"; then - SCANF_QD_CHECK - - if test x$am_cv_scanf_qd = "xno"; then - SCANF_I64D_CHECK - if test x$am_cv_scanf_i64d = "xno"; then - AC_MSG_ERROR([Cannot continue, no long long conversion support in scanf.]) - fi - fi -fi -CFLAGS="${cflags_save}" - -# test whether we are building directly from svn/svk/git/bzr -AC_MSG_CHECKING(if building from an scm managed directory) -"$srcdir/util/gnc-vcs-info" -r "$srcdir" >/dev/null 2>&1 -if test $? = 0 -o "x${BUILDING_FROM_VCS}" = "xyes" ; then - BUILDING_FROM_VCS=yes - VCS_TYPE=$("$srcdir/util/gnc-vcs-info" -t "$srcdir") - AC_MSG_RESULT($VCS_TYPE) - - if test "x${VCS_TYPE}" = "xgit"; then - AC_MSG_CHECKING(git command to use due to detected git repo) - # The windows build uses environment variable $GIT_CMD to invoke git (adding git - # to the PATH in Windows results in a build failure). - # So for platform independence, use GIT_CMD for all - if test -z "${GIT_CMD}" ; then - GIT_CMD=git - fi - AC_MSG_RESULT(${GIT_CMD}) - fi -else - AC_MSG_RESULT(no) - BUILDING_FROM_VCS=no - VCS_TYPE= - - # Make sure we've got swig-runtime.h and gnc-vcs-info.h - AC_CHECK_FILE(${srcdir}/common/swig-runtime.h, [], - [AC_MSG_ERROR([ - -It looks like you are NOT building from Subversion, svk, git or bzr -but I cannot find swig-runtime.h. Check your PATH and make sure -we can find gnc-vcs-info in your PATH! -Either that or contact gnucash-devel@gnucash.org because -the tarball you downloaded is broken. - - ])]) - AC_CHECK_FILE(${srcdir}/libgnucash/core-utils/gnc-vcs-info.h, [], - [AC_MSG_ERROR([ - -It looks like you are NOT building from Subversion, svk, git or bzr -but I cannot find gnc-vcs-info.h. Check your PATH and make sure -we can find gnc-vcs-info in your PATH! -Either that or contact gnucash-devel@gnucash.org because -the tarball you downloaded is broken. - - ])]) -fi -AM_CONDITIONAL(BUILDING_FROM_VCS, test "x$BUILDING_FROM_VCS" = "xyes") -AC_SUBST(VCS_TYPE) -AC_SUBST(GIT_CMD) - -# Build dir adjustments -AM_CONDITIONAL(GNUCASH_SEPARATE_BUILDDIR, test "x${srcdir}" != "x.") - -# Init binreloc -AM_BINRELOC - -### -------------------------------------------------------------------------- -### Glib checks. - -# We require glib >= 2.40 -# 2.46 deprecates g_settings_list_keys -PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.46 gio-2.0 gthread-2.0 gobject-2.0 gmodule-2.0, - [ - AC_DEFINE([HAVE_GLIB_2_46], [1], [Configure g_settings_list_keys deprecation]) - ], - [ - PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.40 gio-2.0 gthread-2.0 - gobject-2.0 gmodule-2.0) - ]) - -AC_CHECK_HEADERS(dirent.h dlfcn.h dl.h utmp.h locale.h mcheck.h unistd.h wctype.h) - -GLIB_GSETTINGS - -GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0` -AC_SUBST(GLIB_COMPILE_RESOURCES) - -# I'm sure we (used to?) require this in various places, so don't remove -# this test unless you've done sufficient code review/testing. -AC_MSG_CHECKING(if unsigned long is at least as big as guint32) -GNC_OLDCFLAGS="$CFLAGS" -GNC_OLDLDFLAGS="$LDFLAGS" -CFLAGS="${CFLAGS} ${GLIB_CFLAGS}" -LDFLAGS="${LDFLAGS} ${GLIB_LIBS}" -AC_TRY_RUN([ - #include - int main(int argc, char *argv[]) { - return(!(sizeof(unsigned long) >= sizeof(guint32))); - } -],[ - AC_MSG_RESULT(yes) -],[ - AC_MSG_RESULT(no) - AC_MSG_ERROR(cannot continue, size of unsigned long too small.) -],[ - AC_MSG_RESULT(assuming yes) -]) -CFLAGS="$GNC_OLDCFLAGS" -LDFLAGS="$GNC_OLDLDFLAGS" - -# Gnucash replaced dlopen/dlsym by the g_module functions; dlsym -# is needed optionally in one place for BSD linkers, though. -DL_LIB= -AC_CHECK_FUNCS(dlsym,,[ - AC_CHECK_LIB(dl, dlsym, DL_LIB="-ldl",[ - AC_CHECK_LIB(dld, shl_load, DL_LIB="-ldld",[ - AC_CHECK_FUNCS(dlsym, DL_LIB="") - ]) - ]) -]) - -oLIBS="$LIBS" -LIBS="$LIBS $DL_LIB" -AC_CHECK_FUNCS(dlerror,,) -LIBS="$oLIBS" -AC_SUBST(DL_LIB) - -################################################## -# OS dependent checks -################################################## -AC_SUBST(SED) - -# Set some defaults, they may be overridden below -REGEX_LIBS="" -GCC_VERSION=`${CC} -dumpversion` - -AC_MSG_CHECKING(operating system) -#NOUNDEF for use with mingw -NOUNDEF="" -case $host_os in - rhapsody* | darwin[1567].*) - AC_MSG_RESULT([darwin, but too old]) - AC_MSG_ERROR([This platform is not supported, please -update to latest darwin]) - ;; - darwin*) - platform=darwin - AC_DEFINE(GNC_PLATFORM_OSX, 1,[Running on OSX, either X11 or Quartz]) - AC_DEFINE(GNC_PLATFORM_POSIX, 1, [POSIX-compliant OS]) - AC_DEFINE(GNC_PLATFORM_DARWIN, 1, [Darwin-based OS]) - AC_MSG_RESULT($platform) - AC_MSG_CHECKING(For GDK-Quartz) - platform=osx - _gdk_tgt=`$PKG_CONFIG --variable=targets gdk-3.0` - if test "x$_gdk_tgt" = xquartz; then - platform=darwin/quartz - AC_DEFINE(GNC_PLATFORM_COCOA, 1, [Cocoa/Nexstep/GnuStep framework]) - AC_MSG_RESULT(yes) - AC_DEFINE(GDK_QUARTZ,,[Using GDK Quartz (not X11)]) - PKG_CHECK_MODULES([GTK_MAC], gtk-mac-integration-gtk3, - [_gtk_mac=yes], [_gtk_mac=no]) - if test "x$_gtk_mac" = xyes; then - GTK_MAC_LIBS="${GTK_MAC_LIBS} -lobjc -framework Cocoa" - GTK_MAC_CFLAGS="${GTK_MAC_CFLAGS} -xobjective-c" - GTK_MAC_CXXFLAGS="${GTK_MAC_CFLAGS} -xobjective-c++" - if test "`echo ${GCC_VERSION} | cut -d. -f1`" -eq 4; then - if test "`echo ${GCC_VERSION} | cut -d. -f2`" -ge 8; then - # This is gcc >= 4.8.x - GTK_MAC_CFLAGS="${GTK_MAC_CFLAGS} -fobjc-exceptions" - fi - fi - fi - AC_MSG_RESULT(${_gtk_mac}) - AC_SUBST(GTK_MAC_LIBS) - AC_SUBST(GTK_MAC_CFLAGS) - AC_SUBST(GTK_MAC_CXXFLAGS) - else - AC_MSG_RESULT(no) - fi - ;; - mingw*|cygwin*) - platform=win32 - AC_MSG_RESULT($platform) - AC_DEFINE(GNC_PLATFORM_WINDOWS, 1, [Microsoft Windows OS]) - LT_PROG_RC - - AC_MSG_CHECKING(for native win32) - case $host_os in - mingw*) - native_win32=yes - AC_MSG_RESULT(yes) - - HTMLHELP_LIBS= - AC_MSG_CHECKING(for HtmlHelpW) - saved_LIBS="${LIBS}" - LIBS="${LIBS} -lhtmlhelp" - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include - #include ]], - [HtmlHelpW(0, (wchar_t*)"", HH_HELP_CONTEXT, 0);])], - [AC_MSG_RESULT(yes) - HTMLHELP_LIBS=-lhtmlhelp - AC_DEFINE(HAVE_HTMLHELPW,1,[System has HtmlHelpW]) - ], [AC_MSG_RESULT(no)]) - LIBS="${saved_LIBS}" - AC_SUBST(HTMLHELP_LIBS) - ;; - *) - AC_MSG_RESULT(no) - ;; - esac - - REGEX_LIBS="-lregex" - - # Adjust CFLAGS and LDFLAGS on Windows - CFLAGS="${CFLAGS} -mms-bitfields" -# NOUNDEF will be added to ldflags for the makefiles but not the configures -# This fixes a problem with libtool and gcc 4.8 - NOUNDEF="-no-undefined" - LDFLAGS="${LDFLAGS} -mwindows" - ;; - - *) - platform=linux/other - AC_DEFINE(GNC_PLATFORM_POSIX, 1, [POSIX-compliant OS]) - AC_MSG_RESULT($platform) - ;; -esac -AC_SUBST(REGEX_LIBS) - -AM_CONDITIONAL(PLATFORM_LINUX, test "x$platform" = "xlinux/other") -AM_CONDITIONAL(PLATFORM_OSX, test "x$platform" = "xdarwin") -AM_CONDITIONAL(PLATFORM_OSX_QUARTZ, test "x$platform" = "xdarwin/quartz") -AM_CONDITIONAL(PLATFORM_WIN32, test "x$platform" = "xwin32") -AM_CONDITIONAL(OS_WIN32, test "x$native_win32" = "xyes") - -# These are unavailable on windows/mingw32 -# required for MacOSX Quartz -AC_CHECK_HEADERS(glob.h) - -AC_CHECK_FUNCS(chown gethostname getppid getuid gettimeofday gmtime_r) -AC_CHECK_FUNCS(gethostid link) -################################################## - - - -### -------------------------------------------------------------------------- -### Guile version checks - -GUILE_EFFECTIVE_VERSION=0 -# - check minimum version -# - determine GUILE_CFLAGS and GUILE_LIBS - -AC_ARG_WITH([guile], - AS_HELP_STRING([--with-guile=2.2|2.0|auto], - [which guile version to compile against @<:@default: auto@:>@]), - [], - [with_guile=auto] -) - -AS_IF([test "$with_guile" = "2.2"], - [PKG_CHECK_MODULES(GUILE, [guile-2.2 >= 2.2.0], - [GUILE_EFFECTIVE_VERSION=2.2])], - [test "$with_guile" = "2.0"], - [PKG_CHECK_MODULES(GUILE, [guile-2.0 >= 2.0.0], - [GUILE_EFFECTIVE_VERSION=2.0])], - [test "$with_guile" = "auto"], - [PKG_CHECK_MODULES(GUILE, [guile-2.2 >= 2.2.0], - [GUILE_EFFECTIVE_VERSION=2.2], - [PKG_CHECK_MODULES(GUILE, [guile-2.0 >= 2.0.0], - [GUILE_EFFECTIVE_VERSION=2.0], - [GUILE_EFFECTIVE_VERSION=0]) - ])], - # else - [AC_MSG_ERROR([invalid guile version specified])] -) - -AC_PATH_PROG([GUILD], guild) -AS_IF([test "$GUILE_EFFECTIVE_VERSION" = "0"], - [AC_MSG_ERROR([ - guile does not appear to be installed correctly, or is not in the - correct version range. Perhaps you have not installed the guile - development packages? Gnucash requires at least version 2.0.0 to build. - ])] -) - -AC_SUBST(GUILE_EFFECTIVE_VERSION) -AC_SUBST(GUILE, [`pwd`/gnc-guile]) - -AC_CHECK_HEADERS(ltdl.h, - [], - [AC_MSG_ERROR([ltdl.h not found. Perhaps you need to install -the libtool(-ltdl) development package?])]) - -### -------------------------------------------------------------------------- -### SWIG version checks (only when building from SCM) -# -# In order to build against guile 2 or build the dist we need at least -# version 2.0.10 of SWIG, because that's the first version that supports -# guile 2. -# -if test "${BUILDING_FROM_VCS}" = yes -then - AX_PKG_SWIG(2.0.10, , - [AC_MSG_ERROR([ - You are building from ${VCS_TYPE} but swig was not found or too old. - To build gnucash you need at least swig version 2.0.10. - ])]) -fi - -### -------------------------------------------------------------------------- -### LIBXML -- GNOME_XML_LIB is defined by GNOME_XML_CHECK - -LIBXML2_REQUIRED=2.5.10 -PKG_CHECK_MODULES(LIBXML2, libxml-2.0 >= $LIBXML2_REQUIRED) -AC_SUBST(LIBXML2_CFLAGS) -AC_SUBST(LIBXML2_LIBS) - -oLIBS="$LIBS" -LIBS="$LIBS $LIBXML2_LIBS" - -# Compile a test program to verify that the xml2 library works. -AC_CHECK_LIB(xml2, xmlElemDump, [:], [ - AC_MSG_ERROR([libxml2 is required for GnuCash]) - ]) -LIBS="$oLIBS" - -### -------------------------------------------------------------------------- -### LIBXSLT - -PKG_CHECK_MODULES(LIBXSLT, libxslt) -AC_SUBST(LIBXSLT_CFLAGS) -AC_SUBST(LIBXSLT_LIBS) - -# xsltproc is not included in libxslt on all distributions -# so check for it separately -AC_PATH_PROG(XSLTPROC, xsltproc, [""]) - -if test -z "$XSLTPROC"; then - AC_MSG_ERROR([xsltproc is required to build GnuCash]) -fi - -### -------------------------------------------------------------------------- -### Zlib - -ZLIB_LIBS=-lz -AC_SUBST(ZLIB_LIBS) - -oLIBS="$LIBS" -LIBS="$LIBS $ZLIB_LIBS" -AC_CHECK_LIB(z, gzopen, [:], [ - AC_MSG_ERROR([zlib is required for GnuCash]) -]) -LIBS="$oLIBS" - -### ---------------------- -### LIBDBI - -AC_ARG_ENABLE(dbi, - [AS_HELP_STRING([--disable-dbi],[don't build with the libdbi backend])], - [case "${enableval}" in - yes) want_dbi=true ;; - no) want_dbi=false ;; - *) want_dbi=false ;; - esac], - [want_dbi=true]) -if test x${want_dbi} = xtrue -then - EXTRA_SEARCH_LIBS="" - AC_CHECK_HEADERS(dbi/dbi.h) - if test "x$ac_cv_header_dbi_dbi_h" != xno; then - save_libs=$LIBS - AC_ARG_WITH( dbi-dbd-dir, - [AS_HELP_STRING([--with-dbi-dbd-dir=PATH],[specify location of libdbi drivers @<:@default=${libdir}/dbd@:>@])], - [[GNC_DBD_DIR="$with_dbi_dbd_dir" - EXTRA_SEARCH_LIBS=$GNC_DBD_DIR]], - [[GNC_DBD_DIR="" - # pkg-config is new in libdbi 0.9. Use it if available - # Otherwise fall back to our previous hard coded values - pkg-config --exists dbi - if test $? -eq 0; then - EXTRA_SEARCH_LIBS="$(pkg-config --variable=libdir dbi)/dbd" - else - EXTRA_SEARCH_LIBS="/usr/lib/dbd:/usr/lib64/dbd:${libdir}/dbd:${prefix}/lib/dbd" - fi]] - ) - case $host_os in - win32*|mingw*) - LDINC="#include " - LDFUNCARGS="" - LDEXT=dll - ;; - *) - LDINC="#include " - LDFUNCARGS=", RTLD_NOW" - LDEXT=so - export LIBS="$lt_cv_dlopen_libs $LIBS" - ;; - esac - old_ld_library_path="$LD_LIBRARY_PATH" - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$EXTRA_SEARCH_LIBS" - AC_MSG_NOTICE([Search Path $LD_LIBRARY_PATH]) - AC_MSG_CHECKING([Looking for at least one supported DBD module]) - AC_RUN_IFELSE([AC_LANG_PROGRAM([$LDINC], - [[if (!$lt_cv_dlopen("libdbdsqlite3.$LDEXT"$LDFUNCARGS)) return -1; - ]])],AC_MSG_RESULT([SQLite3]), - AC_RUN_IFELSE([AC_LANG_PROGRAM([$LDINC], - [[if (!$lt_cv_dlopen("libdbdmysql.$LDEXT"$LDFUNCARGS)) return -1; - ]])],AC_MSG_RESULT([MySql]), - AC_RUN_IFELSE([AC_LANG_PROGRAM([$LDINC], - [[if (!$lt_cv_dlopen("libdbdpgsql.$LDEXT"$LDFUNCARGS)) return -1; - ]])],AC_MSG_RESULT([Postgresql]), - AC_MSG_ERROR([ -Unable to find any of the supported dbd modules -(libdbdsqlite3, libdbdmysql, or libdbdpgsql) needed to actually use the SQL -backend. - -If you do have them installed the problem is either that dlopen cannot -find them or that dlopen itself is not getting linked. Check config.log -to find out which. You can add the option --with-dbi-dbd-dir pointing to -the directory in which they are located. - -If you do not actually want to build with libdi add --disable-dbi -to the configure argument list and run it again. - ])))) - - LIBDBI_LIBS=-ldbi - _COMPONENTS="$_COMPONENTS dbi" - LIBS=$saved_libs - export LD_LIBRARY_PATH="$old_ld_library_path" - else - AC_MSG_ERROR([ - - Unable to find . Either install the libdbi development - package (such as libdbi0-dev), or switch off the database backend of - gnucash by --disable-dbi. - Note: If you install libdbi, you should also install its database - drivers (such as libdbd-sqlite3 libdbd-mysql libdbd-pgsql). -]) - fi -fi -AC_SUBST(LIBDBI_LIBS) -AC_SUBST(GNC_DBD_DIR) -AM_CONDITIONAL(CUSTOM_GNC_DBD_DIR, [test x"$GNC_DBD_DIR" != "x"]) -AM_CONDITIONAL(WITH_DBI, [test "x$ac_cv_header_dbi_dbi_h" = xyes]) - -### -------------------------------------------------------------------------- -### Variables -### Set up all the initial variable values... -GNC_CONFIGDIR='${sysconfdir}/gnucash' -GNC_DOC_INSTALL_DIR='${docdir}' -GNC_INCLUDE_DIR='${includedir}/gnucash' -GNC_SCM_INSTALL_DIR='${pkgdatadir}/scm' -GNC_SHAREDIR='${pkgdatadir}' -GNC_LIBEXECDIR='${libexecdir}/gnucash' - -GNC_ACCOUNTS_DIR='${GNC_SHAREDIR}/accounts' -GNC_CHECKS_DIR='${GNC_SHAREDIR}/checks' -GNC_GTKBUILDER_DIR='${GNC_SHAREDIR}/gtkbuilder' -GNC_UI_DIR='${GNC_SHAREDIR}/ui' -GNC_PIXMAP_DIR='${GNC_SHAREDIR}/pixmaps' - -AC_SUBST(GNC_ACCOUNTS_DIR) -AC_SUBST(GNC_CHECKS_DIR) -AC_SUBST(GNC_CONFIGDIR) -AC_SUBST(GNC_DOC_INSTALL_DIR) -AC_SUBST(GNC_GTKBUILDER_DIR) -AC_SUBST(GNC_UI_DIR) -AC_SUBST(GNC_INCLUDE_DIR) -AC_SUBST(GNC_PIXMAP_DIR) -AC_SUBST(GNC_SCM_INSTALL_DIR) -AC_SUBST(GNC_SHAREDIR) -AC_SUBST(GNC_LIBEXECDIR) - -AC_ARG_ENABLE( debug, - [AS_HELP_STRING([--enable-debug],[compile with debugging flags set])], - [ - if test x$enableval = xyes; then - # remove any optimization flags... - CFLAGS=`echo ${CFLAGS} | sed -e 's,-O.,,g'` - # ...except for those the user wants. - CFLAGS="${CFLAGS} -g ${USER_OPTIMIZATION}" - # Do the same for C++ - CXXFLAGS=`echo ${CXXFLAGS} | sed -e 's,-O.,,g'` - CXXFLAGS="${CXXFLAGS} -g ${USER_OPTIMIZATION}" - LDFLAGS="${LDFLAGS} -g" - fi - ]) - -AC_ARG_ENABLE( profile, - [AS_HELP_STRING([--enable-profile],[compile with profiling set])], - if test x$enableval = xyes; then - AM_CFLAGS="${AM_CFLAGS} -pg" - AM_CXXFLAGS="${AM_CXXFLAGS} -pg" - AM_LDFLAGS="${AM_LDFLAGS} -pg" - fi) - -###--------------------------------------------------------------------------- -### Google Profiler Support: https://code.google.com/p/gperftools/ -###--------------------------------------------------------------------------- -enable_google_profile=no -AC_ARG_ENABLE( google-profiler, - [AS_HELP_STRING([--enable-google-profiler], [link in Google Performance Tools profiler; allows enabling profiling by setting $CPUPROFILE=/path/to/logfile.])], - [AC_MSG_CHECKING([Google PerfTools Profiler]) - AC_CHECK_LIB([profiler], [ProfilerEnable], [enable_google_profile=yes], - [AC_MSG_WARN([Google Profiling Enabled but the library was not found.])]) -]) -AM_CONDITIONAL(WITH_GOOGLE_PROFILER, [test x$enable_google_profile = xyes]) - -###--------------------------------------------------------------------------- -### Google Test and Mock Support: https://code.google.com/p/googletest/ and -### https://code.google.com/p/googlemock/ -### --------------------------------------------------------------------------- -ac_cv_gmock_root="" -ac_cv_gmock_headers="" -ac_cv_gtest_root="" -ac_cv_gtest_headers="" -ac_cv_gtest_libs="" -ac_cv_gmock_libs="" - -AC_CHECK_LIB([gtest_main], [main], - [AC_CHECK_FILES([/usr/src/gmock/gmock-all.cc - /usr/include/gtest/gtest.h - /usr/include/gmock/gmock.h - /usr/src/gmock/src/gmock-all.cc - /usr/src/gtest/src/gtest-all.cc], - [ac_cv_gtest_system_install=yes] [ac_cv_have_gtest_libs=yes], - [ac_cv_gtest_system_install=no])], - [AC_CHECK_FILES([/usr/src/gtest/src/gtest-all.cc - /usr/src/gtest/gtest-main.cc - /usr/src/gmock/src/gmock-all.cc - /usr/include/gtest/gtest.h - /usr/include/gmock/gmock.h], - [ac_cv_gtest_system_install=yes] [ac_cv_have_gtest_libs=no], - [ac_cv_gtest_system_install=no])] - ) -if test x$ac_cv_file__usr_include_gmock_gmock_h = xyes -a x$ac_cv_file__usr_include_gtest_gtest_h = xyes; then - if test x$ac_cv_file__usr_src_gmock_src_gmock_all_cc = xyes -a x$ac_cv_file__usr_src_gtest_src_gtest_all_cc = xyes; then - ac_cv_gtest_system_install=yes - elif test "x$ac_cv_have_gtest_libs" = xyes; then - ac_cv_gtest_system_install=yes - else - ac_cv_gtest_system_install=no - fi -fi - -AC_ARG_WITH([gtest-root], - [AS_HELP_STRING([--with-gtest-root=PATH], [location of the google test sources])], - [ac_cv_gtest_root="$with_gtest_root"]) -AC_ARG_WITH([gtest-headers], - [AS_HELP_STRING([--with-gtest-headers=PATH], [location of the google test header files if not in gtest-root])], - [ac_cv_gtest_headers="$with_gtest_headers"]) -AC_ARG_WITH([gmock-root], - [AS_HELP_STRING([--with-gmock-root=PATH], [location of the google mock sources])], - [ac_cv_gmock_root="$with_gmock_root"]) -AC_ARG_WITH([gmock-headers], - [AS_HELP_STRING([--with-gmock-headers=PATH], [location of the google test header files if not in gmock-root])], - [ac_cv_gmock_headers="$with_gmock_headers"]) - -google_test_found=yes -AC_MSG_CHECKING([whether Google Test is available]) -if test -n "$ac_cv_gtest_root" -a -r "$ac_cv_gtest_root/src/gtest-all.cc"; then - AC_MSG_WARN([Skipped setting ac_cv_gtest_root, value $ac_cv_gtest_root]) -else - if test -n "${GTEST_ROOT}" -a -r "${GTEST_ROOT}/src/gtest-all.cc"; then - ac_cv_gtest_root=${GTEST_ROOT} - elif test "x$ac_cv_gtest_system_install" = "xyes"; then - ac_cv_gtest_root="/usr/src/gtest" - else - ac_cv_gtest_root="" - fi -fi -if test -z "$ac_cv_gtest_root" -a -z "$ac_cv_gtest_libs"; then - AC_MSG_RESULT([No gtest-root]) - google_test_found=no -else - if test ! -r "$ac_cv_gtest_root/include/gtest/gtest.h"; then - if test -n "$ac_cv_gtest_headers" -a -r "$ac_cv_gtest_headers/gtest/gtest.h"; then - AC_MSG_WARN([Skipped setting ac_cv_gtest_headers, value $ac_cv_gtest_headers]) - else - if test -n "${GTEST_HEADERS}" -a -r "${GTEST_HEADERS}/gtest/gtest.h"; then - ac_cv_gtest_headers=${GTEST_HEADERS} - elif test "x$ac_cv_gtest_system_install" = "xyes"; then - ac_cv_gtest_headers="/usr/include" - else - ac_cv_gtest_headers="" - fi - fi - if test -z "$ac_cv_gtest_headers"; then - AC_MSG_RESULT([No gtest-headers]) - google_test_found=no - fi - else - ac_cv_gtest_headers=$ac_cv_gtest_root/include - fi -fi - - -if test -n "$ac_cv_gmock_root" -a -r "$ac_cv_gmock_root/gmock-all.cc"; then - ac_cv_gmock_src_path="$ac_cv_gmock_root" - AC_MSG_WARN([Skipped setting ac_cv_gmock_root, value $ac_cv_gmock_root]) -elif test -n "$ac_cv_gmock_root" -a -r "$ac_cv_gmock_root/src/gmock-all.cc"; then - ac_cv_gmock_src_path="$ac_cv_gmock_root/src" - AC_MSG_WARN([Skipped setting ac_cv_gmock_root, value $ac_cv_gmock_root]) -else - if test -n "${GMOCK_ROOT}" -a -r "${GMOCK_ROOT}/src/gmock-all.cc"; then - ac_cv_gmock_src_path=${GMOCK_ROOT}/src - ac_cv_gmock_root=${GMOCK_ROOT} - elif test "x$ac_cv_gtest_system_install" = "xyes"; then - if test "x$ac_cv_file__usr_src_gmock_src_gmock_all_cc" = xyes; then - ac_cv_gmock_src_path="/usr/src/gmock/src" - elif test "x$ac_cv_file__usr_src_gmock_gmock_all_cc" = xyes; then - ac_cv_gmock_src_path="/usr/src/gmock" - else - ac_cv_gmock_src_path="" - fi - ac_cv_gmock_root="/usr/src/gmock" - else - ac_cv_gmock_root="" - fi -fi -if test -z "$ac_cv_gmock_root"; then - AC_MSG_RESULT([No gmock-root]) - google_test_found=no -else - if test ! -r "$ac_cv_gmock_root/include/gmock/gmock.h"; then - if test -n "$ac_cv_gmock_headers" -a -r "$ac_cv_gmock_headers/gmock/gmock.h"; then - AC_MSG_WARN([Skipped setting ac_cv_gmock_headers, value $ac_cv_gmock_headers]) - else - if test -n "${GMOCK_HEADERS}" -a -r "${GMOCK_HEADERS}/gmock/gmock.h"; then - ac_cv_gmock_headers=${GMOCK_HEADERS} - elif test "x$ac_cv_gtest_system_install" = "xyes"; then - ac_cv_gmock_headers="/usr/include" - else - ac_cv_gmock_headers="" - fi - fi - if test -z "$ac_cv_gmock_headers"; then - AC_MSG_RESULT([No gmock-headers]) - google_test_found=no - fi - else - ac_cv_gmock_headers="$ac_cv_gmock_root/include" - fi -fi - -if test "x$google_test_found" = "xyes"; then - AC_MSG_RESULT([Yes]) -else - AC_MSG_ERROR([ - - Unable to find the Google test framework. Either install gtest/gmock - packages or point to the base directories of the sources using - GTEST_ROOT and GMOCK_ROOT environment variables. -]) -fi - -if test "x$ac_cv_have_gtest_libs" = xyes; then - ac_cv_gtest_libs="-lgtest -lgtest_main" -else -dnl Google test requires pthreads and this seems the easiest way to check. - AX_PTHREAD([ - ac_cv_gtest_libs="\$(top_builddir)/common/test-core/libgtest.a $PTHREAD_CFLAGS" - ],[ - AC_MSG_ERROR( - [GTest requires pthreads, but this wasn't found.]) - dnl Google test requires pthreads and this seems the easiest way to check. - ]) -fi - -AC_SUBST([GTEST_LIBS], [$ac_cv_gtest_libs]) -AC_SUBST([GTEST_SRC], [$ac_cv_gtest_root]) -AC_SUBST([GTEST_HEADERS], [$ac_cv_gtest_headers]) -AC_SUBST([GMOCK_SRC_PATH], [$ac_cv_gmock_src_path]) -AC_SUBST([GMOCK_SRC], [$ac_cv_gmock_root]) -AC_SUBST([GMOCK_HEADERS], [$ac_cv_gmock_headers]) -AM_CONDITIONAL([GOOGLE_TEST_LIBS], [test "x$ac_cv_have_gtest_libs" = "xyes"]) -### -------------------------------------------------------------------------- -### Register2 -AC_ARG_ENABLE( register2, - [AS_HELP_STRING([--enable-register2],[compile with register2 enabled])], - if test x$enableval = xyes; then - AC_DEFINE(REGISTER2_ENABLED,1,We are using Register2) - else - AC_DEFINE(REGISTER2_ENABLED,0,We are not using Register2) - fi) - -### -------------------------------------------------------------------------- -### OFX -want_ofx=auto -have_ofx=no -AC_ARG_ENABLE( ofx, - [AS_HELP_STRING([--enable-ofx],[compile with ofx support (needs LibOFX)])], - [ case "$enableval" in - yes) want_ofx=yes ;; - no) want_ofx=no ;; - esac[]dnl - ] ) -AC_MSG_CHECKING(whether to use OFX) -case "${want_ofx}" in - yes) AC_MSG_RESULT(yes -- failure is fatal) ;; - no) AC_MSG_RESULT(no) ;; - auto) AC_MSG_RESULT(yes -- automatic test) ;; -esac - -if test x${want_ofx} != xno ; then - PKG_CHECK_MODULES(LIBOFX, libofx, [have_ofx="yes"], [ have_ofx="no" ]) -fi - -if test x${want_ofx} = xyes && test x${have_ofx} = xno; then - AC_MSG_ERROR([ - - OFX support wanted, but libofx development libraries not found. - Either install the libofx development package (such as libofx-dev or - libofx-devel), or drop ofx support. You can do tis by removing - --enable-dbi from the configure parameters.]) -fi - -MIGRATABLE_PREFS_OFX="/dev/null" -if test x${have_ofx} = xyes ; then - _COMPONENTS="$_COMPONENTS ofx" - MIGRATABLE_PREFS_OFX="$srcdir/gnucash/import-export/ofx/migratable-prefs-ofx.xml" -fi - -ofx_has_bug_39=no -if test x${have_ofx} = xyes ; then - AC_MSG_CHECKING([Does libofx have bug 39]) - libs_old="$LIBS" - LIBS="$LIBS -lofx" - AC_LANG_PUSH(C++) - AC_RUN_IFELSE( - [AC_LANG_PROGRAM([ -#include -#include -#include -extern time_t ofxdate_to_time_t(const std::string ofxdate); -],[ -const std::string timestr = "20160319000000"; -struct tm ts; -ts.tm_year = 116; -ts.tm_mon = 2; -ts.tm_mday = 19; -#ifdef _WIN32 -putenv(\"TZ=PST-8PDT-7,M 4.1.0/0,M 10.6.0/0\"); -#else -setenv("TZ", "PST 08 PDT 07 M 4.1.0, M 10.6.0", 1); -#endif -time_t t = ofxdate_to_time_t(timestr); -if (t == mktime(&ts)) - exit(0); -exit(1); -])], - [AC_MSG_RESULT(no)], [ - AC_MSG_RESULT(yes) - ofx_has_bug_39=yes - ]) - if test x$ofx_has_bug_39 = "xyes"; then - AC_DEFINE(HAVE_OFX_BUG_39, 1, [Libofx has a daylight-time handling bug.]) - fi - AC_LANG_POP([C++]) - LIBS="$libs_old" -fi -AM_CONDITIONAL([WITH_OFX], [test "x${have_ofx}" = xyes]) -AC_SUBST_FILE([MIGRATABLE_PREFS_OFX]) -### -------------------------------------------------------------------------- -### MT940 -AC_ARG_ENABLE( mt940, - [AS_HELP_STRING([--enable-mt940],[obsolete, included in --enable-aqbanking])], - if test "x$enableval" != "xno" ; then - AC_MSG_ERROR([--enable-mt940 is obsolete -- all functionality is already included in --enable-aqbanking]) - fi) - -### -------------------------------------------------------------------------- -### AqBanking - -AC_ARG_ENABLE( aqbanking, - [AS_HELP_STRING([--enable-aqbanking],[compile with AqBanking support])], - if test "x$enableval" != "xno" ; then - want_aqbanking=yes - fi) -AC_ARG_ENABLE( hbci, - [AS_HELP_STRING([--enable-hbci],[obsolete, replaced by --enable-aqbanking])], - if test "x$enableval" != "xno" ; then - AC_MSG_ERROR([--enable-hbci is obsolete -- the option has been renamed into --enable-aqbanking]) - fi) - -MIGRATABLE_PREFS_AQBANKING="/dev/null" -if test x${want_aqbanking} = xyes ; -then - # Check for Aqbanking library - # We require aqbanking-4.0.0 because our implementation doesn't run - # with earlier version anymore. (libaqbanking ships with a pkgconfig - # file since its version 1.6.1.) - PKG_CHECK_MODULES(AQBANKING, aqbanking >= 4.0.0 gwenhywfar, , [ - AC_MSG_ERROR([Could not find aqbanking >= 4.0.0. If you use --enable-aqbanking, you MUST have aqbanking installed!]) - ]) - # For libgwenhywfar > 3.99.20, look for its library gwengui-gtk2. - PKG_CHECK_MODULES([GWEN], [gwenhywfar], [has_gwen=1], [has_gwen=0]) - - # also check for ktoblzcheck - AC_CHECK_HEADERS(ktoblzcheck.h) - if test "x$ac_cv_header_ktoblzcheck_h" != xno; then - AQBANKING_LIBS="${AQBANKING_LIBS} -lktoblzcheck" - fi - - AC_SUBST(AQBANKING_LIBS) - AC_SUBST(AQBANKING_CFLAGS) - _COMPONENTS="$_COMPONENTS aqbanking" - MIGRATABLE_PREFS_AQBANKING="$srcdir/gnucash/import-export/aqb/migratable-prefs-aqbanking.xml" -fi -AM_CONDITIONAL([WITH_AQBANKING], [test x${want_aqbanking} = xyes]) -AC_SUBST_FILE([MIGRATABLE_PREFS_AQBANKING]) - -AC_ARG_WITH(xdg-data-dirs, - [AS_HELP_STRING([--with-xdg-data-dirs], - [search path for system XDG data directories [default /usr/local/share/;/usr/share/]])], - [GNC_SYSTEM_XDG_DATA_DIRS=$withval], - [GNC_SYSTEM_XDG_DATA_DIRS="/usr/local/share;/usr/share"]) -AC_SUBST(GNC_SYSTEM_XDG_DATA_DIRS) - -AC_ARG_WITH(qt3-wizard-package, - [AS_HELP_STRING([--with-qt3-wizard-package=name],[name of package containing qt3-wizard (aqbanking)])], - [QT3_WIZARD_PACKAGE=$withval], [QT3_WIZARD_PACKAGE=aqbanking]) -AC_DEFINE_UNQUOTED([QT3_WIZARD_PACKAGE],["$QT3_WIZARD_PACKAGE"],[Name of package containing qt3-wizard.]) - -### -------------------------------------------------------------------------- -### i18n - -# This variable is set by GLIB_WITH_NLS, called through -# AM_GLIB_GNU_GETTEXT above. Usually it is "share", but on some -# platforms it is "lib". Make sure it is set. -if test "x$DATADIRNAME" = "x"; then - DATADIRNAME="share" - AC_SUBST(DATADIRNAME) -fi - -dnl check for nl_langinfo(D_FMT) which is missing on FreeBSD -LANGINFO_D_FMT_CHECK - -dnl Make sure we have a proper gettext installed -AC_MSG_CHECKING(for a valid gettext/gmsgfmt installation) -if test "$gt_cv_have_gettext" != "yes" || test "x$GMSGFMT" = "x"; then - AC_MSG_RESULT(no) - AC_MSG_ERROR([Cannot find Glib Gettext. Maybe you need to install the gettext package?]) -else - AC_MSG_RESULT(yes - $GMSGFMT) -fi - -# ------------------------------------------------------------------------- -# URLs for MySQL and PostgreSQL testing -AC_ARG_WITH(test-mysql-url, - AS_HELP_STRING([--with-test-mysql-url=URL], - [MySQL database URL for testing [default=none]]), - [],[with_test_mysql_url=""]) - -TEST_MYSQL_URL=$with_test_mysql_url -AC_SUBST(TEST_MYSQL_URL) - -AC_ARG_WITH(test-pgsql-url, - AS_HELP_STRING([--with-test-pgsql-url=URL], - [PgSQL database URL for testing [default=none]]), - [],[with_test_pgsql_url=""]) - -TEST_PGSQL_URL=$with_test_pgsql_url -AC_SUBST(TEST_PGSQL_URL) - -### -------------------------------------------------------------------------- -### help files - -# Used to initialize doc-path. -AC_ARG_WITH( help-prefix, - [AS_HELP_STRING([--with-help-prefix=PATH],[specify where to store the help files])], - GNC_HELPDIR="$with_help_prefix", - GNC_HELPDIR="\${datadir}") -AC_SUBST(GNC_HELPDIR) - -### -------------------------------------------------------------------------- -### Check for etags - -AC_ARG_ENABLE( etags, - [AS_HELP_STRING([--enable-etags],[enable automatic create of TAGS file])], - if test x$enableval = xyes; then - USE_ETAGS=1 - fi, - USE_ETAGS=0) - -if test x${USE_ETAGS} = x1; then - AC_CHECK_PROG(GNC_ETAGS_FILE, etags, TAGS) -fi - -AM_CONDITIONAL(GNC_ETAGS_FILE, test x${GNC_ETAGS_FILE} = xTAGS) - -### -------------------------------------------------------------------------- -### Check for ctags - -AC_ARG_ENABLE( ctags, - [AS_HELP_STRING([--enable-ctags],[enable automatic create of tags file])], - if test x$enableval = xyes; then - USE_CTAGS=1 - fi, - USE_CTAGS=0) - -if test x${USE_CTAGS} = x1; then - AC_CHECK_PROG(GNC_CTAGS_FILE, ctags, tags) -fi - -AM_CONDITIONAL(GNC_CTAGS_FILE, test x${GNC_CTAGS_FILE} = xtags) - -### -------------------------------------------------------------------------- -### Check for perl - -# Check for perl, force version 5 -AC_ARG_WITH(perl, - [AS_HELP_STRING([--with-perl=FILE],[which perl executable to use])], - PERL="${with_perl}") - -# If the user didn't specify a perl, then go fetch. -if test x"$PERL" = x; -then - AC_PATH_PROG(PERL, perl) -fi - -# Make sure Perl was found -if test x"$PERL" = x; then - AC_MSG_ERROR([Cannot find Perl. Try using the --with-perl flag.]) -fi - -# Make sure it's version 5 or later -if "$PERL" -e 'exit 1 if $] < 5.0'; then - : -else - AC_MSG_ERROR([Found ${PERL} reports version ] - [`${PERL} -e 'print $]'`, need version 5.*]) -fi -AC_SUBST(PERL) - -### ---------------------------------------------------------------------------- -### Check for doxygen, mostly stolen from http://log4cpp.sourceforge.net/ - -AC_DEFUN([BB_ENABLE_DOXYGEN], - [ - AC_ARG_ENABLE(doxygen, [AS_HELP_STRING([--enable-doxygen],[enable documentation generation with doxygen (auto)])]) - AC_ARG_ENABLE(dot, [AS_HELP_STRING([--enable-dot],[use 'dot' to generate graphs in doxygen (auto)])]) - AC_ARG_ENABLE(html-docs, [AS_HELP_STRING([--enable-html-docs],[enable HTML generation with doxygen (yes)])], [], [ enable_html_docs=yes]) - AC_ARG_ENABLE(latex-docs, [AS_HELP_STRING([--enable-latex-docs],[enable LaTeX documentation generation with doxygen (no)])], [], [ enable_latex_docs=no]) - if test "x$enable_doxygen" = xno; then - enable_doc=no - else - AC_PATH_PROG(DOXYGEN, doxygen, , $PATH) - if test x$DOXYGEN = x; then - if test "x$enable_doxygen" = xyes; then - AC_MSG_ERROR([could not find doxygen]) - fi - enable_doc=no - else - enable_doc=yes - AC_PATH_PROG(DOT, dot, , $PATH) - fi - fi - AM_CONDITIONAL(DOC, test x$enable_doc = xyes) - - if test x$DOT = x; then - if test "x$enable_dot" = xyes; then - AC_MSG_ERROR([could not find dot]) - fi - enable_dot=no - else - enable_dot=yes - fi - AM_CONDITIONAL(ENABLE_DOXYGEN, test x$enable_doc = xtrue) - AC_SUBST(enable_dot) - AC_SUBST(enable_html_docs) - AC_SUBST(enable_latex_docs) - ]) - -# check for doxygen -BB_ENABLE_DOXYGEN - - -### -------------------------------------------------------------------------- -### Libraries -LIBS="$LIBS -lm" - - -### -------------------------------------------------------------------------- -### Whether or not to build the GTK GUI components. -### When disabled, we don't even need to check for them! -### -------------------------------------------------------------------------- - -AC_ARG_ENABLE(gui, - [AS_HELP_STRING([--disable-gui],[build without the GNOME GUI components of Gnucash])], - [case "${enableval}" in - yes) gnc_build_gui=true ;; - no) gnc_build_gui=false ;; - *) gnc_build_gui=true ;; - esac], - [gnc_build_gui=true]) - -AM_CONDITIONAL(GNUCASH_ENABLE_GUI, test x${gnc_build_gui} = xtrue) - -### -------------------------------------------------------------------------- -### GNOME gui components -- built by default, but not if --enable-gui=no -### or --disable-gui is passed to autogen -### -------------------------------------------------------------------------- - -if test x${gnc_build_gui} = xtrue ; -then - if test x${enable_compile_warnings} = x ; - then - enable_compile_warnings="yes" - fi -#Save CFLAGS so that we can put the warnings in AM_CFLAGS - __cflags="$CFLAGS" - CFLAGS= - COMPILE_WARNINGS - AM_CFLAGS="$CFLAGS" - CFLAGS="$__cflags" - - PKG_CHECK_MODULES(GTK, gtk+-3.0) - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - - PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0) - AC_SUBST(GDK_PIXBUF_CFLAGS) - AC_SUBST(GDK_PIXBUF_LIBS) - - ### -------------------------------------------------------------------------- - ### checks for webkit - - PKG_CHECK_MODULES(WEBKIT, webkit2gtk-4.0, - [AC_DEFINE([WEBKIT2_4], [1], [Webkit2Gtk API Version 4.0])], - [PKG_CHECK_MODULES(WEBKIT, webkit2gtk-3.0, - [ - case $host_os in - win32* | mingw*) - AC_DEFINE([WEBKIT1], [1], [Webkit1Gtk API]) - ;; - *) - AC_DEFINE([WEBKIT2_3], [1], [Webkit2Gtk API Version 3.0]) - ;; - esac - ],)]) - - ###----------------------------------------------------------------------- - ## Find a suitable password store - AC_ARG_ENABLE([password-storage], - AS_HELP_STRING([--disable-password-storage], [Ignore system wide password stores such as gnome-keyring, libsecret or Apple's keychain])) - - have_password_storage=no - if test "x$enable_password_storage" != "xno" - then - case $host_os in - darwin*) - have_password_storage=yes - AC_DEFINE(HAVE_OSX_KEYCHAIN,1,[System has an OS X Key chain]) - ;; - *) - PKG_CHECK_MODULES(GNOME_KEYRING, gnome-keyring-1 >= "0.6", - [have_password_storage=yes - AC_DEFINE(HAVE_GNOME_KEYRING,1,[System has gnome-keyring 0.6 or better]) - ], - [dummy_not_found=true]) - - PKG_CHECK_MODULES(LIBSECRET, libsecret-1 >= "0.18", - [have_password_storage=yes - AC_DEFINE(HAVE_LIBSECRET,1,[System has libsecret 0.18 or better]) - AC_SUBST(LIBSECRET_CFLAGS) - AC_SUBST(LIBSECRET_LIBS) - ], - [dummy_not_found=true]) - ;; - esac - fi - - if test "x$have_password_storage" = "xno" && test "x$enable_password_storage" = "xyes" - then - AC_MSG_ERROR([password storage requested but no suitable backend found. Either gnome-keyring >= 0.6, libsecret >= 0.18 or Apple's keychain are supported]) - fi - - - ### ---------------------------------------------------------------------- - - AC_ARG_ENABLE( efence, - [AS_HELP_STRING([--enable-efence],[link using efence])], - if test x$enableval = xyes; then - EFENCE_LIBS="-lefence" - USE_EFENCE=1 - AC_DEFINE(USE_EFENCE,,We are using EFence) - fi, - USE_EFENCE=0 - EFENCE_LIBS="") - AC_SUBST(EFENCE_LIBS) - - ### ---------------------------------------------------------------------- - ## For now, we just presume you're using the GNOME version. The other - ## UI's haven't been carried over during the automake transition. At - ## some point, if it's deemed worthwhile, they can be resurrected... - - GNOME=1 - AC_DEFINE(GNOME,,using GNOME) - AM_CXXFLAGS="${AM_CXXFLAGS} -Wall" - -else - # COMPILE_WARNINGS will add -Wall; no need to set it again. - # also, only add it for GCC. - if test ${GCC}x = yesx - then - # We should always see these errors... - AM_CFLAGS="${AM_CFLAGS} -Wall" - AM_CXXFLAGS="${AM_CXXFLAGS} -Wall" - fi - -fi -### End of gui-only checks - -###------------------------------------------------------------------------- -### Selectively disable deprecated bits of glib/gdk/gtk/gnome -###------------------------------------------------------------------------- - -allow_deprecated=true -AC_ARG_ENABLE(deprecated-glib, - [AS_HELP_STRING([--disable-deprecated-glib],[don't use deprecated glib functions])], - [case "${enableval}" in - no) allow_deprecated=false ;; - *) allow_deprecated=true ;; - esac] - ) -if test x${allow_deprecated} != "xtrue" -then - # FIXME: This define is unused; this block can be removed - AC_DEFINE(G_DISABLE_DEPRECATED,1, [Don't use deprecated glib functions]) -fi - - -# default: Allow deprecated gtk functions -allow_deprecated=true -AC_ARG_ENABLE(deprecated-gtk, - [AS_HELP_STRING([--disable-deprecated-gtk],[don't use deprecated gtk, gdk or gdk-pixbuf functions])], - [case "${enableval}" in - no) allow_deprecated=false ;; - *) allow_deprecated=true ;; - esac] - ) -if test x${allow_deprecated} != "xtrue" -then - # FIXME: This define is unused; this block can be removed - AC_DEFINE(GTK_DISABLE_DEPRECATED,1, [Don't use deprecated gtk functions]) - AC_DEFINE(GDK_DISABLE_DEPRECATED,1, [Don't use deprecated gdk functions]) - AC_DEFINE(GDK_PIXBUF_DISABLE_DEPRECATED,1, [Don't use deprecated gdk-pixbuf functions]) -fi - - -allow_deprecated=true -AC_ARG_ENABLE(deprecated-gnome, - [AS_HELP_STRING([--disable-deprecated-gnome],[don't use deprecated gnome functions])], - [case "${enableval}" in - no) allow_deprecated=false ;; - *) allow_deprecated=true ;; - esac] - ) -if test x${allow_deprecated} != "xtrue" -then - # FIXME: This define is unused; this block can be removed - AC_DEFINE(GNOME_DISABLE_DEPRECATED,1, [Don't use deprecated gnome functions]) -fi - -AC_CHECK_FUNCS(pthread_mutex_init) -AC_REPLACE_FUNCS(strptime strfmon) - -if test x$am_cv_val_LC_MESSAGES = "xno"; then - LC_MESSAGES_ENUM="LC_ALL" -else - LC_MESSAGES_ENUM="LC_MESSAGES" -fi -AC_SUBST(LC_MESSAGES_ENUM) - -###-------------------------------------------------------- -### Make Python plugin and bindings optional -###-------------------------------------------------------- - -AC_ARG_ENABLE(python, - [AS_HELP_STRING([--enable-python],[enable python plugin and bindings])], - [case "${enableval}" in - yes) enable_python=true ;; - no) enable_python=false ;; - *) enable_python=false # default: false - esac], - [enable_python=false] # default: false - ) -if test x${enable_python} = "xtrue" -then - # Check for Python. We require python-2.4 - - AM_PATH_PYTHON(2.4,,[ - AC_MSG_ERROR([Could not find python >= 2.4. If you use --enable-python, you MUST have python installed!]) - ]) - AC_PYTHON_DEVEL(>= '2.4') - if test "x${PYTHON}" = "x" - then - AC_MSG_ERROR([Could not find Python development files. Make sure that the correct python-devel package is installed.]) - fi - SWIG_PYTHON - _COMPONENTS="$_COMPONENTS python" -fi -AM_CONDITIONAL(WITH_PYTHON, [test x${enable_python} = xtrue]) - -AC_ARG_ENABLE(python-bindings, - [AS_HELP_STRING([--enable-python-bindings],[obsolete: replaced by --enable-python])], - if test "x$enableval" != "xno" ; then - AC_MSG_ERROR([--enable-python-bindings is obsolete: The option has been renamed into --enable-python]) - fi) - - -###------------------------------------------------------------------------- -### Additional compiler warnings (or not) if we're running GCC -###------------------------------------------------------------------------- - - -# This has to come after AC_PROG_CC _AND_ COMPILE_WARNINGS -AC_LANG([C++]) -AX_CHECK_COMPILE_FLAG([-Wno-deprecated-register], - [AM_CXXFLAGS="${AM_CXXFLAGS} -Wno-unused -Wno-deprecated-register"], - [AM_CXXFLAGS="${AM_CXXFLAGS} -Wno-unused"], [-Werror]) -AC_LANG([C]) - -AC_MSG_CHECKING(what extra warning flags to pass to the C compiler) -if test ${GCC}x = yesx -then - warnFLAGS= - warnXXFLAGS= - #We have a lot of unused variables. Don't warn until someone gets - #around to cleaning them up. - AM_CFLAGS="${AM_CFLAGS} -Wno-unused -Wno-deprecated-declarations" - # other flags... - # These next two are included in the COMPILE_WARNINGS - #warnFLAGS="${warnFLAGS} -Wmissing-prototypes" - #warnFLAGS="${warnFLAGS} -Wmissing-declarations" - #warnFLAGS="${warnFLAGS} -Werror-implicit-function-declaration" # In -Wall - - # error-on-warning should not be active in (stable) release tarballs - if test "x$BUILDING_FROM_VCS" = "xyes" - then - # This code is from svn/svk/git/bzr, so enable error-on-warning - error_on_warning_as_default="yes" - else - # This is from a tarball, so disable error-on-warning - error_on_warning_as_default="no" - fi - - # Enable error-on-warning by default -- I'm tired of fixing other - # people's missing #includes, etc. - AC_ARG_ENABLE(error-on-warning, - [AS_HELP_STRING([--disable-error-on-warning],[disable treating compile warnings as errors])], - [case "${enableval}" in - yes) warnFLAGS="${warnFLAGS} -Werror" ; warnXXFLAGS="${warnXXFLAGS} -Werror" ; gnc_error_on_warning=yes ;; - no) gnc_error_on_warning=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-error-on-warning) ;; - esac], - [ if test "${error_on_warning_as_default}" = "yes"; then - warnFLAGS="${warnFLAGS} -Werror"; - warnXXFLAGS="${warnXXFLAGS} -Werror"; - gnc_error_on_warning=auto - else - gnc_error_on_warning=no - fi - ]) - - warnFLAGS="${warnFLAGS} -Wdeclaration-after-statement -Wno-pointer-sign" - # rpmbuild on FC4 forces this flag. Can't hurt to always compile with it. - cflags_save="$CFLAGS" - CFLAGS="$AM_CFLAGS $CFLAGS -Werror -D_FORTIFY_SOURCE=2" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include - ]], - [[ printf( "%s\n", "Hello World!");]])], - [warnFLAGS="${warnFLAGS} -D_FORTIFY_SOURCE=2"]) - CFLAGS="$cflags_save" - - AM_CFLAGS="${warnFLAGS} ${AM_CFLAGS}" - AM_CXXFLAGS="${warnXXFLAGS} ${AM_CXXFLAGS}" -else - warnFLAGS=none -fi -# Workaround for bug in gtest on mingw, see -# https://github.com/google/googletest/issues/893 -# https://github.com/google/googletest/issues/920 -case $host_os in - mingw*) - AM_CXXFLAGS="${AM_CXXFLAGS} -DWINVER=0x0500 -D_EMULATE_GLIBC=0" -esac -AC_SUBST(AM_CFLAGS) -AC_SUBST(AM_CXXFLAGS) -AC_MSG_RESULT($warnFLAGS) - -### -------------------------------------------------------------------------- -### Adjustments -- especially executables that aren't generated via -### makefiles, so that we don't have an opportunity to adjust them -### there. - -chmod u+x ${srcdir}/gnucash/generate-gnc-script - -### -------------------------------------------------------------------------- -### Makefile creation - -# This is necessary so that .o files in LIBOBJS are also built via -# the ANSI2KNR-filtering rules. -LIBOBJS_SEDSCRIPT="s,\.[[^.]]* ,$U&,g;s,\.[[^.]]*\$\$,$U&," -AC_SUBST(LIBOBJS_SEDSCRIPT) -# Don't add empty lines in the following macro, they -# will cause the Windows build to fail if using a git repo as source -AC_CONFIG_FILES( - po/Makefile.in - dnl # Makefiles - Makefile - data/Makefile - data/accounts/Makefile - data/accounts/C/Makefile - data/accounts/ca/Makefile - data/accounts/cs/Makefile - data/accounts/da/Makefile - data/accounts/de_AT/Makefile - data/accounts/de_CH/Makefile - data/accounts/de_DE/Makefile - data/accounts/el_GR/Makefile - data/accounts/en_GB/Makefile - data/accounts/es_ES/Makefile - data/accounts/es_MX/Makefile - data/accounts/fi_FI/Makefile - data/accounts/fr_CA/Makefile - data/accounts/fr_CH/Makefile - data/accounts/fr_FR/Makefile - data/accounts/hu_HU/Makefile - data/accounts/it/Makefile - data/accounts/ja/Makefile - data/accounts/ko/Makefile - data/accounts/lt/Makefile - data/accounts/lv/Makefile - data/accounts/nb/Makefile - data/accounts/nl/Makefile - data/accounts/pl/Makefile - data/accounts/pt_BR/Makefile - data/accounts/pt_PT/Makefile - data/accounts/ru/Makefile - data/accounts/sk/Makefile - data/accounts/sv_AX/Makefile - data/accounts/sv_FI/Makefile - data/accounts/sv_SE/Makefile - data/accounts/tr_TR/Makefile - data/accounts/zh_CN/Makefile - data/accounts/zh_HK/Makefile - data/accounts/zh_TW/Makefile - data/checks/Makefile - data/pixmaps/Makefile - bindings/Makefile - bindings/python/Makefile - bindings/python/tests/Makefile - borrowed/Makefile - borrowed/goffice/Makefile - borrowed/libc/Makefile - borrowed/gwengui-gtk3/Makefile - common/Makefile - common/debug/Makefile - common/debug/valgrind/Makefile - common/test-core/Makefile - doc/Makefile - doc/examples/Makefile - gnucash/Makefile - gnucash/gnome/Makefile - gnucash/gnome/gtkbuilder/Makefile - gnucash/gnome/gschemas/Makefile - gnucash/gnome/ui/Makefile - gnucash/gnome-utils/Makefile - gnucash/gnome-utils/gtkbuilder/Makefile - gnucash/gnome-utils/gschemas/Makefile - gnucash/gnome-utils/test/Makefile - gnucash/gnome-utils/ui/Makefile - gnucash/gnome-search/Makefile - gnucash/html/Makefile - gnucash/import-export/Makefile - gnucash/import-export/test/Makefile - gnucash/import-export/ofx/gschemas/Makefile - gnucash/import-export/qif-imp/Makefile - gnucash/import-export/qif/Makefile - gnucash/import-export/qif/test/Makefile - gnucash/import-export/qif-imp/gschemas/Makefile - gnucash/import-export/qif-imp/test/Makefile - gnucash/import-export/gschemas/Makefile - gnucash/import-export/ofx/Makefile - gnucash/import-export/ofx/test/Makefile - gnucash/import-export/csv-imp/Makefile - gnucash/import-export/csv-imp/gschemas/Makefile - gnucash/import-export/csv-imp/test/Makefile - gnucash/import-export/csv-exp/Makefile - gnucash/import-export/csv-exp/gschemas/Makefile - gnucash/import-export/log-replay/Makefile - gnucash/import-export/aqb/Makefile - gnucash/import-export/aqb/gschemas/Makefile - gnucash/import-export/aqb/test/Makefile - gnucash/import-export/bi-import/Makefile - gnucash/import-export/bi-import/gtkbuilder/Makefile - gnucash/import-export/bi-import/ui/Makefile - gnucash/import-export/customer-import/Makefile - gnucash/import-export/customer-import/gtkbuilder/Makefile - gnucash/import-export/customer-import/ui/Makefile - gnucash/python/Makefile - gnucash/python/pycons/Makefile - gnucash/register/Makefile - gnucash/register/ledger-core/Makefile - gnucash/register/ledger-core/test/Makefile - gnucash/register/register-core/Makefile - gnucash/register/register-core/test/Makefile - gnucash/register/register-gnome/Makefile - gnucash/register/register-gnome/test/Makefile - gnucash/report/Makefile - gnucash/report/report-gnome/Makefile - gnucash/report/report-gnome/test/Makefile - gnucash/report/report-system/Makefile - gnucash/report/report-system/test/Makefile - gnucash/report/standard-reports/Makefile - gnucash/report/standard-reports/test/Makefile - gnucash/report/business-reports/Makefile - gnucash/report/locale-specific/Makefile - gnucash/report/locale-specific/us/Makefile - gnucash/report/locale-specific/us/test/Makefile - gnucash/report/stylesheets/Makefile - gnucash/report/stylesheets/test/Makefile - gnucash/report/utility-reports/Makefile - gnucash/report/jqplot/Makefile - libgnucash/Makefile - libgnucash/app-utils/Makefile - libgnucash/app-utils/test/Makefile - libgnucash/backend/Makefile - libgnucash/backend/dbi/Makefile - libgnucash/backend/dbi/test/Makefile - libgnucash/backend/xml/Makefile - libgnucash/backend/xml/test/Makefile - libgnucash/backend/xml/test/test-files/Makefile - libgnucash/backend/xml/test/test-files/xml2/Makefile - libgnucash/backend/sql/Makefile - libgnucash/backend/sql/test/Makefile - libgnucash/core-utils/Makefile - libgnucash/core-utils/test/Makefile - libgnucash/doc/Makefile - libgnucash/doc/design/Makefile - libgnucash/doc/xml/Makefile - libgnucash/engine/Makefile - libgnucash/engine/test/Makefile - libgnucash/engine/test-core/Makefile - libgnucash/gnc-module/Makefile - libgnucash/gnc-module/test/Makefile - libgnucash/gnc-module/test/mod-foo/Makefile - libgnucash/gnc-module/test/mod-bar/Makefile - libgnucash/gnc-module/test/mod-baz/Makefile - libgnucash/gnc-module/test/misc-mods/Makefile - libgnucash/quotes/Makefile - libgnucash/scm/Makefile - libgnucash/scm/gnumeric/Makefile - libgnucash/tax/Makefile - libgnucash/tax/us/Makefile - libgnucash/tax/us/test/Makefile - dnl # non-makefiles - gnucash/gnucash.rc - libgnucash/app-utils/migratable-prefs.xml - gnucash/gnome/gnucash.desktop.in - dnl # GSettings schema files - gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in - gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in - gnucash/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in - gnucash/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in - gnucash/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in - gnucash/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in - gnucash/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in - gnucash/gnome/gschemas/org.gnucash.gschema.xml.in - gnucash/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in - gnucash/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in - gnucash/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in - gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in - gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in - gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in - gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in - gnucash/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in - gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in - gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in - dnl # Please read doc/build-system before adding *anything* here - , - dnl # init-commands go here -) -dnl # Shell scripts, to have their shells set -AC_CONFIG_FILES([libgnucash/backend/xml/test/test-real-data.sh], - [chmod +x libgnucash/backend/xml/test/test-real-data.sh]) - - -#Link (copy on Windows) test data files: -AC_CONFIG_LINKS([gnucash/import-export/csv-imp/test/sample1.csv:gnucash/import-export/csv-imp/test/sample1.csv]) -LDFLAGS="${LDFLAGS} ${NOUNDEF}" -AC_OUTPUT - - -AC_MSG_RESULT([ - Options detected/selected - ------------------------- - gnucash version ...... : $VERSION - Build for host ....... : $host - Optional components... : $_COMPONENTS - Extra Warnings ....... : $warnFLAGS - CPPFLAGS ............. : $CPPFLAGS - CFLAGS ............... : $CFLAGS - CXXFLAGS ............. : $CXXFLAGS - LDFLAGS .............. : $LDFLAGS - prefix................ : ${prefix} - - -]) diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 9232e8848e..c3c236ef3e 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -5,7 +5,7 @@ ADD_SUBDIRECTORY (accounts) ADD_SUBDIRECTORY (checks) ADD_SUBDIRECTORY (pixmaps) -SET_LOCAL_DIST(data_DIST_local CMakeLists.txt Makefile.am ${data_EXTRA_DIST}) +SET_LOCAL_DIST(data_DIST_local CMakeLists.txt ${data_EXTRA_DIST}) SET(data_DIST ${data_DIST_local} ${accounts_DIST} ${checks_DIST} ${pixmaps_DIST} PARENT_SCOPE) diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index 76cdc01698..0000000000 --- a/data/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -SUBDIRS = \ - accounts \ - checks \ - pixmaps diff --git a/data/accounts/C/CMakeLists.txt b/data/accounts/C/CMakeLists.txt index d90a2da89d..48f19514be 100644 --- a/data/accounts/C/CMakeLists.txt +++ b/data/accounts/C/CMakeLists.txt @@ -18,7 +18,7 @@ SET(account_DATA acctchrt_spouseinc.gnucash-xea acctchrt_spouseretire.gnucash-xea) -SET_DIST_LIST(C_DIST ${account_DATA} acctchrt_full.gnucash-xea Makefile.am CMakeLists.txt) +SET_DIST_LIST(C_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/C) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/C) diff --git a/data/accounts/C/Makefile.am b/data/accounts/C/Makefile.am deleted file mode 100644 index 9b3bb35e76..0000000000 --- a/data/accounts/C/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/C - -account_DATA = \ - acctchrt_brokerage.gnucash-xea \ - acctchrt_business.gnucash-xea \ - acctchrt_carloan.gnucash-xea \ - acctchrt_cdmoneymkt.gnucash-xea \ - acctchrt_checkbook.gnucash-xea \ - acctchrt_childcare.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_eduloan.gnucash-xea \ - acctchrt_fixedassets.gnucash-xea \ - acctchrt_homeloan.gnucash-xea \ - acctchrt_homeown.gnucash-xea \ - acctchrt_otherloan.gnucash-xea \ - acctchrt_renter.gnucash-xea \ - acctchrt_retiremt.gnucash-xea \ - acctchrt_spouseinc.gnucash-xea \ - acctchrt_spouseretire.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - acctchrt_full.gnucash-xea \ - CMakeLists.txt diff --git a/data/accounts/CMakeLists.txt b/data/accounts/CMakeLists.txt index 1c62ab1f8a..9cef155c4d 100644 --- a/data/accounts/CMakeLists.txt +++ b/data/accounts/CMakeLists.txt @@ -77,7 +77,7 @@ ADD_SUBDIRECTORY(zh_CN) ADD_SUBDIRECTORY(zh_HK) ADD_SUBDIRECTORY(zh_TW) -SET_LOCAL_DIST(dist_list CMakeLists.txt Makefile.am) +SET_LOCAL_DIST(dist_list CMakeLists.txt ) SET(accounts_DIST ${C_DIST} ${CA_DIST} ${CS_DIST} ${DA_DIST} ${DE_AT_DIST} ${DE_CH_DIST} ${DE_DE_DIST} ${EL_GR_DIST} ${EN_GB_DIST} ${ES_ES_DIST} ${ES_MX_DIST} ${FI_FI_DIST} ${FR_CA_DIST} ${FR_CH_DIST} diff --git a/data/accounts/Makefile.am b/data/accounts/Makefile.am deleted file mode 100644 index 8a0b2fb501..0000000000 --- a/data/accounts/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ - -SUBDIRS = \ - C \ - ca \ - cs \ - da \ - de_AT \ - de_CH \ - de_DE \ - el_GR \ - en_GB \ - es_ES \ - es_MX \ - fi_FI \ - fr_CA \ - fr_CH \ - fr_FR \ - hu_HU \ - it \ - ja \ - ko \ - lt \ - lv \ - nb \ - nl \ - pl \ - pt_BR \ - pt_PT \ - ru \ - sk \ - sv_AX \ - sv_FI \ - sv_SE \ - tr_TR \ - zh_CN \ - zh_HK \ - zh_TW - -EXTRA_DIST = CMakeLists.txt diff --git a/data/accounts/ca/CMakeLists.txt b/data/accounts/ca/CMakeLists.txt index 9f9dd11be1..54a1973793 100644 --- a/data/accounts/ca/CMakeLists.txt +++ b/data/accounts/ca/CMakeLists.txt @@ -15,7 +15,7 @@ SET(account_DATA acctchrt_spouseinc.gnucash-xea acctchrt_spouseretire.gnucash-xea) -SET_DIST_LIST(CA_DIST ${account_DATA} Makefile.am CMakeLists.txt) +SET_DIST_LIST(CA_DIST ${account_DATA} CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/ca) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/ca) diff --git a/data/accounts/ca/Makefile.am b/data/accounts/ca/Makefile.am deleted file mode 100644 index 5b2b8148a9..0000000000 --- a/data/accounts/ca/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/ca - -account_DATA = \ - acctchrt_brokerage.gnucash-xea \ - acctchrt_carloan.gnucash-xea \ - acctchrt_cdmoneymkt.gnucash-xea \ - acctchrt_childcare.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_currency.gnucash-xea \ - acctchrt_eduloan.gnucash-xea \ - acctchrt_fixedassets.gnucash-xea \ - acctchrt_homeloan.gnucash-xea \ - acctchrt_homeown.gnucash-xea \ - acctchrt_otherloan.gnucash-xea \ - acctchrt_renter.gnucash-xea \ - acctchrt_retiremt.gnucash-xea \ - acctchrt_spouseinc.gnucash-xea \ - acctchrt_spouseretire.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - CMakeLists.txt - diff --git a/data/accounts/cs/CMakeLists.txt b/data/accounts/cs/CMakeLists.txt index 2f1689124c..2df788c8e2 100644 --- a/data/accounts/cs/CMakeLists.txt +++ b/data/accounts/cs/CMakeLists.txt @@ -15,7 +15,7 @@ SET(account_DATA acctchrt_spouseinc.gnucash-xea acctchrt_spouseretire.gnucash-xea) -SET_DIST_LIST(CS_DIST ${account_DATA} Makefile.am CMakeLists.txt) +SET_DIST_LIST(CS_DIST ${account_DATA} CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/cs) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/cs) diff --git a/data/accounts/cs/Makefile.am b/data/accounts/cs/Makefile.am deleted file mode 100644 index 99c9b0c360..0000000000 --- a/data/accounts/cs/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/cs - -account_DATA = \ - acctchrt_brokerage.gnucash-xea \ - acctchrt_carloan.gnucash-xea \ - acctchrt_cdmoneymkt.gnucash-xea \ - acctchrt_childcare.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_currency.gnucash-xea \ - acctchrt_eduloan.gnucash-xea \ - acctchrt_fixedassets.gnucash-xea \ - acctchrt_homeloan.gnucash-xea \ - acctchrt_homeown.gnucash-xea \ - acctchrt_otherloan.gnucash-xea \ - acctchrt_renter.gnucash-xea \ - acctchrt_retiremt.gnucash-xea \ - acctchrt_spouseinc.gnucash-xea \ - acctchrt_spouseretire.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - CMakeLists.txt diff --git a/data/accounts/da/CMakeLists.txt b/data/accounts/da/CMakeLists.txt index cb3127c7ad..5e97021e89 100644 --- a/data/accounts/da/CMakeLists.txt +++ b/data/accounts/da/CMakeLists.txt @@ -4,7 +4,7 @@ SET(account_DATA acctchrt_homeloan.gnucash-xea acctchrt_homeown.gnucash-xea) -SET_DIST_LIST(DA_DIST ${account_DATA} Makefile.am CMakeLists.txt) +SET_DIST_LIST(DA_DIST ${account_DATA} CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/da) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/da) diff --git a/data/accounts/da/Makefile.am b/data/accounts/da/Makefile.am deleted file mode 100644 index 6bbcebb7da..0000000000 --- a/data/accounts/da/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/da - -account_DATA = \ - acctchrt_car.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_homeloan.gnucash-xea \ - acctchrt_homeown.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - CMakeLists.txt diff --git a/data/accounts/de_AT/CMakeLists.txt b/data/accounts/de_AT/CMakeLists.txt index 4e5a98dd62..7b6d99aff2 100644 --- a/data/accounts/de_AT/CMakeLists.txt +++ b/data/accounts/de_AT/CMakeLists.txt @@ -9,7 +9,7 @@ SET(dist_account_DATA acctchrt_investment.gnucash-xea acctchrt_kids.gnucash-xea) -SET_DIST_LIST(DE_AT_DIST ${dist_account_DATA} Makefile.am CMakeLists.txt) +SET_DIST_LIST(DE_AT_DIST ${dist_account_DATA} CMakeLists.txt) INSTALL(FILES ${dist_account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/de_AT) FILE(COPY ${dist_account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/de_AT) diff --git a/data/accounts/de_AT/Makefile.am b/data/accounts/de_AT/Makefile.am deleted file mode 100644 index 373c2af391..0000000000 --- a/data/accounts/de_AT/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ - -accountdir = $(GNC_ACCOUNTS_DIR)/de_AT - -dist_account_DATA = \ - acctchrt_auto.gnucash-xea \ - acctchrt_autoloan.gnucash-xea \ - acctchrt_brokerage.gnucash-xea \ - acctchrt_business.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_houseown.gnucash-xea \ - acctchrt_investment.gnucash-xea \ - acctchrt_kids.gnucash-xea - -EXTRA_DIST = CMakeLists.txt diff --git a/data/accounts/de_CH/CMakeLists.txt b/data/accounts/de_CH/CMakeLists.txt index b8e2b019ee..bad7dd2bb9 100644 --- a/data/accounts/de_CH/CMakeLists.txt +++ b/data/accounts/de_CH/CMakeLists.txt @@ -6,7 +6,7 @@ SET(account_DATA acctchrt_otherloan.gnucash-xea acctchrt_chkmu.gnucash-xea) -SET_DIST_LIST(DE_CH_DIST ${account_DATA} Makefile.am CMakeLists.txt) +SET_DIST_LIST(DE_CH_DIST ${account_DATA} CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/de_CH) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/de_CH) \ No newline at end of file diff --git a/data/accounts/de_CH/Makefile.am b/data/accounts/de_CH/Makefile.am deleted file mode 100644 index 0d38f5f5da..0000000000 --- a/data/accounts/de_CH/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/de_CH - -account_DATA = \ - acctchrt_brokerage.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_kids.gnucash-xea \ - acctchrt_otherasset.gnucash-xea \ - acctchrt_otherloan.gnucash-xea \ - acctchrt_chkmu.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - CMakeLists.txt diff --git a/data/accounts/de_DE/CMakeLists.txt b/data/accounts/de_DE/CMakeLists.txt index 740ce5c4fb..f030eac79c 100644 --- a/data/accounts/de_DE/CMakeLists.txt +++ b/data/accounts/de_DE/CMakeLists.txt @@ -14,7 +14,7 @@ SET(account_DATA acctchrt_skr04.gnucash-xea acctchrt_skr49.gnucash-xea) -SET_DIST_LIST(DE_DE_DIST ${account_DATA} acctchrt_full.gnucash-xea Makefile.am CMakeLists.txt) +SET_DIST_LIST(DE_DE_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/de_DE) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/de_DE) \ No newline at end of file diff --git a/data/accounts/de_DE/Makefile.am b/data/accounts/de_DE/Makefile.am deleted file mode 100644 index 550cea6e14..0000000000 --- a/data/accounts/de_DE/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/de_DE - -account_DATA = \ - acctchrt_auto.gnucash-xea \ - acctchrt_autoloan.gnucash-xea \ - acctchrt_brokerage.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_houseown.gnucash-xea \ - acctchrt_investment.gnucash-xea \ - acctchrt_kids.gnucash-xea \ - acctchrt_otherasset.gnucash-xea \ - acctchrt_otherloan.gnucash-xea \ - acctchrt_studium.gnucash-xea \ - acctchrt_skr03.gnucash-xea \ - acctchrt_wohnungsw.gnucash-xea \ - acctchrt_skr04.gnucash-xea \ - acctchrt_skr49.gnucash-xea - - -EXTRA_DIST = \ - ${account_DATA} \ - acctchrt_full.gnucash-xea \ - CMakeLists.txt diff --git a/data/accounts/el_GR/CMakeLists.txt b/data/accounts/el_GR/CMakeLists.txt index 9cb47a6226..a450afdbae 100644 --- a/data/accounts/el_GR/CMakeLists.txt +++ b/data/accounts/el_GR/CMakeLists.txt @@ -3,7 +3,7 @@ SET(account_DATA acctchrt_carloan.gnucash-xea acctchrt_brokerage.gnucash-xea) -SET_DIST_LIST(EL_GR_DIST ${account_DATA} Makefile.am CMakeLists.txt) +SET_DIST_LIST(EL_GR_DIST ${account_DATA} CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/el_GR) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/el_GR) \ No newline at end of file diff --git a/data/accounts/el_GR/Makefile.am b/data/accounts/el_GR/Makefile.am deleted file mode 100644 index 63502f696e..0000000000 --- a/data/accounts/el_GR/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/el_GR - -account_DATA = \ - acctchrt_common.gnucash-xea \ - acctchrt_carloan.gnucash-xea \ - acctchrt_brokerage.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - CMakeLists.txt diff --git a/data/accounts/en_GB/CMakeLists.txt b/data/accounts/en_GB/CMakeLists.txt index 40e550a7e0..f8c68e6c45 100644 --- a/data/accounts/en_GB/CMakeLists.txt +++ b/data/accounts/en_GB/CMakeLists.txt @@ -17,7 +17,7 @@ SET(account_DATA acctchrt_spouseretire.gnucash-xea uk-vat.gnucash-xea) -SET_DIST_LIST(EN_GB_DIST ${account_DATA} acctchrt_full.gnucash-xea Makefile.am CMakeLists.txt) +SET_DIST_LIST(EN_GB_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/en_GB) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/en_GB) diff --git a/data/accounts/en_GB/Makefile.am b/data/accounts/en_GB/Makefile.am deleted file mode 100644 index 64553ab323..0000000000 --- a/data/accounts/en_GB/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/en_GB - -account_DATA = \ - acctchrt_brokerage.gnucash-xea \ - acctchrt_business.gnucash-xea \ - acctchrt_carloan.gnucash-xea \ - acctchrt_cdmoneymkt.gnucash-xea \ - acctchrt_checkbook.gnucash-xea \ - acctchrt_childcare.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_eduloan.gnucash-xea \ - acctchrt_fixedassets.gnucash-xea \ - acctchrt_homeloan.gnucash-xea \ - acctchrt_homeown.gnucash-xea \ - acctchrt_otherloan.gnucash-xea \ - acctchrt_renter.gnucash-xea \ - acctchrt_retiremt.gnucash-xea \ - acctchrt_spouseinc.gnucash-xea \ - acctchrt_spouseretire.gnucash-xea \ - uk-vat.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - acctchrt_full.gnucash-xea \ - CMakeLists.txt diff --git a/data/accounts/es_ES/CMakeLists.txt b/data/accounts/es_ES/CMakeLists.txt index 51284e3239..3edfc76d45 100644 --- a/data/accounts/es_ES/CMakeLists.txt +++ b/data/accounts/es_ES/CMakeLists.txt @@ -15,7 +15,7 @@ SET(account_DATA acctchrt_spouseinc.gnucash-xea acctchrt_spouseretire.gnucash-xea) -SET_DIST_LIST(ES_ES_DIST ${account_DATA} Makefile.am CMakeLists.txt) +SET_DIST_LIST(ES_ES_DIST ${account_DATA} CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/es_ES) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/es_ES) diff --git a/data/accounts/es_ES/Makefile.am b/data/accounts/es_ES/Makefile.am deleted file mode 100644 index c2250fcef9..0000000000 --- a/data/accounts/es_ES/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/es_ES - -account_DATA = \ - acctchrt_brokerage.gnucash-xea \ - acctchrt_carloan.gnucash-xea \ - acctchrt_cdmoneymkt.gnucash-xea \ - acctchrt_childcare.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_currency.gnucash-xea \ - acctchrt_eduloan.gnucash-xea \ - acctchrt_fixedassets.gnucash-xea \ - acctchrt_homeloan.gnucash-xea \ - acctchrt_homeown.gnucash-xea \ - acctchrt_otherloan.gnucash-xea \ - acctchrt_renter.gnucash-xea \ - acctchrt_retiremt.gnucash-xea \ - acctchrt_spouseinc.gnucash-xea \ - acctchrt_spouseretire.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - CMakeLists.txt - diff --git a/data/accounts/es_MX/CMakeLists.txt b/data/accounts/es_MX/CMakeLists.txt index 019887c6cc..981d6d44bd 100644 --- a/data/accounts/es_MX/CMakeLists.txt +++ b/data/accounts/es_MX/CMakeLists.txt @@ -15,7 +15,7 @@ SET(account_DATA acctchrt_spouseinc.gnucash-xea acctchrt_spouseretire.gnucash-xea) -SET_DIST_LIST(ES_MX_DIST ${account_DATA} Makefile.am CMakeLists.txt) +SET_DIST_LIST(ES_MX_DIST ${account_DATA} CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/es_MX) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/es_MX) diff --git a/data/accounts/es_MX/Makefile.am b/data/accounts/es_MX/Makefile.am deleted file mode 100644 index 6e3fcfee02..0000000000 --- a/data/accounts/es_MX/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/es_MX - -account_DATA = \ - acctchrt_brokerage.gnucash-xea \ - acctchrt_carloan.gnucash-xea \ - acctchrt_cdmoneymkt.gnucash-xea \ - acctchrt_childcare.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_currency.gnucash-xea \ - acctchrt_eduloan.gnucash-xea \ - acctchrt_fixedassets.gnucash-xea \ - acctchrt_homeloan.gnucash-xea \ - acctchrt_homeown.gnucash-xea \ - acctchrt_otherloan.gnucash-xea \ - acctchrt_renter.gnucash-xea \ - acctchrt_retiremt.gnucash-xea \ - acctchrt_spouseinc.gnucash-xea \ - acctchrt_spouseretire.gnucash-xea - -EXTRA_DIST = \ -${account_DATA} \ -CMakeLists.txt - diff --git a/data/accounts/fi_FI/CMakeLists.txt b/data/accounts/fi_FI/CMakeLists.txt index 314d0692e2..8777598309 100644 --- a/data/accounts/fi_FI/CMakeLists.txt +++ b/data/accounts/fi_FI/CMakeLists.txt @@ -3,7 +3,7 @@ SET(account_DATA acctchrt_sbr-xbrl.gnucash-xea acctchrt_ry.gnucash-xea) -SET_DIST_LIST(FI_FI_DIST ${account_DATA} Makefile.am CMakeLists.txt) +SET_DIST_LIST(FI_FI_DIST ${account_DATA} CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/fi_FI) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/fi_FI) diff --git a/data/accounts/fi_FI/Makefile.am b/data/accounts/fi_FI/Makefile.am deleted file mode 100644 index f9ce46a1b4..0000000000 --- a/data/accounts/fi_FI/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/fi_FI - -account_DATA = \ - acctchrt_common.gnucash-xea \ - acctchrt_sbr-xbrl.gnucash-xea \ - acctchrt_ry.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - CMakeLists.txt diff --git a/data/accounts/fr_CA/CMakeLists.txt b/data/accounts/fr_CA/CMakeLists.txt index 4a51c4c39a..85e8d74a73 100644 --- a/data/accounts/fr_CA/CMakeLists.txt +++ b/data/accounts/fr_CA/CMakeLists.txt @@ -14,7 +14,7 @@ SET(account_DATA acctchrt_retraite.gnucash-xea acctchrt_revenus.gnucash-xea) -SET_DIST_LIST(FR_CA_DIST ${account_DATA} Makefile.am CMakeLists.txt) +SET_DIST_LIST(FR_CA_DIST ${account_DATA} CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/fr_CA) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/fr_CA) diff --git a/data/accounts/fr_CA/Makefile.am b/data/accounts/fr_CA/Makefile.am deleted file mode 100644 index dbba85936e..0000000000 --- a/data/accounts/fr_CA/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -accountdir = ${GNC_ACCOUNTS_DIR}/fr_CA - -account_DATA = \ - acctchrt_actifsfixes.gnucash-xea \ - acctchrt_automobile.gnucash-xea \ - acctchrt_basecommune.gnucash-xea \ - acctchrt_cdmarchemon.gnucash-xea \ - acctchrt_chequier.gnucash-xea \ - acctchrt_conjointretraite.gnucash-xea \ - acctchrt_conjointrev.gnucash-xea \ - acctchrt_courtage.gnucash-xea \ - acctchrt_etudeemprunt.gnucash-xea \ - acctchrt_garderie.gnucash-xea \ - acctchrt_locataire.gnucash-xea \ - acctchrt_proprietaire.gnucash-xea \ - acctchrt_retraite.gnucash-xea \ - acctchrt_revenus.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - CMakeLists.txt diff --git a/data/accounts/fr_CH/CMakeLists.txt b/data/accounts/fr_CH/CMakeLists.txt index 04b6b5b930..5c8bce6d6e 100644 --- a/data/accounts/fr_CH/CMakeLists.txt +++ b/data/accounts/fr_CH/CMakeLists.txt @@ -16,7 +16,7 @@ SET(account_DATA acctchrt_spouseinc.gnucash-xea acctchrt_spouseretire.gnucash-xea) -SET_DIST_LIST(FR_CH_DIST ${account_DATA} Makefile.am CMakeLists.txt) +SET_DIST_LIST(FR_CH_DIST ${account_DATA} CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/fr_CH) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/fr_CH) diff --git a/data/accounts/fr_CH/Makefile.am b/data/accounts/fr_CH/Makefile.am deleted file mode 100644 index 0a7b1ce6e1..0000000000 --- a/data/accounts/fr_CH/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/fr_CH - -account_DATA = \ - acctchrt_brokerage.gnucash-xea \ - acctchrt_business.gnucash-xea \ - acctchrt_carloan.gnucash-xea \ - acctchrt_cdmoneymkt.gnucash-xea \ - acctchrt_childcare.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_currency.gnucash-xea \ - acctchrt_eduloan.gnucash-xea \ - acctchrt_fixedassets.gnucash-xea \ - acctchrt_homeloan.gnucash-xea \ - acctchrt_homeown.gnucash-xea \ - acctchrt_otherloan.gnucash-xea \ - acctchrt_renter.gnucash-xea \ - acctchrt_retiremt.gnucash-xea \ - acctchrt_spouseinc.gnucash-xea \ - acctchrt_spouseretire.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - CMakeLists.txt diff --git a/data/accounts/fr_FR/CMakeLists.txt b/data/accounts/fr_FR/CMakeLists.txt index 5011311b37..ddf94ddd99 100644 --- a/data/accounts/fr_FR/CMakeLists.txt +++ b/data/accounts/fr_FR/CMakeLists.txt @@ -16,7 +16,7 @@ SET(account_DATA acctchrt_spouseinc.gnucash-xea acctchrt_spouseretire.gnucash-xea) -SET_DIST_LIST(FR_FR_DIST ${account_DATA} Makefile.am CMakeLists.txt) +SET_DIST_LIST(FR_FR_DIST ${account_DATA} CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/fr_FR) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/fr_FR) diff --git a/data/accounts/fr_FR/Makefile.am b/data/accounts/fr_FR/Makefile.am deleted file mode 100644 index bec4d803c5..0000000000 --- a/data/accounts/fr_FR/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/fr_FR - -account_DATA = \ - acctchrt_brokerage.gnucash-xea \ - acctchrt_business.gnucash-xea \ - acctchrt_carloan.gnucash-xea \ - acctchrt_cdmoneymkt.gnucash-xea \ - acctchrt_childcare.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_currency.gnucash-xea \ - acctchrt_eduloan.gnucash-xea \ - acctchrt_fixedassets.gnucash-xea \ - acctchrt_homeloan.gnucash-xea \ - acctchrt_homeown.gnucash-xea \ - acctchrt_otherloan.gnucash-xea \ - acctchrt_renter.gnucash-xea \ - acctchrt_retiremt.gnucash-xea \ - acctchrt_spouseinc.gnucash-xea \ - acctchrt_spouseretire.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - CMakeLists.txt diff --git a/data/accounts/hu_HU/CMakeLists.txt b/data/accounts/hu_HU/CMakeLists.txt index 46b2259560..3c1f877775 100644 --- a/data/accounts/hu_HU/CMakeLists.txt +++ b/data/accounts/hu_HU/CMakeLists.txt @@ -17,7 +17,7 @@ SET(account_DATA acctchrt_spouseretire.gnucash-xea) -SET_DIST_LIST(HU_HU_DIST ${account_DATA} Makefile.am CMakeLists.txt) +SET_DIST_LIST(HU_HU_DIST ${account_DATA} CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/hu_HU) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/hu_HU) diff --git a/data/accounts/hu_HU/Makefile.am b/data/accounts/hu_HU/Makefile.am deleted file mode 100644 index 1cc8864af8..0000000000 --- a/data/accounts/hu_HU/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/hu_HU - -account_DATA = \ - acctchrt_brokerage.gnucash-xea \ - acctchrt_business.gnucash-xea \ - acctchrt_carloan.gnucash-xea \ - acctchrt_cdmoneymkt.gnucash-xea \ - acctchrt_checkbook.gnucash-xea \ - acctchrt_childcare.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_eduloan.gnucash-xea \ - acctchrt_fixedassets.gnucash-xea \ - acctchrt_homeloan.gnucash-xea \ - acctchrt_homeown.gnucash-xea \ - acctchrt_otherloan.gnucash-xea \ - acctchrt_renter.gnucash-xea \ - acctchrt_retiremt.gnucash-xea \ - acctchrt_spouseinc.gnucash-xea \ - acctchrt_spouseretire.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - CMakeLists.txt diff --git a/data/accounts/it/CMakeLists.txt b/data/accounts/it/CMakeLists.txt index ff6df89fa2..6c60322bd2 100644 --- a/data/accounts/it/CMakeLists.txt +++ b/data/accounts/it/CMakeLists.txt @@ -13,7 +13,7 @@ SET(account_DATA acctchrt_spouseinc.gnucash-xea acctchrt_spouseretire.gnucash-xea) -SET_DIST_LIST(IT_DIST ${account_DATA} Makefile.am CMakeLists.txt) +SET_DIST_LIST(IT_DIST ${account_DATA} CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/it) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/it) diff --git a/data/accounts/it/Makefile.am b/data/accounts/it/Makefile.am deleted file mode 100644 index 88dadf5c40..0000000000 --- a/data/accounts/it/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/it - -account_DATA = \ - acctchrt_brokerage.gnucash-xea \ - acctchrt_carloan.gnucash-xea \ - acctchrt_checkbook.gnucash-xea \ - acctchrt_childcare.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_fixedassets.gnucash-xea \ - acctchrt_homeloan.gnucash-xea \ - acctchrt_homeown.gnucash-xea \ - acctchrt_otherloan.gnucash-xea \ - acctchrt_renter.gnucash-xea \ - acctchrt_retiremt.gnucash-xea \ - acctchrt_spouseinc.gnucash-xea \ - acctchrt_spouseretire.gnucash-xea - - -EXTRA_DIST = \ - ${account_DATA} \ - CMakeLists.txt diff --git a/data/accounts/ja/CMakeLists.txt b/data/accounts/ja/CMakeLists.txt index d329035bea..212f3494aa 100644 --- a/data/accounts/ja/CMakeLists.txt +++ b/data/accounts/ja/CMakeLists.txt @@ -17,7 +17,7 @@ SET(account_DATA acctchrt_spouseinc.gnucash-xea acctchrt_spouseretire.gnucash-xea) -SET_DIST_LIST(JA_DIST ${account_DATA} Makefile.am CMakeLists.txt) +SET_DIST_LIST(JA_DIST ${account_DATA} CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/ja) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/ja) diff --git a/data/accounts/ja/Makefile.am b/data/accounts/ja/Makefile.am deleted file mode 100644 index 63b7355c0d..0000000000 --- a/data/accounts/ja/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/ja - -account_DATA = \ - acctchrt_brokerage.gnucash-xea \ - acctchrt_business.gnucash-xea \ - acctchrt_carloan.gnucash-xea \ - acctchrt_cdmoneymkt.gnucash-xea \ - acctchrt_checkbook.gnucash-xea \ - acctchrt_childcare.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_eduloan.gnucash-xea \ - acctchrt_fixedassets.gnucash-xea \ - acctchrt_full.gnucash-xea \ - acctchrt_homeloan.gnucash-xea \ - acctchrt_homeown.gnucash-xea \ - acctchrt_otherloan.gnucash-xea \ - acctchrt_renter.gnucash-xea \ - acctchrt_retiremt.gnucash-xea \ - acctchrt_spouseinc.gnucash-xea \ - acctchrt_spouseretire.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - CMakeLists.txt diff --git a/data/accounts/ko/CMakeLists.txt b/data/accounts/ko/CMakeLists.txt index 35b41353f9..c5241cc3c9 100644 --- a/data/accounts/ko/CMakeLists.txt +++ b/data/accounts/ko/CMakeLists.txt @@ -16,7 +16,7 @@ SET(account_DATA acctchrt_spouseinc.gnucash-xea acctchrt_spouseretire.gnucash-xea) -SET_DIST_LIST(KO_DIST ${account_DATA} Makefile.am CMakeLists.txt) +SET_DIST_LIST(KO_DIST ${account_DATA} CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/ko) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/ko) diff --git a/data/accounts/ko/Makefile.am b/data/accounts/ko/Makefile.am deleted file mode 100644 index 5473dff7f7..0000000000 --- a/data/accounts/ko/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/ko - -account_DATA = \ - acctchrt_brokerage.gnucash-xea \ - acctchrt_business.gnucash-xea \ - acctchrt_carloan.gnucash-xea \ - acctchrt_cdmoneymkt.gnucash-xea \ - acctchrt_checkbook.gnucash-xea \ - acctchrt_childcare.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_eduloan.gnucash-xea \ - acctchrt_fixedassets.gnucash-xea \ - acctchrt_homeloan.gnucash-xea \ - acctchrt_homeown.gnucash-xea \ - acctchrt_otherloan.gnucash-xea \ - acctchrt_renter.gnucash-xea \ - acctchrt_retiremt.gnucash-xea \ - acctchrt_spouseinc.gnucash-xea \ - acctchrt_spouseretire.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - CMakeLists.txt diff --git a/data/accounts/lt/CMakeLists.txt b/data/accounts/lt/CMakeLists.txt index 9540b09ce2..b529f1524f 100644 --- a/data/accounts/lt/CMakeLists.txt +++ b/data/accounts/lt/CMakeLists.txt @@ -1,6 +1,6 @@ SET(account_DATA acctchrt_business.gnucash-xea) -SET_DIST_LIST(LT_DIST ${account_DATA} Makefile.am CMakeLists.txt) +SET_DIST_LIST(LT_DIST ${account_DATA} CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/lt) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/lt) diff --git a/data/accounts/lt/Makefile.am b/data/accounts/lt/Makefile.am deleted file mode 100644 index 3a95f11c26..0000000000 --- a/data/accounts/lt/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/lt - -account_DATA = \ - acctchrt_business.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - CMakeLists.txt - diff --git a/data/accounts/lv/CMakeLists.txt b/data/accounts/lv/CMakeLists.txt index bfc96bae8a..e0d91037f3 100644 --- a/data/accounts/lv/CMakeLists.txt +++ b/data/accounts/lv/CMakeLists.txt @@ -16,7 +16,7 @@ SET(account_DATA acctchrt_spouseinc.gnucash-xea acctchrt_spouseretire.gnucash-xea) -SET_DIST_LIST(LV_DIST ${account_DATA} acctchrt_full.gnucash-xea Makefile.am CMakeLists.txt) +SET_DIST_LIST(LV_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/lv) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/lv) diff --git a/data/accounts/lv/Makefile.am b/data/accounts/lv/Makefile.am deleted file mode 100644 index a17c0696db..0000000000 --- a/data/accounts/lv/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/lv - -account_DATA = \ - acctchrt_brokerage.gnucash-xea \ - acctchrt_business.gnucash-xea \ - acctchrt_carloan.gnucash-xea \ - acctchrt_cdmoneymkt.gnucash-xea \ - acctchrt_checkbook.gnucash-xea \ - acctchrt_childcare.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_eduloan.gnucash-xea \ - acctchrt_fixedassets.gnucash-xea \ - acctchrt_homeloan.gnucash-xea \ - acctchrt_homeown.gnucash-xea \ - acctchrt_otherloan.gnucash-xea \ - acctchrt_renter.gnucash-xea \ - acctchrt_retiremt.gnucash-xea \ - acctchrt_spouseinc.gnucash-xea \ - acctchrt_spouseretire.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - acctchrt_full.gnucash-xea \ - CMakeLists.txt diff --git a/data/accounts/nb/CMakeLists.txt b/data/accounts/nb/CMakeLists.txt index 8d4c62dfb0..84543661a9 100644 --- a/data/accounts/nb/CMakeLists.txt +++ b/data/accounts/nb/CMakeLists.txt @@ -17,7 +17,7 @@ SET(account_DATA acctchrt_spouseinc.gnucash-xea acctchrt_spouseretire.gnucash-xea) -SET_DIST_LIST(NB_DIST ${account_DATA} acctchrt_full.gnucash-xea Makefile.am CMakeLists.txt) +SET_DIST_LIST(NB_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/nb) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/nb) diff --git a/data/accounts/nb/Makefile.am b/data/accounts/nb/Makefile.am deleted file mode 100644 index 5a67c4968e..0000000000 --- a/data/accounts/nb/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/nb - -account_DATA = \ - acctchrt_brokerage.gnucash-xea \ - acctchrt_business.gnucash-xea \ - acctchrt_carloan.gnucash-xea \ - acctchrt_cdmoneymkt.gnucash-xea \ - acctchrt_checkbook.gnucash-xea \ - acctchrt_childcare.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_eduloan.gnucash-xea \ - acctchrt_fixedassets.gnucash-xea \ - acctchrt_full.gnucash-xea \ - acctchrt_homeloan.gnucash-xea \ - acctchrt_homeown.gnucash-xea \ - acctchrt_otherloan.gnucash-xea \ - acctchrt_renter.gnucash-xea \ - acctchrt_retiremt.gnucash-xea \ - acctchrt_spouseinc.gnucash-xea \ - acctchrt_spouseretire.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - acctchrt_full.gnucash-xea \ - CMakeLists.txt diff --git a/data/accounts/nl/CMakeLists.txt b/data/accounts/nl/CMakeLists.txt index 69dbee40fb..a61540e706 100644 --- a/data/accounts/nl/CMakeLists.txt +++ b/data/accounts/nl/CMakeLists.txt @@ -3,7 +3,7 @@ SET(account_DATA acctchrt_full.gnucash-xea acctchrt_rgs_1.1.gnucash-xea) -SET_DIST_LIST(NL_DIST ${account_DATA} Makefile.am CMakeLists.txt) +SET_DIST_LIST(NL_DIST ${account_DATA} CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/nl) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/nl) diff --git a/data/accounts/nl/Makefile.am b/data/accounts/nl/Makefile.am deleted file mode 100644 index 860f7ea9d6..0000000000 --- a/data/accounts/nl/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -accountdir = ${GNC_ACCOUNTS_DIR}/nl - -account_DATA = \ - acctchrt_checkbook.gnucash-xea \ - acctchrt_full.gnucash-xea \ - acctchrt_rgs_1.1.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - CMakeLists.txt diff --git a/data/accounts/pl/CMakeLists.txt b/data/accounts/pl/CMakeLists.txt index 4f2a53e6f6..effeef9ce5 100644 --- a/data/accounts/pl/CMakeLists.txt +++ b/data/accounts/pl/CMakeLists.txt @@ -16,7 +16,7 @@ SET(account_DATA acctchrt_spouseinc.gnucash-xea acctchrt_spouseretire.gnucash-xea) -SET_DIST_LIST(PL_DIST ${account_DATA} acctchrt_full.gnucash-xea Makefile.am CMakeLists.txt) +SET_DIST_LIST(PL_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/pl) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/pl) \ No newline at end of file diff --git a/data/accounts/pl/Makefile.am b/data/accounts/pl/Makefile.am deleted file mode 100644 index 2584d8562a..0000000000 --- a/data/accounts/pl/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/pl - -account_DATA = \ - acctchrt_brokerage.gnucash-xea \ - acctchrt_business.gnucash-xea \ - acctchrt_carloan.gnucash-xea \ - acctchrt_cdmoneymkt.gnucash-xea \ - acctchrt_checkbook.gnucash-xea \ - acctchrt_childcare.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_eduloan.gnucash-xea \ - acctchrt_fixedassets.gnucash-xea \ - acctchrt_homeloan.gnucash-xea \ - acctchrt_homeown.gnucash-xea \ - acctchrt_otherloan.gnucash-xea \ - acctchrt_renter.gnucash-xea \ - acctchrt_retiremt.gnucash-xea \ - acctchrt_spouseinc.gnucash-xea \ - acctchrt_spouseretire.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - acctchrt_full.gnucash-xea \ - CMakeLists.txt diff --git a/data/accounts/pt_BR/CMakeLists.txt b/data/accounts/pt_BR/CMakeLists.txt index d8a8f275a0..afe654ad2d 100644 --- a/data/accounts/pt_BR/CMakeLists.txt +++ b/data/accounts/pt_BR/CMakeLists.txt @@ -15,7 +15,7 @@ SET(account_DATA acctchrt_spouseinc.gnucash-xea acctchrt_spouseretire.gnucash-xea) -SET_DIST_LIST(PT_BR_DIST ${account_DATA} Makefile.am CMakeLists.txt) +SET_DIST_LIST(PT_BR_DIST ${account_DATA} CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/pt_BR) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/pt_BR) diff --git a/data/accounts/pt_BR/Makefile.am b/data/accounts/pt_BR/Makefile.am deleted file mode 100644 index f272186177..0000000000 --- a/data/accounts/pt_BR/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/pt_BR - -account_DATA = \ - acctchrt_brokerage.gnucash-xea \ - acctchrt_carloan.gnucash-xea \ - acctchrt_cdmoneymkt.gnucash-xea \ - acctchrt_childcare.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_currency.gnucash-xea \ - acctchrt_eduloan.gnucash-xea \ - acctchrt_fixedassets.gnucash-xea \ - acctchrt_homeloan.gnucash-xea \ - acctchrt_homeown.gnucash-xea \ - acctchrt_otherloan.gnucash-xea \ - acctchrt_renter.gnucash-xea \ - acctchrt_retiremt.gnucash-xea \ - acctchrt_spouseinc.gnucash-xea \ - acctchrt_spouseretire.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - CMakeLists.txt diff --git a/data/accounts/pt_PT/CMakeLists.txt b/data/accounts/pt_PT/CMakeLists.txt index 71ee6a3c76..3447cd1dd2 100644 --- a/data/accounts/pt_PT/CMakeLists.txt +++ b/data/accounts/pt_PT/CMakeLists.txt @@ -14,7 +14,7 @@ SET(account_DATA acctchrt_spouseinc.gnucash-xea acctchrt_spouseretire.gnucash-xea) -SET_DIST_LIST(PT_PT_DIST ${account_DATA} Makefile.am CMakeLists.txt) +SET_DIST_LIST(PT_PT_DIST ${account_DATA} CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/pt_PT) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/pt_PT) diff --git a/data/accounts/pt_PT/Makefile.am b/data/accounts/pt_PT/Makefile.am deleted file mode 100644 index 33a9250450..0000000000 --- a/data/accounts/pt_PT/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/pt_PT - -account_DATA = \ - acctchrt_brokerage.gnucash-xea \ - acctchrt_carloan.gnucash-xea \ - acctchrt_cdmoneymkt.gnucash-xea \ - acctchrt_childcare.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_eduloan.gnucash-xea \ - acctchrt_fixedassets.gnucash-xea \ - acctchrt_homeloan.gnucash-xea \ - acctchrt_homeown.gnucash-xea \ - acctchrt_otherloan.gnucash-xea \ - acctchrt_renter.gnucash-xea \ - acctchrt_retiremt.gnucash-xea \ - acctchrt_spouseinc.gnucash-xea \ - acctchrt_spouseretire.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - CMakeLists.txt diff --git a/data/accounts/ru/CMakeLists.txt b/data/accounts/ru/CMakeLists.txt index a2a87d1920..0466b719f7 100644 --- a/data/accounts/ru/CMakeLists.txt +++ b/data/accounts/ru/CMakeLists.txt @@ -4,7 +4,7 @@ SET(account_DATA acctchrt_homeown.gnucash-xea acctchrt_renter.gnucash-xea) -SET_DIST_LIST(RU_DIST ${account_DATA} Makefile.am CMakeLists.txt) +SET_DIST_LIST(RU_DIST ${account_DATA} CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/ru) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/ru) diff --git a/data/accounts/ru/Makefile.am b/data/accounts/ru/Makefile.am deleted file mode 100644 index 0aee45589c..0000000000 --- a/data/accounts/ru/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/ru - -account_DATA = \ - acctchrt_common.gnucash-xea \ - acctchrt_homeloan.gnucash-xea \ - acctchrt_homeown.gnucash-xea \ - acctchrt_renter.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - CMakeLists.txt diff --git a/data/accounts/sk/CMakeLists.txt b/data/accounts/sk/CMakeLists.txt index 074eabfa0c..b7e5d72ec1 100644 --- a/data/accounts/sk/CMakeLists.txt +++ b/data/accounts/sk/CMakeLists.txt @@ -15,7 +15,7 @@ SET(account_DATA acctchrt_spouseinc.gnucash-xea acctchrt_spouseretire.gnucash-xea) -SET_DIST_LIST(SK_DIST ${account_DATA} Makefile.am CMakeLists.txt) +SET_DIST_LIST(SK_DIST ${account_DATA} CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/sk) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/sk) diff --git a/data/accounts/sk/Makefile.am b/data/accounts/sk/Makefile.am deleted file mode 100644 index 8e72d170a2..0000000000 --- a/data/accounts/sk/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/sk - -account_DATA = \ - acctchrt_brokerage.gnucash-xea \ - acctchrt_carloan.gnucash-xea \ - acctchrt_cdmoneymkt.gnucash-xea \ - acctchrt_childcare.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_currency.gnucash-xea \ - acctchrt_eduloan.gnucash-xea \ - acctchrt_fixedassets.gnucash-xea \ - acctchrt_homeloan.gnucash-xea \ - acctchrt_homeown.gnucash-xea \ - acctchrt_otherloan.gnucash-xea \ - acctchrt_renter.gnucash-xea \ - acctchrt_retiremt.gnucash-xea \ - acctchrt_spouseinc.gnucash-xea \ - acctchrt_spouseretire.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - CMakeLists.txt diff --git a/data/accounts/sv_AX/CMakeLists.txt b/data/accounts/sv_AX/CMakeLists.txt index 77b30b3960..91735297c4 100644 --- a/data/accounts/sv_AX/CMakeLists.txt +++ b/data/accounts/sv_AX/CMakeLists.txt @@ -3,7 +3,7 @@ SET(account_DATA acctchrt_sbr-xbrl.gnucash-xea acctchrt_rf.gnucash-xea) -SET_DIST_LIST(SV_AX_DIST ${account_DATA} Makefile.am CMakeLists.txt) +SET_DIST_LIST(SV_AX_DIST ${account_DATA} CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/sv_AX) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/sv_AX) diff --git a/data/accounts/sv_AX/Makefile.am b/data/accounts/sv_AX/Makefile.am deleted file mode 100644 index face1efd97..0000000000 --- a/data/accounts/sv_AX/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/sv_AX - -account_DATA = \ - acctchrt_common.gnucash-xea \ - acctchrt_sbr-xbrl.gnucash-xea \ - acctchrt_rf.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - CMakeLists.txt diff --git a/data/accounts/sv_FI/CMakeLists.txt b/data/accounts/sv_FI/CMakeLists.txt index a5e03e9e32..021d70765e 100644 --- a/data/accounts/sv_FI/CMakeLists.txt +++ b/data/accounts/sv_FI/CMakeLists.txt @@ -3,7 +3,7 @@ SET(account_DATA acctchrt_sbr-xbrl.gnucash-xea acctchrt_rf.gnucash-xea) -SET_DIST_LIST(SV_FI_DIST ${account_DATA} Makefile.am CMakeLists.txt) +SET_DIST_LIST(SV_FI_DIST ${account_DATA} CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/sv_FI) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/sv_FI) \ No newline at end of file diff --git a/data/accounts/sv_FI/Makefile.am b/data/accounts/sv_FI/Makefile.am deleted file mode 100644 index b90869de29..0000000000 --- a/data/accounts/sv_FI/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/sv_FI - -account_DATA = \ - acctchrt_common.gnucash-xea \ - acctchrt_sbr-xbrl.gnucash-xea \ - acctchrt_rf.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - CMakeLists.txt diff --git a/data/accounts/sv_SE/CMakeLists.txt b/data/accounts/sv_SE/CMakeLists.txt index 17b1000258..5b41b81f80 100644 --- a/data/accounts/sv_SE/CMakeLists.txt +++ b/data/accounts/sv_SE/CMakeLists.txt @@ -2,7 +2,7 @@ SET(account_DATA bas_2012.gnucash-xea acctchrt_common.gnucash-xea) -SET_DIST_LIST(SV_SE_DIST ${account_DATA} README.bas_2012 Makefile.am CMakeLists.txt) +SET_DIST_LIST(SV_SE_DIST ${account_DATA} README.bas_2012 CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/sv_SE) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/sv_SE) diff --git a/data/accounts/sv_SE/Makefile.am b/data/accounts/sv_SE/Makefile.am deleted file mode 100644 index cb37583766..0000000000 --- a/data/accounts/sv_SE/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/sv_SE - -account_DATA = \ - bas_2012.gnucash-xea \ - acctchrt_common.gnucash-xea -EXTRA_DIST = \ - README.bas_2012 \ - ${account_DATA} \ - CMakeLists.txt diff --git a/data/accounts/tr_TR/CMakeLists.txt b/data/accounts/tr_TR/CMakeLists.txt index ca7a035746..3ab1afb5c2 100644 --- a/data/accounts/tr_TR/CMakeLists.txt +++ b/data/accounts/tr_TR/CMakeLists.txt @@ -8,7 +8,7 @@ SET(account_DATA acctchrt_homeloan.gnucash-xea acctchrt_TEKDUZ.gnucash-xea) -SET_DIST_LIST(TR_TR_DIST ${account_DATA} Makefile.am CMakeLists.txt) +SET_DIST_LIST(TR_TR_DIST ${account_DATA} CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/tr_TR) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/tr_TR) diff --git a/data/accounts/tr_TR/Makefile.am b/data/accounts/tr_TR/Makefile.am deleted file mode 100644 index cd773abc16..0000000000 --- a/data/accounts/tr_TR/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/tr_TR - -account_DATA = \ - acctchrt_brokerage.gnucash-xea \ - acctchrt_carloan.gnucash-xea \ - acctchrt_cdmoneymkt.gnucash-xea \ - acctchrt_checkbook.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_fixedassets.gnucash-xea \ - acctchrt_homeloan.gnucash-xea \ - acctchrt_TEKDUZ.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - CMakeLists.txt diff --git a/data/accounts/zh_CN/CMakeLists.txt b/data/accounts/zh_CN/CMakeLists.txt index 81d5cd3d54..17c3ac5ff3 100644 --- a/data/accounts/zh_CN/CMakeLists.txt +++ b/data/accounts/zh_CN/CMakeLists.txt @@ -16,7 +16,7 @@ SET(account_DATA acctchrt_spouseinc.gnucash-xea acctchrt_spouseretire.gnucash-xea) -SET_DIST_LIST(ZH_CN_DIST ${account_DATA} acctchrt_full.gnucash-xea Makefile.am CMakeLists.txt) +SET_DIST_LIST(ZH_CN_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/zh_CN) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/zn_CN) diff --git a/data/accounts/zh_CN/Makefile.am b/data/accounts/zh_CN/Makefile.am deleted file mode 100644 index 2bd1876357..0000000000 --- a/data/accounts/zh_CN/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/zh_CN - -account_DATA = \ - acctchrt_brokerage.gnucash-xea \ - acctchrt_business.gnucash-xea \ - acctchrt_carloan.gnucash-xea \ - acctchrt_cdmoneymkt.gnucash-xea \ - acctchrt_checkbook.gnucash-xea \ - acctchrt_childcare.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_eduloan.gnucash-xea \ - acctchrt_fixedassets.gnucash-xea \ - acctchrt_homeloan.gnucash-xea \ - acctchrt_homeown.gnucash-xea \ - acctchrt_otherloan.gnucash-xea \ - acctchrt_renter.gnucash-xea \ - acctchrt_retiremt.gnucash-xea \ - acctchrt_spouseinc.gnucash-xea \ - acctchrt_spouseretire.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - acctchrt_full.gnucash-xea \ - CMakeLists.txt diff --git a/data/accounts/zh_HK/CMakeLists.txt b/data/accounts/zh_HK/CMakeLists.txt index 3e9eea562c..a435b1123a 100644 --- a/data/accounts/zh_HK/CMakeLists.txt +++ b/data/accounts/zh_HK/CMakeLists.txt @@ -1,6 +1,6 @@ SET(account_DATA acctchrt_business.gnucash-xea) -SET_DIST_LIST(ZH_HK_DIST ${account_DATA} Makefile.am CMakeLists.txt) +SET_DIST_LIST(ZH_HK_DIST ${account_DATA} CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/zh_HK) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/zh_HK) diff --git a/data/accounts/zh_HK/Makefile.am b/data/accounts/zh_HK/Makefile.am deleted file mode 100644 index d8dad2a89a..0000000000 --- a/data/accounts/zh_HK/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/zh_HK - -account_DATA = \ - acctchrt_business.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - CMakeLists.txt diff --git a/data/accounts/zh_TW/CMakeLists.txt b/data/accounts/zh_TW/CMakeLists.txt index ec3124e6d7..531516873c 100644 --- a/data/accounts/zh_TW/CMakeLists.txt +++ b/data/accounts/zh_TW/CMakeLists.txt @@ -1,6 +1,6 @@ SET(account_DATA acctchrt_business.gnucash-xea) -SET_DIST_LIST(ZH_TW_DIST ${account_DATA} Makefile.am CMakeLists.txt) +SET_DIST_LIST(ZH_TW_DIST ${account_DATA} CMakeLists.txt) INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/zh_TW) FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/zh_TW) diff --git a/data/accounts/zh_TW/Makefile.am b/data/accounts/zh_TW/Makefile.am deleted file mode 100644 index bc4ff24a8c..0000000000 --- a/data/accounts/zh_TW/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -accountdir = ${GNC_ACCOUNTS_DIR}/zh_TW - -account_DATA = \ - acctchrt_business.gnucash-xea - -EXTRA_DIST = \ - ${account_DATA} \ - CMakeLists.txt diff --git a/data/checks/CMakeLists.txt b/data/checks/CMakeLists.txt index e9f8b3aa21..1858b285ea 100644 --- a/data/checks/CMakeLists.txt +++ b/data/checks/CMakeLists.txt @@ -12,4 +12,4 @@ INSTALL(FILES ${checks_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/checks FILE(COPY ${checks_DATA} DESTINATION ${DATADIR_BUILD}/gnucash/checks) -SET_DIST_LIST(checks_DIST CMakeLists.txt Makefile.am ${checks_DATA}) +SET_DIST_LIST(checks_DIST CMakeLists.txt ${checks_DATA}) diff --git a/data/checks/Makefile.am b/data/checks/Makefile.am deleted file mode 100644 index 9524339a3a..0000000000 --- a/data/checks/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ - -checksdir = ${GNC_CHECKS_DIR} - -checks_DATA = \ - deluxe.chk \ - liberty.chk \ - quicken.chk \ - quicken_wallet.chk \ - voucher.chk \ - quicken_check_21.chk \ - quicken_3part.chk - -EXTRA_DIST = ${checks_DATA} CMakeLists.txt diff --git a/data/pixmaps/CMakeLists.txt b/data/pixmaps/CMakeLists.txt index fa72a9634b..764536dc7e 100644 --- a/data/pixmaps/CMakeLists.txt +++ b/data/pixmaps/CMakeLists.txt @@ -88,6 +88,6 @@ SET(gncscalableicon_DATA hicolor/scalable/apps/gnucash-icon.svg ) -SET_LOCAL_DIST(pixmaps_DIST_local CMakeLists.txt Makefile.am ${gncpixmap_DATA} +SET_LOCAL_DIST(pixmaps_DIST_local CMakeLists.txt ${gncpixmap_DATA} ${gncicon_DATA} ${gncscalableicon_DATA}) SET(pixmaps_DIST ${pixmaps_DIST_local} PARENT_SCOPE) diff --git a/data/pixmaps/Makefile.am b/data/pixmaps/Makefile.am deleted file mode 100644 index d47c022916..0000000000 --- a/data/pixmaps/Makefile.am +++ /dev/null @@ -1,120 +0,0 @@ -gncpixmapdir = ${GNC_PIXMAP_DIR} -gncpixmap_DATA = \ - gnucash-icon.ico \ - gnucash-icon-48x48.bmp \ - gnucash_splash.png - -gncicon16dir = ${pkgdatadir}/icons/hicolor/16x16/actions -gncicon16_DATA = \ - hicolor/16x16/actions/gnc-account.png \ - hicolor/16x16/actions/gnc-account-delete.png \ - hicolor/16x16/actions/gnc-account-edit.png \ - hicolor/16x16/actions/gnc-account-new.png \ - hicolor/16x16/actions/gnc-account-open.png \ - hicolor/16x16/actions/gnc-account-report.png \ - hicolor/16x16/actions/gnc-gnome-pdf.png \ - hicolor/16x16/actions/gnc-invoice.png \ - hicolor/16x16/actions/gnc-invoice-duplicate.png \ - hicolor/16x16/actions/gnc-invoice-edit.png \ - hicolor/16x16/actions/gnc-invoice-new.png \ - hicolor/16x16/actions/gnc-invoice-pay.png \ - hicolor/16x16/actions/gnc-invoice-post.png \ - hicolor/16x16/actions/gnc-invoice-unpost.png \ - hicolor/16x16/actions/gnc-jumpto.png \ - hicolor/16x16/actions/gnc-split-trans.png \ - hicolor/16x16/actions/gnc-sx-new.png \ - hicolor/16x16/actions/gnc-transfer.png - -gncicon24dir = ${pkgdatadir}/icons/hicolor/24x24/actions -gncicon24_DATA = \ - hicolor/24x24/actions/gnc-account.png \ - hicolor/24x24/actions/gnc-account-delete.png \ - hicolor/24x24/actions/gnc-account-edit.png \ - hicolor/24x24/actions/gnc-account-new.png \ - hicolor/24x24/actions/gnc-account-open.png \ - hicolor/24x24/actions/gnc-account-report.png \ - hicolor/24x24/actions/gnc-gnome-pdf.png \ - hicolor/24x24/actions/gnc-invoice.png \ - hicolor/24x24/actions/gnc-invoice-duplicate.png \ - hicolor/24x24/actions/gnc-invoice-edit.png \ - hicolor/24x24/actions/gnc-invoice-new.png \ - hicolor/24x24/actions/gnc-invoice-pay.png \ - hicolor/24x24/actions/gnc-invoice-post.png \ - hicolor/24x24/actions/gnc-invoice-unpost.png \ - hicolor/24x24/actions/gnc-jumpto.png \ - hicolor/24x24/actions/gnc-split-trans.png \ - hicolor/24x24/actions/gnc-sx-new.png \ - hicolor/24x24/actions/gnc-transfer.png - -gnchuge256icondir = ${datadir}/icons/hicolor/256x256/apps -gnchuge256icon_DATA = hicolor/256x256/apps/gnucash-icon.png - -gnchuge128icondir = ${datadir}/icons/hicolor/128x128/apps -gnchuge128icon_DATA = hicolor/128x128/apps/gnucash-icon.png - -gnclarge96icondir = ${datadir}/icons/hicolor/96x96/apps -gnclarge96icon_DATA = hicolor/96x96/apps/gnucash-icon.png - -gnclarge64icondir = ${datadir}/icons/hicolor/64x64/apps -gnclarge64icon_DATA = hicolor/64x64/apps/gnucash-icon.png - -gnclarge48icondir = ${datadir}/icons/hicolor/48x48/apps -gnclarge48icon_DATA = hicolor/48x48/apps/gnucash-icon.png - -gncmediumicondir = ${datadir}/icons/hicolor/32x32/apps -gncmediumicon_DATA = hicolor/32x32/apps/gnucash-icon.png - -gncsmalltwfouricondir = ${datadir}/icons/hicolor/24x24/apps -gncsmalltwfouricon_DATA = hicolor/24x24/apps/gnucash-icon.png - -gncsmalltwtwoicondir = ${datadir}/icons/hicolor/22x22/apps -gncsmalltwtwoicon_DATA = hicolor/22x22/apps/gnucash-icon.png - -gncextrasmallicondir = ${datadir}/icons/hicolor/16x16/apps -gncextrasmallicon_DATA = hicolor/16x16/apps/gnucash-icon.png - -gncscalableicondir = ${datadir}/icons/hicolor/scalable/apps -gncscalableicon_DATA = hicolor/scalable/apps/gnucash-icon.svg - -# As suggested by -if !OS_WIN32 -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor -install-data-hook: update-icon-cache -uninstall-hook: update-icon-cache -update-icon-cache: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache); \ - else \ - echo "*** Icon cache not updated. After (un)install, run this:"; \ - echo "*** $(gtk_update_icon_cache)"; \ - fi -endif - -ico_files_hr = \ - ${gnchuge256icon_DATA} \ - ${gnchuge128icon_DATA} \ - ${gnclarge96icon_DATA} \ - ${gnclarge64icon_DATA} \ - ${gnclarge48icon_DATA} - -ico_files_lr = \ - ${gncmediumicon_DATA} \ - ${gncsmalltwfouricon_DATA} \ - ${gncsmalltwtwoicon_DATA} \ - ${gncextrasmallicon_DATA} - -EXTRA_DIST = \ - ${gncpixmap_DATA} \ - ${gncicon16_DATA} \ - ${gncicon24_DATA} \ - ${ico_files_hr} \ - ${ico_files_lr} \ - ${gncscalableicon_DATA} \ - CMakeLists.txt - -# Create gnucash-icon.ico -.PHONY: ico -ico: ${ico_files_hr} ${ico_files_lr} - convert ${ico_files_lr} ${ico_files_hr} tmp.ico; \ - mv tmp.ico gnucash-icon.ico diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 52f933e183..5f86e5e99c 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -18,7 +18,7 @@ SET(doc_DATA SET(doc_noinst_DATA build-aix.txt build-solaris.txt CMakeLists.txt gnc-fq-dump.1 gnc-fq-helper.1 gnucash.1.in gtkrc-2.0.gnucash - Makefile.am misc-notes.txt README.build-system README.HBCI README.OFX README.translator.txt tip_of_the_day.list.in + misc-notes.txt README.build-system README.HBCI README.OFX README.translator.txt tip_of_the_day.list.in TRANSLATION_HOWTO) INSTALL(FILES ${doc_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/gnucash) diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index 5d06e8a1a7..0000000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,70 +0,0 @@ -SUBDIRS = examples - -doc_DATA = \ - README.francais \ - README.german \ - README-ca.win32-bin.txt \ - README-de.win32-bin.txt \ - README-fr.win32-bin.txt \ - README-it.win32-bin.txt \ - README-lv.win32-bin.txt \ - README-nl.win32-bin.txt \ - README-zh_CN.win32-bin.txt \ - README-zh_TW.win32-bin.txt \ - README.win32-bin.txt \ - guile-hackers.txt \ - projects.html - -dist_man_MANS = \ - gnucash.1 \ - gnc-fq-dump.1 \ - gnc-fq-helper.1 - -tipsdir = $(GNC_SHAREDIR) -tips_DATA = tip_of_the_day.list - -EXTRA_DIST = \ - ${doc_DATA} \ - README.build-system \ - README.HBCI \ - README.OFX \ - README.translator.txt \ - TRANSLATION_HOWTO \ - build-aix.txt \ - build-solaris.txt \ - gnucash.1.in \ - gtkrc-2.0.gnucash \ - misc-notes.txt \ - tip_of_the_day.list.in \ - CMakeLists.txt - -if BUILDING_FROM_VCS -top_basedir = $(top_builddir) -else -top_basedir = $(top_srcdir) -endif - -gnucash.1: gnucash.1.in Makefile - rm -f $@.tmp - GNC_VCS_REV_Y_M=`perl -ne 'print if $$_=~s/.*GNC_VCS_REV_Y_M "(.*)"/$$1/' ${top_basedir}/libgnucash/core-utils/gnc-vcs-info.h` ; \ - ${SED} < $< > $@.tmp \ - -e 's:[@]VERSION[@]:${VERSION}:g' \ - -e 's:[@]DATE[@]:'$${GNC_VCS_REV_Y_M}':g' - chmod +x $@.tmp - mv $@.tmp $@ - -tip_of_the_day.list: tip_of_the_day.list.in Makefile - ${CC} -E -P -x c -D'N_(x)=x' -o $@.tmp $< - cat -s $@.tmp | ${SED} -e 's/^ *"//' \ - -e 's/"* *[|] */|/' > $@ - rm -f $@.tmp -if PLATFORM_WIN32 - perl -pi.bak -e 's/" *$$//' $@ -else - perl -pi.bak -e 's/" *$$/\n/' $@ -endif - -DISTCLEANFILES = \ - gnucash.1 \ - tip_of_the_day.list \ - tip_of_the_day.list.bak diff --git a/doc/examples/CMakeLists.txt b/doc/examples/CMakeLists.txt index f4c024ce70..357f0a1972 100644 --- a/doc/examples/CMakeLists.txt +++ b/doc/examples/CMakeLists.txt @@ -23,4 +23,4 @@ SET(examples_DATA INSTALL(FILES ${examples_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/gnucash) -SET_DIST_LIST(examples_DIST ${examples_DATA} CMakeLists.txt Makefile.am) +SET_DIST_LIST(examples_DIST ${examples_DATA} CMakeLists.txt ) diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am deleted file mode 100644 index ce1cc3de96..0000000000 --- a/doc/examples/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ - -doc_DATA = \ - Money95bank_fr.qif \ - Money95invst_fr.qif \ - Money95mfunds_fr.qif \ - Money95stocks_fr.qif \ - README \ - README_invoice \ - abc-all.qif \ - abc.qif \ - bogus.qif \ - cbb-export.qif \ - currency_tree_xml.gnucash \ - every.qif \ - invoice.csv \ - ms-money.qif \ - quicktest.qif \ - swipe.qif \ - taxreport.gnucash \ - web.qif - -EXTRA_DIST = \ - ${doc_DATA} \ - CMakeLists.txt diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt index 39b830e3fe..3ed122b4cb 100644 --- a/gnucash/CMakeLists.txt +++ b/gnucash/CMakeLists.txt @@ -255,7 +255,7 @@ ENDFOREACH() SET_LOCAL_DIST(gnucash_DIST_local CMakeLists.txt environment.in generate-gnc-script gnucash-bin.c gnucash.rc.in gnucash-valgrind.in gnucash-gresources.xml ${gresource_files} - Makefile.am ${gnucash_EXTRA_DIST}) + ${gnucash_EXTRA_DIST}) SET(gnucash_DIST ${gnucash_DIST_local} ${gnome_DIST} ${gnome_search_DIST} ${gnome_utils_DIST} ${html_DIST} ${import_export_DIST} ${python_DIST} ${register_DIST} ${report_DIST} diff --git a/gnucash/Makefile.am b/gnucash/Makefile.am deleted file mode 100644 index 0c0e1251c9..0000000000 --- a/gnucash/Makefile.am +++ /dev/null @@ -1,129 +0,0 @@ -if WITH_PYTHON - PYTHON_DIR = python -endif -# Order is important here. -SUBDIRS = \ - ${PYTHON_DIR} \ - gnome-utils \ - html \ - gnome-search \ - report \ - register \ - gnome \ - import-export \ - . - -AM_CPPFLAGS = -I${top_builddir} ${GLIB_CFLAGS} ${GNOME_CFLAGS} ${GTK_CFLAGS} \ - -DPKGSYSCONFDIR=\"${GNC_CONFIGDIR}\" \ - -DPKGDATADIR=\"${GNC_SHAREDIR}\" \ - -I${top_srcdir}/common \ - -I${top_builddir}/common \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/app-utils \ - -I${top_srcdir}/gnucash/gnome-utils \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/gnucash/gnome \ - -I${top_builddir}/common \ - -I${top_builddir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/gnucash/report/report-system \ - ${GUILE_CFLAGS} \ - ${GTK_MAC_CFLAGS} - -SUFFIXES = .rc - -config_DATA = environment -configdir = ${GNC_CONFIGDIR} - -# Some settings are platform dependent. Let's define them per platform. -if PLATFORM_WIN32 -# Windows specific settings go here: -GNUCASH_RESOURCE_FILE = gnucash.rc -dist_noinst_DATA = gnucash.rc - -.rc.o: - $(AM_V_GEN)$(RC) -I${top_srcdir}/data/pixmaps -i '$<' --input-format=rc -o '$@' -O coff - -else !PLATFORM_WIN32 -# All other platforms use these settings: -PLATFORM_FILES = gnucash-valgrind - -endif !PLATFORM_WIN32 - -# gresource for css -gresource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/gnucash-gresources.xml) -gnucash-gresources.c: gnucash-gresources.xml $(gresource_files) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $< - -BIN_NAME = gnucash -bin_PROGRAMS = ${BIN_NAME} -gnucash_SOURCES = gnucash-bin.c gnucash-gresources.c ${GNUCASH_RESOURCE_FILE} -gnucash_LDADD = \ - ${top_builddir}/gnucash/register/ledger-core/libgncmod-ledger-core.la \ - ${top_builddir}/gnucash/report/report-gnome/libgncmod-report-gnome.la \ - ${top_builddir}/gnucash/gnome/libgnc-gnome.la \ - ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \ - ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${top_builddir}/gnucash/report/report-system/libgncmod-report-system.la \ - ${GUILE_LIBS} \ - ${GLIB_LIBS} \ - ${GTK_LIBS} - -if WITH_GOOGLE_PROFILER -gnucash_LDADD += -lprofiler -endif - -GNUCASH_BIN_INSTALL_NAME=`echo ${BIN_NAME} | sed -e '$(transform)'` - -gnucash-valgrind: gnucash-valgrind.in ${top_builddir}/config.status Makefile - rm -f $@.tmp - sed < $< > $@.tmp \ - -e "s#[@]TOP_SRC_DIR[@]#${abs_top_srcdir}#g" \ - -e "s#[@]GNUCASH_BIN_INSTALL_NAME[@]#${GNUCASH_BIN_INSTALL_NAME}#g" - mv $@.tmp $@ - chmod u+x $@ - -environment: environment.in ${top_builddir}/config.status Makefile - rm -f $@.tmp - sed < $< > $@.tmp \ - -e '/[@]NOTE.*[@]/ D' \ - -e "s#[@]GUILE_EFFECTIVE_VERSION[@]#@GUILE_EFFECTIVE_VERSION@#g" -if CUSTOM_GNC_DBD_DIR - echo 'GNC_DBD_DIR=@GNC_DBD_DIR@' >> $@.tmp -endif - # Set XDG_DATA_DIRS if necessary. The three components of the search path are the - # directory used by GnuCash, whatever was specified in the environment at run time, and - # the default value specified via configure. - if [ "a$(datadir)" != "a/usr/share" ] && [ "a$(datadir)" != "a/usr/local/share" ]; \ - then \ - echo >> $@.tmp; \ - echo "# GnuCash was not installed in the default location" >> $@.tmp; \ - echo "# XDG_DATA_DIRS will be set so that our documentation" >> $@.tmp; \ - echo "# and gsettings schemas are found." >> $@.tmp; \ - echo "XDG_DATA_DIRS=$(datadir);{XDG_DATA_DIRS};${GNC_SYSTEM_XDG_DATA_DIRS}" >> $@.tmp; \ - fi -if WITH_PYTHON - if [ "${PYTHON_SITE_PKG}" != "${pyexecdir}" ]; \ - then \ - echo >> $@.tmp; \ - echo "# Define PYTHONPATH for non default installation path." >> $@.tmp; \ - echo "PYTHONPATH=${pyexecdir};{PYTHONPATH}" >> $@.tmp; \ - fi -endif - mv $@.tmp $@ - -CLEANFILES = $(BUILT_SOURCES) ${config_DATA} ${PLATFORM_FILES} - - -EXTRA_DIST = \ - generate-gnc-script \ - gnucash-valgrind.in \ - environment.in \ - gnucash-gresources.xml \ - ${gresource_files} \ - CMakeLists.txt - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.bin\" diff --git a/gnucash/gnome-search/CMakeLists.txt b/gnucash/gnome-search/CMakeLists.txt index 571e8964de..31446289b4 100644 --- a/gnucash/gnome-search/CMakeLists.txt +++ b/gnucash/gnome-search/CMakeLists.txt @@ -36,7 +36,7 @@ SET (gnome_search_noinst_HEADERS # Add dependency on config.h SET_SOURCE_FILES_PROPERTIES (${gnome_search_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H}) -SET_LOCAL_DIST(gnome_search_DIST_local CMakeLists.txt Makefile.am dialog-search.glade ${gnome_search_SOURCES} ${gnome_search_HEADERS} +SET_LOCAL_DIST(gnome_search_DIST_local CMakeLists.txt dialog-search.glade ${gnome_search_SOURCES} ${gnome_search_HEADERS} ${gnome_search_noinst_HEADERS}) SET(gnome_search_DIST ${gnome_search_DIST_local} PARENT_SCOPE) diff --git a/gnucash/gnome-search/Makefile.am b/gnucash/gnome-search/Makefile.am deleted file mode 100644 index 6dcae68550..0000000000 --- a/gnucash/gnome-search/Makefile.am +++ /dev/null @@ -1,66 +0,0 @@ -pkglib_LTLIBRARIES = libgncmod-gnome-search.la - -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/app-utils \ - -I${top_srcdir}/gnucash/gnome-utils \ - -I${top_srcdir}/libgnucash/gnc-module \ - ${GUILE_CFLAGS} \ - ${GTK_CFLAGS} \ - ${GLIB_CFLAGS} - -libgncmod_gnome_search_la_SOURCES = \ - gncmod-gnome-search.c \ - gnc-general-search.c \ - dialog-search.c \ - search-account.c \ - search-boolean.c \ - search-core-type.c \ - search-core-utils.c \ - search-date.c \ - search-double.c \ - search-int64.c \ - search-numeric.c \ - search-reconciled.c \ - search-string.c - -gncincludedir = ${GNC_INCLUDE_DIR} -gncinclude_HEADERS = \ - dialog-search.h \ - gnc-general-search.h - -noinst_HEADERS = \ - search-account.h \ - search-boolean.h \ - search-core-type.h \ - search-core-utils.h \ - search-date.h \ - search-double.h \ - search-int64.h \ - search-numeric.h \ - search-reconciled.h \ - search-string.h - -libgncmod_gnome_search_la_LDFLAGS = -avoid-version - -libgncmod_gnome_search_la_LIBADD = \ - ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \ - ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${GUILE_LIBS} \ - ${GLIB_LIBS} \ - ${REGEX_LIBS} - -gtkbuilderdir = $(GNC_GTKBUILDER_DIR) -gtkbuilder_DATA = \ - dialog-search.glade - -EXTRA_DIST = \ - ${gtkbuilder_DATA} \ - CMakeLists.txt - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.gui.search\" diff --git a/gnucash/gnome-utils/CMakeLists.txt b/gnucash/gnome-utils/CMakeLists.txt index 1ddb27a91a..b3baf0265d 100644 --- a/gnucash/gnome-utils/CMakeLists.txt +++ b/gnucash/gnome-utils/CMakeLists.txt @@ -265,7 +265,7 @@ GNC_ADD_SCHEME_TARGETS(scm-gnome-utils-2 ADD_CUSTOM_TARGET(scm-gnome-utils ALL DEPENDS scm-gnome-utils-2 scm-gnome-utils-1) -SET_LOCAL_DIST(gnome_utils_DIST_local CMakeLists.txt Makefile.am ${gnome_utils_SOURCES} ${gnome_utils_HEADERS} +SET_LOCAL_DIST(gnome_utils_DIST_local CMakeLists.txt ${gnome_utils_SOURCES} ${gnome_utils_HEADERS} ${gnome_utils_noinst_HEADERS} gnome-utils.scm gnome-utils.i gnc-menu-extensions.scm make-gnc-warnings-c.xsl make-gnc-warnings-h.xsl) SET(gnome_utils_DIST ${gnome_utils_DIST_local} ${gnome_utils_gschema_DIST} ${test_gnome_utils_DIST} diff --git a/gnucash/gnome-utils/Makefile.am b/gnucash/gnome-utils/Makefile.am deleted file mode 100644 index 2ed2bc2fbc..0000000000 --- a/gnucash/gnome-utils/Makefile.am +++ /dev/null @@ -1,315 +0,0 @@ -SUBDIRS = gtkbuilder gschemas . test ui - -pkglib_LTLIBRARIES = libgncmod-gnome-utils.la - -# Note that src/gnome-utils CANNOT depend on src/gnome! - -AM_CPPFLAGS = \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/backend/xml \ - -I${top_srcdir}/libgnucash/app-utils \ - -I${top_srcdir}/common \ - -I${top_builddir}/common \ - -I${top_builddir}/libgnucash/core-utils \ - -I${top_srcdir}/borrowed/libc \ - ${GLIB_CFLAGS} \ - ${GTK_CFLAGS} \ - ${GNOME_KEYRING_CFLAGS} \ - ${LIBSECRET_CFLAGS} \ - ${GUILE_CFLAGS} \ - ${LIBGDA_CFLAGS} \ - ${LIBXML2_CFLAGS} \ - ${GTK_MAC_CFLAGS} - -libgncmod_gnome_utils_la_SOURCES = \ - account-quickfill.c \ - assistant-xml-encoding.c \ - cursors.c \ - dialog-account.c \ - dialog-book-close.c \ - dialog-commodity.c \ - dialog-dup-trans.c \ - dialog-file-access.c \ - dialog-object-references.c \ - dialog-options.c \ - dialog-preferences.c \ - dialog-query-view.c \ - dialog-reset-warnings.c \ - dialog-tax-table.c \ - dialog-totd.c \ - dialog-transfer.c \ - dialog-userpass.c \ - dialog-utils.c \ - gnc-account-sel.c \ - gnc-amount-edit.c \ - gnc-autosave.c \ - gnc-cell-renderer-date.c \ - gnc-cell-renderer-popup.c \ - gnc-cell-renderer-popup-entry.c \ - gnc-combott.c \ - gnc-commodity-edit.c \ - gnc-currency-edit.c \ - gnc-date-delta.c \ - gnc-date-edit.c \ - gnc-date-format.c \ - gnc-dense-cal.c \ - gnc-dense-cal-model.c \ - gnc-dense-cal-store.c \ - gnc-embedded-window.c \ - gnc-file.c \ - gnc-frequency.c \ - gnc-recurrence.c \ - gnc-general-select.c \ - gnc-gnome-utils.c \ - gnc-gobject-utils.c \ - gnc-gtk-utils.c \ - gnc-gui-query.c \ - gnc-icons.c \ - gnc-keyring.c \ - gnc-main-window.c \ - gnc-menu-extensions.c \ - gnc-plugin-file-history.c \ - gnc-plugin-manager.c \ - gnc-plugin-menu-additions.c \ - gnc-plugin-page.c \ - gnc-plugin.c \ - gnc-period-select.c \ - gnc-query-view.c \ - gnc-splash.c \ - gnc-sx-instance-dense-cal-adapter.c \ - gnc-sx-list-tree-model-adapter.c \ - gnc-tree-control-split-reg.c \ - gnc-tree-model.c \ - gnc-tree-model-account-types.c \ - gnc-tree-model-account.c \ - gnc-tree-model-budget.c \ - gnc-tree-model-owner.c \ - gnc-tree-model-commodity.c \ - gnc-tree-model-price.c \ - gnc-tree-model-split-reg.c \ - gnc-tree-util-split-reg.c \ - gnc-tree-view-account.c \ - gnc-tree-view-commodity.c \ - gnc-tree-view-owner.c \ - gnc-tree-view-price.c \ - gnc-tree-view-split-reg.c \ - gnc-tree-view-sx-list.c \ - gnc-tree-view.c \ - gnc-warnings.c \ - gnc-window.c \ - gncmod-gnome-utils.c \ - misc-gnome-utils.c \ - tree-view-utils.c \ - search-param.c \ - print-session.c \ - swig-gnome-utils.c \ - window-main-summarybar.c - -gncincludedir = ${GNC_INCLUDE_DIR} -gncinclude_HEADERS = \ - account-quickfill.h \ - assistant-xml-encoding.h \ - dialog-account.h \ - dialog-book-close.h \ - dialog-commodity.h \ - dialog-dup-trans.h \ - dialog-file-access.h \ - dialog-preferences.h \ - dialog-object-references.h \ - dialog-options.h \ - dialog-query-view.h \ - dialog-reset-warnings.h \ - dialog-totd.h \ - dialog-transfer.h \ - dialog-utils.h \ - gnc-account-sel.h \ - gnc-amount-edit.h \ - gnc-cell-renderer-date.h \ - gnc-cell-renderer-popup.h \ - gnc-cell-renderer-popup-entry.h \ - gnc-combott.h \ - gnc-commodity-edit.h \ - gnc-currency-edit.h \ - gnc-date-delta.h \ - gnc-date-edit.h \ - gnc-date-format.h \ - gnc-dense-cal.h \ - gnc-dense-cal-model.h \ - gnc-dense-cal-store.h \ - gnc-embedded-window.h \ - gnc-file.h \ - gnc-frequency.h \ - gnc-recurrence.h \ - gnc-general-select.h \ - gnc-gnome-utils.h \ - gnc-gui-query.h \ - gnc-icons.h \ - gnc-keyring.h \ - gnc-main-window.h \ - gnc-menu-extensions.h \ - gnc-plugin-file-history.h \ - gnc-plugin-manager.h \ - gnc-plugin-menu-additions.h \ - gnc-plugin-page.h \ - gnc-plugin.h \ - gnc-period-select.h \ - gnc-query-view.h \ - gnc-splash.h \ - gnc-sx-instance-dense-cal-adapter.h \ - gnc-sx-list-tree-model-adapter.h \ - gnc-tree-control-split-reg.h \ - gnc-tree-model.h \ - gnc-tree-model-account-types.h \ - gnc-tree-model-account.h \ - gnc-tree-model-budget.h \ - gnc-tree-model-owner.h \ - gnc-tree-model-commodity.h \ - gnc-tree-model-price.h \ - gnc-tree-model-split-reg.h \ - gnc-tree-util-split-reg.h \ - gnc-tree-view-account.h \ - gnc-tree-view-commodity.h \ - gnc-tree-view-owner.h \ - gnc-tree-view-price.h \ - gnc-tree-view-split-reg.h \ - gnc-tree-view-sx-list.h \ - gnc-tree-view.h \ - gnc-ui.h \ - gnc-window.h \ - misc-gnome-utils.h \ - tree-view-utils.h \ - print-session.h \ - window-main-summarybar.h - -noinst_HEADERS = \ - dialog-tax-table.h \ - gnc-autosave.h \ - gnc-gobject-utils.h \ - gnc-gtk-utils.h \ - search-param.h - -libgncmod_gnome_utils_la_LDFLAGS = -avoid-version - -libgncmod_gnome_utils_la_LIBADD = \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/backend/xml/libgnc-backend-xml-utils.la \ - ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \ - $(top_builddir)/borrowed/libc/libc-missing.la \ - ${GTK_LIBS} \ - ${GNOME_KEYRING_LIBS} \ - ${LIBSECRET_LIBS} \ - ${GUILE_LIBS} \ - ${GLIB_LIBS} \ - ${DB_LIBS} \ - ${REGEX_LIBS} \ - ${LIBXML2_LIBS} \ - ${GTK_MAC_LIBS} - -BUILT_SOURCES = gnc-warnings.c gnc-warnings.h - -gnc-warnings.c: gschemas/org.gnucash.warnings.gschema.xml.in make-gnc-warnings-c.xsl - $(XSLTPROC) -o $@ $(srcdir)/make-gnc-warnings-c.xsl $< - -gnc-warnings.h: gschemas/org.gnucash.warnings.gschema.xml.in make-gnc-warnings-h.xsl - $(XSLTPROC) -o $@ $(srcdir)/make-gnc-warnings-h.xsl $< - -if BUILDING_FROM_VCS -swig-gnome-utils.c: gnome-utils.i \ - ${top_srcdir}/common/base-typemaps.i - $(SWIG) -guile -Linkage module \ - -I${top_srcdir}/common -o $@ $< -endif - -gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash -gncscmmod_DATA = gnome-utils.scm - -gncscmdir = ${GNC_SCM_INSTALL_DIR} -gncscm_DATA = gnc-menu-extensions.scm - -EXTRA_DIST = \ - gnome-utils.i \ - make-gnc-warnings-c.xsl \ - make-gnc-warnings-h.xsl \ - ${gncscmmod_DATA} \ - ${gncscm_DATA} \ - CMakeLists.txt - - -if GNUCASH_SEPARATE_BUILDDIR -#For executing test cases -SCM_FILE_LINKS = \ - ${gncscmmod_DATA} \ - ${gncscm_DATA} -endif - -.scm-links: - $(RM) -rf gnucash - mkdir -p gnucash -if GNUCASH_SEPARATE_BUILDDIR - for X in ${SCM_FILE_LINKS} ; do \ - $(LN_S) -f ${srcdir}/$$X . ; \ - done -endif - ( cd gnucash; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../$$A . ; done ) -if ! OS_WIN32 -# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567). - touch .scm-links -endif - -GUILE_COMPILE_ENV = \ - --guile-load-dir ${top_builddir}/libgnucash/core-utils \ - --guile-load-dir ${top_builddir}/libgnucash/gnc-module \ - --guile-load-dir ${top_builddir}/libgnucash/scm \ - --library-dir ${top_builddir}/libgnucash/engine \ - --library-dir ${top_builddir}/libgnucash/core-utils \ - --library-dir ${top_builddir}/libgnucash/gnc-module \ - --library-dir ${top_builddir}/libgnucash/app-utils \ - --library-dir ${top_builddir}/libgnucash/backend/xml \ - --library-dir ${top_builddir}/gnucash/gnome-utils - -%.go : %.scm .scm-links $(pkglib_LTLIBRARIES) - GNC_UNINSTALLED=yes \ - GNC_BUILDDIR=${top_builddir} \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \ - $(GUILD) compile -o $@ $< - -gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash -gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) - -gncscmcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@ -gncscmcache_DATA = $(gncscm_DATA:.scm=.go) - -noinst_DATA = .scm-links -clean-local: - rm -rf gnucash - -CLEANFILES = \ - $(BUILT_SOURCES) \ - .scm-links \ - ${SCM_FILE_LINKS} \ - ${gncscmcache_DATA} \ - ${gncscmmodcache_DATA} - -MAINTAINERCLEANFILES = swig-gnome-utils.c - -# We want to do this only for the Gnome help tool on Linux and MacPorts. -if !PLATFORM_WIN32 -if !PLATFORM_OSX_QUARTZ -# -# I hate inconsistent standards. Autotools puts help files into -# ${datadir}/gnome/help/${program} while the gnome2 libraries expect -# them in ${pkgdatadir}/gnome/help/${program}. -# -install-data-hook: - $(LN_S) -f ../gnome ${DESTDIR}${pkgdatadir} - -uninstall-hook: - rm -f ${DESTDIR}${pkgdatadir}/gnome -endif -endif - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.gui\" diff --git a/gnucash/gnome-utils/gschemas/CMakeLists.txt b/gnucash/gnome-utils/gschemas/CMakeLists.txt index 3275cd3087..52015f99aa 100644 --- a/gnucash/gnome-utils/gschemas/CMakeLists.txt +++ b/gnucash/gnome-utils/gschemas/CMakeLists.txt @@ -3,5 +3,5 @@ SET(gnome_utils_GSCHEMA org.gnucash.history.gschema.xml org.gnucash.warnings.gsc add_gschema_targets("${gnome_utils_GSCHEMA}") -SET_DIST_LIST(gnome_utils_gschema_DIST CMakeLists.txt Makefile.am org.gnucash.history.gschema.xml.in.in +SET_DIST_LIST(gnome_utils_gschema_DIST CMakeLists.txt org.gnucash.history.gschema.xml.in.in org.gnucash.warnings.gschema.xml.in.in) diff --git a/gnucash/gnome-utils/gschemas/Makefile.am b/gnucash/gnome-utils/gschemas/Makefile.am deleted file mode 100644 index 58bb8728c4..0000000000 --- a/gnucash/gnome-utils/gschemas/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -@INTLTOOL_XML_NOMERGE_RULE@ - -gschema_in_files = \ - org.gnucash.history.gschema.xml.in \ - org.gnucash.warnings.gschema.xml.in - -gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml) - -@GSETTINGS_RULES@ - -CLEANFILES = $(gsettings_SCHEMAS) - -EXTRA_DIST = CMakeLists.txt diff --git a/gnucash/gnome-utils/gtkbuilder/CMakeLists.txt b/gnucash/gnome-utils/gtkbuilder/CMakeLists.txt index 524fdcdf64..5940e4dfd9 100644 --- a/gnucash/gnome-utils/gtkbuilder/CMakeLists.txt +++ b/gnucash/gnome-utils/gtkbuilder/CMakeLists.txt @@ -29,4 +29,4 @@ SET(gnome_utils_GLADE gnc-tree-view-owner.glade ) -SET_DIST_LIST(gnome_utils_gtkbuilder_DIST CMakeLists.txt Makefile.am ${gnome_utils_GLADE}) \ No newline at end of file +SET_DIST_LIST(gnome_utils_gtkbuilder_DIST CMakeLists.txt ${gnome_utils_GLADE}) \ No newline at end of file diff --git a/gnucash/gnome-utils/gtkbuilder/Makefile.am b/gnucash/gnome-utils/gtkbuilder/Makefile.am deleted file mode 100644 index ee97918de8..0000000000 --- a/gnucash/gnome-utils/gtkbuilder/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -gtkbuilderdir = $(GNC_GTKBUILDER_DIR) -gtkbuilder_DATA = \ - assistant-xml-encoding.glade \ - dialog-account.glade \ - dialog-book-close.glade \ - dialog-commodity.glade \ - dialog-file-access.glade \ - dialog-object-references.glade \ - dialog-options.glade \ - dialog-preferences.glade \ - dialog-query-view.glade \ - dialog-reset-warnings.glade \ - dialog-tax-table.glade \ - dialog-totd.glade \ - dialog-transfer.glade \ - dialog-userpass.glade \ - gnc-date-format.glade \ - gnc-frequency.glade \ - gnc-recurrence.glade \ - gnc-tree-view-owner.glade - -EXTRA_DIST = $(gtkbuilder_DATA) CMakeLists.txt diff --git a/gnucash/gnome-utils/test/CMakeLists.txt b/gnucash/gnome-utils/test/CMakeLists.txt index f2b85bd8da..d5fab8c94e 100644 --- a/gnucash/gnome-utils/test/CMakeLists.txt +++ b/gnucash/gnome-utils/test/CMakeLists.txt @@ -45,4 +45,4 @@ GNC_ADD_SCHEME_TARGETS(scm-test-load-gnome-utils-module GNC_ADD_SCHEME_TESTS(test-load-gnome-utils-module.scm) -SET_DIST_LIST(test_gnome_utils_DIST CMakeLists.txt Makefile.am test-gnc-recurrence.c test-link-module.c test-load-gnome-utils-module.scm) +SET_DIST_LIST(test_gnome_utils_DIST CMakeLists.txt test-gnc-recurrence.c test-link-module.c test-load-gnome-utils-module.scm) diff --git a/gnucash/gnome-utils/test/Makefile.am b/gnucash/gnome-utils/test/Makefile.am deleted file mode 100644 index 1d88c2e2f6..0000000000 --- a/gnucash/gnome-utils/test/Makefile.am +++ /dev/null @@ -1,84 +0,0 @@ -TESTS = \ - test-link-module ${SCM_TESTS} - -# The following tests are nice, but have absolutely no place in an -# automated testing system. -# -TESTS_GUI = test-gnc-recurrence - -##lib_LTLIBRARIES = libgncgnome.la - -GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/libgnucash/engine \ - --gnc-module-dir ${top_builddir}/libgnucash/app-utils \ - --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \ - --guile-load-dir ${top_builddir}/libgnucash/gnc-module \ - --guile-load-dir ${top_builddir}/libgnucash/scm \ - --guile-load-dir ${top_builddir}/libgnucash/engine \ - --guile-load-dir ${top_builddir}/libgnucash/core-utils \ - --guile-load-dir ${top_builddir}/libgnucash/app-utils \ - --guile-load-dir ${top_builddir}/gnucash/gnome-utils \ - --library-dir ${top_builddir}/gnucash/gnome-utils \ - --library-dir ${top_builddir}/libgnucash/core-utils \ - --library-dir ${top_builddir}/libgnucash/gnc-module \ - --library-dir ${top_builddir}/libgnucash/engine \ - --library-dir ${top_builddir}/libgnucash/backend/xml \ - --library-dir ${top_builddir}/libgnucash/backend/sql \ - --library-dir ${top_builddir}/libgnucash/app-utils - - -TESTS_ENVIRONMENT = \ - GUILE_WARN_DEPRECATED=no \ - GUILE="${GUILE}" \ - SRCDIR=${srcdir} \ - GNC_BUILDDIR="${abs_top_builddir}" \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS}) - -check_PROGRAMS = \ - test-link-module test-gnc-recurrence - -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/engine/test-core \ - -I${top_srcdir}/gnucash/gnome-utils \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/libgnucash/app-utils \ - -I${top_srcdir}/common/test-core \ - ${GLIB_CFLAGS} \ - ${GTK_CFLAGS} \ - ${GUILE_CFLAGS} - -LDADD = \ - ${GNOME_LIBS} \ - ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \ - ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/engine/test-core/libgncmod-test-engine.la \ - ${top_builddir}/common/test-core/libtest-core.la - -test_gnc_recurrence_SOURCES=test-gnc-recurrence.c -test_gnc_recurrence_LDADD = \ - ${GTK_LIBS} \ - ${LDADD} - -test_link_module_SOURCES=test-link-module.c -test_link_module_LDADD = \ - ${GUILE_LIBS} \ - ${GLIB_LIBS} \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la - -SCM_TESTS = test-load-gnome-utils-module -SCM_TEST_SRCS = $(SCM_TESTS:%=%.scm) - -$(SCM_TESTS): %: $(srcdir)/%.scm Makefile - echo 'export GNC_BUILDDIR="${abs_top_builddir}";' > $@ - echo 'export GNC_UNINSTALLED=yes;' >> $@ - echo '${GUILE} --debug -l $(srcdir)/$*.scm -c "(exit (run-test))"' >> $@ - chmod a+x $@ - -EXTRA_DIST = \ - ${SCM_TEST_SRCS} \ - CMakeLists.txt - -testit: - libtool --mode execute gdb test-link-module diff --git a/gnucash/gnome-utils/ui/CMakeLists.txt b/gnucash/gnome-utils/ui/CMakeLists.txt index cdf16ef4e6..ce5dc73c6a 100644 --- a/gnucash/gnome-utils/ui/CMakeLists.txt +++ b/gnucash/gnome-utils/ui/CMakeLists.txt @@ -13,7 +13,7 @@ SET(gnome_utils_ui_DIST_local gnc-main-window-ui.xml gnc-windows-menu-ui-quartz.xml gnc-windows-menu-ui.xml - Makefile.am + osx_accel_map ) diff --git a/gnucash/gnome-utils/ui/Makefile.am b/gnucash/gnome-utils/ui/Makefile.am deleted file mode 100644 index 3f82751ffd..0000000000 --- a/gnucash/gnome-utils/ui/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -uidir = $(GNC_UI_DIR) -ui_DATA = \ - gnc-main-window-ui.xml \ - gnc-windows-menu-ui.xml \ - gnc-windows-menu-ui-quartz.xml \ - osx_accel_map - -EXTRA_DIST = $(ui_DATA) CMakeLists.txt diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt index 11fc7ec428..a68470ea12 100644 --- a/gnucash/gnome/CMakeLists.txt +++ b/gnucash/gnome/CMakeLists.txt @@ -201,6 +201,6 @@ ADD_CUSTOM_TARGET(gnucash-desktop ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucas INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/gnucash.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) SET_LOCAL_DIST(gnome_DIST_local - CMakeLists.txt Makefile.am gnome.i gnucash.appdata.xml.in gnucash.desktop.in.in + CMakeLists.txt gnome.i gnucash.appdata.xml.in gnucash.desktop.in.in ${gnc_gnome_noinst_HEADERS} ${gnc_gnome_SOURCES}) SET(gnome_DIST ${gnome_DIST_local} ${gnome_ui_DIST} ${gnome_gschema_DIST} ${gnome_gtkbuilder_DIST} PARENT_SCOPE) diff --git a/gnucash/gnome/Makefile.am b/gnucash/gnome/Makefile.am deleted file mode 100644 index b57eb2a909..0000000000 --- a/gnucash/gnome/Makefile.am +++ /dev/null @@ -1,195 +0,0 @@ -SUBDIRS = gtkbuilder gschemas ui - -lib_LTLIBRARIES = libgnc-gnome.la - -libgnc_gnome_la_LIBADD = \ - ${top_builddir}/gnucash/register/ledger-core/libgncmod-ledger-core.la \ - ${top_builddir}/gnucash/register/register-gnome/libgncmod-register-gnome.la \ - ${top_builddir}/gnucash/register/register-core/libgncmod-register-core.la \ - ${top_builddir}/gnucash/report/report-gnome/libgncmod-report-gnome.la \ - ${top_builddir}/gnucash/report/report-system/libgncmod-report-system.la \ - ${top_builddir}/gnucash/gnome-search/libgncmod-gnome-search.la \ - ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \ - ${top_builddir}/libgnucash/backend/xml/libgnc-backend-xml-utils.la \ - ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \ - ${top_builddir}/gnucash/html/libgncmod-html.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${LIBXML2_LIBS} \ - ${GUILE_LIBS} \ - ${GTK_LIBS} \ - ${GLIB_LIBS} - -libgnc_gnome_la_SOURCES = \ - swig-gnome.c \ - assistant-acct-period.c \ - assistant-hierarchy.c \ - assistant-loan.c \ - assistant-stock-split.c \ - business-options-gnome.c \ - business-urls.c \ - business-gnome-utils.c \ - dialog-billterms.c \ - dialog-choose-owner.c \ - dialog-commodities.c \ - dialog-customer.c \ - dialog-date-close.c \ - dialog-employee.c \ - dialog-fincalc.c \ - dialog-find-account.c \ - dialog-find-transactions.c \ - dialog-find-transactions2.c \ - dialog-imap-editor.c \ - dialog-invoice.c \ - dialog-job.c \ - dialog-lot-viewer.c \ - dialog-new-user.c \ - dialog-order.c \ - dialog-payment.c \ - dialog-price-editor.c \ - dialog-price-edit-db.c \ - dialog-print-check.c \ - dialog-progress.c \ - dialog-sx-editor.c \ - dialog-sx-editor2.c \ - dialog-sx-from-trans.c \ - dialog-sx-since-last-run.c \ - dialog-tax-info.c \ - dialog-trans-assoc.c \ - dialog-vendor.c \ - gnc-budget-view.c \ - gnc-plugin-account-tree.c \ - gnc-plugin-basic-commands.c \ - gnc-plugin-budget.c \ - gnc-plugin-business.c \ - gnc-plugin-page-account-tree.c \ - gnc-plugin-page-budget.c \ - gnc-plugin-page-invoice.c \ - gnc-plugin-page-owner-tree.c \ - gnc-plugin-page-sx-list.c \ - gnc-plugin-page-register.c \ - gnc-plugin-page-register2.c \ - gnc-plugin-register.c \ - gnc-plugin-register2.c \ - gnc-split-reg.c \ - gnc-split-reg2.c \ - reconcile-view.c \ - search-owner.c \ - top-level.c \ - window-reconcile.c \ - window-reconcile2.c \ - window-autoclear.c - -gnomeappdir = ${datadir}/applications - -gnomeapp_in_files = gnucash.desktop.in -gnomeapp_DATA = $(gnomeapp_in_files:.desktop.in=.desktop) -@INTLTOOL_DESKTOP_RULE@ - -appicondir = $(datadir)/pixmaps - -appdatadir = $(datadir)/appdata -appdata_in_files = gnucash.appdata.xml.in -appdata_DATA = $(appdata_in_files:.xml.in=.xml) -@INTLTOOL_XML_RULE@ - -noinst_HEADERS = \ - assistant-acct-period.h \ - assistant-hierarchy.h \ - assistant-loan.h \ - assistant-stock-split.h \ - business-options-gnome.h \ - business-urls.h \ - business-gnome-utils.h \ - dialog-billterms.h \ - dialog-choose-owner.h \ - dialog-customer.h \ - dialog-date-close.h \ - dialog-employee.h \ - dialog-fincalc.h \ - dialog-find-account.h \ - dialog-find-transactions.h \ - dialog-find-transactions2.h \ - dialog-imap-editor.h \ - dialog-invoice.h \ - dialog-job.h \ - dialog-lot-viewer.h \ - dialog-new-user.h \ - dialog-order.h \ - dialog-payment.h \ - dialog-print-check.h \ - dialog-progress.h \ - dialog-sx-editor.h \ - dialog-sx-editor2.h \ - dialog-sx-from-trans.h \ - dialog-sx-since-last-run.h \ - dialog-trans-assoc.h \ - dialog-vendor.h \ - gnc-budget-view.h \ - gnc-plugin-account-tree.h \ - gnc-plugin-basic-commands.h \ - gnc-plugin-budget.h \ - gnc-plugin-business.h \ - gnc-plugin-page-account-tree.h \ - gnc-plugin-page-budget.h \ - gnc-plugin-page-invoice.h \ - gnc-plugin-page-owner-tree.h \ - gnc-plugin-page-sx-list.h \ - gnc-plugin-page-register.h \ - gnc-plugin-page-register2.h \ - gnc-plugin-register.h \ - gnc-plugin-register2.h \ - gnc-split-reg.h \ - gnc-split-reg2.h \ - reconcile-view.h \ - search-owner.h \ - top-level.h \ - window-reconcile.h \ - window-reconcile2.h \ - window-autoclear.h - -if BUILDING_FROM_VCS -swig-gnome.c: gnome.i dialog-progress.h ${top_srcdir}/common/base-typemaps.i - $(SWIG) -guile -Linkage module \ - -I${top_srcdir}/common -o $@ $< -endif - -EXTRA_DIST = \ - gnome.i \ - $(gnomeapp_in_files) \ - $(appdata_in_files) \ - CMakeLists.txt - -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_builddir}/common \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/app-utils \ - -I${top_srcdir}/libgnucash/app-utils/calculation \ - -I${top_srcdir}/libgnucash/backend/xml \ - -I${top_srcdir}/gnucash/gnome-utils \ - -I${top_builddir}/gnucash/gnome-utils \ - -I${top_srcdir}/gnucash/gnome-search \ - -I${top_srcdir}/gnucash/html \ - -I${top_srcdir}/gnucash/register/ledger-core \ - -I${top_srcdir}/gnucash/register/register-core \ - -I${top_srcdir}/gnucash/register/register-gnome \ - -I${top_srcdir}/gnucash/report/report-system \ - -I${top_srcdir}/gnucash/report/report-gnome \ - -I${top_srcdir}/borrowed/libc \ - ${LIBXML2_CFLAGS} \ - ${GUILE_CFLAGS} \ - ${GTK_CFLAGS} \ - $(GLIB_CFLAGS) \ - ${GTK_MAC_CFLAGS} - -# We build this in an earlier directory. - -# The line below breaks automake 1.5. -##OMIT_DEPENDENCIES = gnc-dir.h - -CLEANFILES = gnucash.desktop gnucash.appdata.xml -MAINTAINERCLEANFILES = swig-gnome.c - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.gui\" diff --git a/gnucash/gnome/gschemas/CMakeLists.txt b/gnucash/gnome/gschemas/CMakeLists.txt index 1337e8b0a4..3bf24489f7 100644 --- a/gnucash/gnome/gschemas/CMakeLists.txt +++ b/gnucash/gnome/gschemas/CMakeLists.txt @@ -18,4 +18,4 @@ SET(gnome_gschema_DIST_local "") FOREACH(file ${gnome_GSCHEMA}) LIST(APPEND gnome_gschema_DIST_local ${file}.in.in) ENDFOREACH() -SET_DIST_LIST(gnome_gschema_DIST CMakeLists.txt Makefile.am ${gnome_gschema_DIST_local}) +SET_DIST_LIST(gnome_gschema_DIST CMakeLists.txt ${gnome_gschema_DIST_local}) diff --git a/gnucash/gnome/gschemas/Makefile.am b/gnucash/gnome/gschemas/Makefile.am deleted file mode 100644 index d725399a55..0000000000 --- a/gnucash/gnome/gschemas/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -@INTLTOOL_XML_NOMERGE_RULE@ - -gschema_in_files = \ - org.gnucash.dialogs.gschema.xml.in \ - org.gnucash.dialogs.business.gschema.xml.in \ - org.gnucash.dialogs.commodities.gschema.xml.in \ - org.gnucash.dialogs.checkprinting.gschema.xml.in \ - org.gnucash.dialogs.reconcile.gschema.xml.in \ - org.gnucash.dialogs.sxs.gschema.xml.in \ - org.gnucash.dialogs.totd.gschema.xml.in \ - org.gnucash.gschema.xml.in \ - org.gnucash.window.pages.account.tree.gschema.xml.in \ - org.gnucash.window.pages.gschema.xml.in - -gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml) - -@GSETTINGS_RULES@ - -CLEANFILES = $(gsettings_SCHEMAS) - -EXTRA_DIST = CMakeLists.txt diff --git a/gnucash/gnome/gtkbuilder/CMakeLists.txt b/gnucash/gnome/gtkbuilder/CMakeLists.txt index 44ce3fd9ac..bd05f1b1e9 100644 --- a/gnucash/gnome/gtkbuilder/CMakeLists.txt +++ b/gnucash/gnome/gtkbuilder/CMakeLists.txt @@ -44,4 +44,4 @@ SET(gnome_GLADE window-reconcile.glade ) -SET_DIST_LIST(gnome_gtkbuilder_DIST CMakeLists.txt Makefile.am ${gnome_GLADE}) +SET_DIST_LIST(gnome_gtkbuilder_DIST CMakeLists.txt ${gnome_GLADE}) diff --git a/gnucash/gnome/gtkbuilder/Makefile.am b/gnucash/gnome/gtkbuilder/Makefile.am deleted file mode 100644 index 5fbc5a3761..0000000000 --- a/gnucash/gnome/gtkbuilder/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -gtkbuilderdir = $(GNC_GTKBUILDER_DIR) -gtkbuilder_DATA = \ - assistant-acct-period.glade \ - assistant-hierarchy.glade \ - assistant-loan.glade \ - assistant-stock-split.glade \ - business-options-gnome.glade \ - business-prefs.glade \ - dialog-billterms.glade \ - dialog-choose-owner.glade \ - dialog-commodities.glade \ - dialog-customer.glade \ - dialog-date-close.glade \ - dialog-employee.glade \ - dialog-fincalc.glade \ - dialog-find-account.glade \ - dialog-imap-editor.glade \ - dialog-invoice.glade \ - dialog-job.glade \ - dialog-lot-viewer.glade \ - dialog-new-user.glade \ - dialog-order.glade \ - dialog-payment.glade \ - dialog-price.glade \ - dialog-print-check.glade \ - dialog-progress.glade \ - dialog-sx.glade \ - dialog-tax-info.glade \ - dialog-trans-assoc.glade \ - dialog-vendor.glade \ - gnc-plugin-page-budget.glade \ - gnc-plugin-page-register.glade \ - gnc-plugin-page-register2.glade \ - window-autoclear.glade \ - window-reconcile.glade - -EXTRA_DIST = $(gtkbuilder_DATA) CMakeLists.txt diff --git a/gnucash/gnome/ui/CMakeLists.txt b/gnucash/gnome/ui/CMakeLists.txt index e689376787..f57f91e426 100644 --- a/gnucash/gnome/ui/CMakeLists.txt +++ b/gnucash/gnome/ui/CMakeLists.txt @@ -32,6 +32,6 @@ SET(gnome_UI gnc-sxed-window-ui-full.xml gnc-sxed-window-ui.xml) -SET_DIST_LIST(gnome_ui_DIST CMakeLists.txt Makefile.am ${gnome_UI}) +SET_DIST_LIST(gnome_ui_DIST CMakeLists.txt ${gnome_UI}) diff --git a/gnucash/gnome/ui/Makefile.am b/gnucash/gnome/ui/Makefile.am deleted file mode 100644 index eef68bd008..0000000000 --- a/gnucash/gnome/ui/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -uidir = $(GNC_UI_DIR) -ui_DATA = \ - gnc-plugin-budget-ui.xml \ - gnc-plugin-business-ui.xml \ - gnc-plugin-page-budget-ui.xml \ - gnc-plugin-account-tree-ui.xml \ - gnc-plugin-basic-commands-ui.xml \ - gnc-plugin-page-account-tree-ui.xml \ - gnc-plugin-page-account-tree2-ui.xml \ - gnc-plugin-file-history-ui.xml \ - gnc-plugin-register-ui.xml \ - gnc-plugin-register2-ui.xml \ - gnc-plugin-register22-ui.xml \ - gnc-plugin-page-invoice-ui.xml \ - gnc-plugin-page-owner-tree-ui.xml \ - gnc-plugin-page-register-ui.xml \ - gnc-plugin-page-register2-ui.xml \ - gnc-plugin-page-sx-list-ui.xml \ - gnc-plugin-page-sx-list2-ui.xml \ - gnc-plugin-page-sxregister-ui.xml \ - gnc-sxed-to-create-window-ui.xml \ - gnc-reconcile-window-ui.xml \ - gnc-sxed-window-ui.xml \ - gnc-sxed-window-ui-full.xml - -EXTRA_DIST = $(ui_DATA) CMakeLists.txt diff --git a/gnucash/html/CMakeLists.txt b/gnucash/html/CMakeLists.txt index 3e6b385640..eeb349139e 100644 --- a/gnucash/html/CMakeLists.txt +++ b/gnucash/html/CMakeLists.txt @@ -33,7 +33,7 @@ ELSE () SET(html_EXTRA_DIST gnc-html-webkit1.h gnc-html-webkit1.c) ENDIF () -SET_DIST_LIST(html_DIST CMakeLists.txt Makefile.am ${html_HEADERS} ${html_SOURCES} gnc-html.i ${html_EXTRA_DIST}) +SET_DIST_LIST(html_DIST CMakeLists.txt ${html_HEADERS} ${html_SOURCES} gnc-html.i ${html_EXTRA_DIST}) ADD_LIBRARY (gncmod-html ${html_SOURCES} diff --git a/gnucash/html/Makefile.am b/gnucash/html/Makefile.am deleted file mode 100644 index 3fa8f68cf9..0000000000 --- a/gnucash/html/Makefile.am +++ /dev/null @@ -1,88 +0,0 @@ -#SUBDIRS = . test -SUBDIRS = . - -pkglib_LTLIBRARIES = libgncmod-html.la - -AM_CPPFLAGS = \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/gnucash/gnome-utils \ - -I${top_srcdir}/libgnucash/app-utils \ - -I${top_srcdir}/common \ - -I${top_builddir}/common \ - -I${top_srcdir}/borrowed/libc \ - ${GLIB_CFLAGS} \ - ${GUILE_CFLAGS} \ - ${GTK_CFLAGS} \ - ${GNOME_CFLAGS} \ - ${WEBKIT_CFLAGS} - -libgncmod_html_la_SOURCES = \ - gncmod-html.c \ - gnc-html.c \ - gnc-html-history.c \ - gnc-html-factory.c \ - gnc-html-webkit2.c \ - swig-gnc-html.c - -gncincludedir = ${GNC_INCLUDE_DIR} -gncinclude_HEADERS = \ - gnc-html-history.h \ - gnc-html.h \ - gnc-html-p.h \ - gnc-html-factory.h \ - gnc-html-webkit2.h \ - gnc-html-extras.h \ - gnc-html-webkit-p.h - -libgncmod_html_la_LDFLAGS = -avoid-version - -libgncmod_html_la_LIBADD = \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \ - ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \ - $(top_builddir)/borrowed/libc/libc-missing.la \ - ${WEBKIT_LIBS} \ - ${GTK_LIBS} \ - ${GLIB_LIBS} \ - ${DB_LIBS} \ - ${GUILE_LIBS} \ - ${REGEX_LIBS} - -if BUILDING_FROM_VCS -swig-gnc-html.c: gnc-html.i gnc-html.h \ - ${top_srcdir}/common/base-typemaps.i - $(SWIG) -guile -Linkage module \ - -I${top_srcdir}/common -o $@ $< -endif - -EXTRA_DIST = \ - gnc-html.i \ - CMakeLists.txt \ - gnc-html-webkit.h \ - gnc-html-webkit1.h \ - gnc-html-webkit1.c - -CLEANFILES = $(BUILT_SOURCES) gnucash -MAINTAINERCLEANFILES = swig-gnc-html.c - -# We do this only for the gnome help tool on Linux and MacPorts. -if !PLATFORM_WIN32 -if !PLATFORM_OSX_QUARTZ -# -# I hate inconsistent standards. Autotools puts help files into -# ${datadir}/gnome/help/${program} while the gnome2 libraries expect -# them in ${pkgdatadir}/gnome/help/${program}. -# -install-data-hook: - $(LN_S) -f ../gnome ${DESTDIR}${pkgdatadir} - -uninstall-hook: - rm -f ${DESTDIR}${pkgdatadir}/gnome -endif -endif - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.html\" diff --git a/gnucash/import-export/CMakeLists.txt b/gnucash/import-export/CMakeLists.txt index 8df23a81a9..e78a78087b 100644 --- a/gnucash/import-export/CMakeLists.txt +++ b/gnucash/import-export/CMakeLists.txt @@ -81,7 +81,7 @@ FILE(COPY ${generic_import_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilde SET(generic_import_EXTRA_DIST generic-import-design.txt) -SET_LOCAL_DIST(import_export_DIST_local CMakeLists.txt Makefile.am ${generic_import_SOURCES} +SET_LOCAL_DIST(import_export_DIST_local CMakeLists.txt ${generic_import_SOURCES} ${generic_import_HEADERS} ${generic_import_GLADE} ${generic_import_noinst_HEADERS} ${generic_import_EXTRA_DIST}) diff --git a/gnucash/import-export/Makefile.am b/gnucash/import-export/Makefile.am deleted file mode 100644 index d0bb4bff96..0000000000 --- a/gnucash/import-export/Makefile.am +++ /dev/null @@ -1,79 +0,0 @@ -if WITH_OFX - OFX_DIR=ofx -endif -if WITH_AQBANKING - AQBANKING_DIR=aqb -endif -SUBDIRS = . \ - gschemas \ - ${AQBANKING_DIR} \ - bi-import \ - csv-exp \ - csv-imp \ - customer-import \ - log-replay \ - ${OFX_DIR} \ - qif \ - qif-imp \ - test - -pkglib_LTLIBRARIES=libgncmod-generic-import.la - -libgncmod_generic_import_la_SOURCES = \ - import-account-matcher.c \ - import-commodity-matcher.c \ - import-backend.c \ - import-format-dialog.c \ - import-match-picker.c \ - import-parse.c \ - import-utilities.c \ - import-settings.c \ - import-main-matcher.c \ - import-pending-matches.c \ - gncmod-generic-import.c - -gncincludedir = ${GNC_INCLUDE_DIR} -gncinclude_HEADERS = \ - import-parse.h - -noinst_HEADERS = \ - import-account-matcher.h \ - import-backend.h \ - import-commodity-matcher.h \ - import-main-matcher.h \ - import-match-picker.h \ - import-settings.h \ - import-pending-matches.h \ - import-utilities.h - -libgncmod_generic_import_la_LDFLAGS = -avoid-version - -libgncmod_generic_import_la_LIBADD = \ - ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \ - ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${REGEX_LIBS} \ - ${GLIB_LIBS} - -gtkbuilderdir = ${GNC_GTKBUILDER_DIR} -gtkbuilder_DATA = dialog-import.glade - -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/libgnucash/app-utils \ - -I${top_srcdir}/gnucash/gnome \ - -I${top_srcdir}/gnucash/gnome-utils \ - ${GTK_CFLAGS} \ - ${GLIB_CFLAGS} - -EXTRA_DIST = \ - $(gtkbuilder_DATA) \ - generic-import-design.txt \ - CMakeLists.txt - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.i-e\" diff --git a/gnucash/import-export/aqb/CMakeLists.txt b/gnucash/import-export/aqb/CMakeLists.txt index 24df24cfb1..9e3d136510 100644 --- a/gnucash/import-export/aqb/CMakeLists.txt +++ b/gnucash/import-export/aqb/CMakeLists.txt @@ -91,7 +91,7 @@ ENDIF() DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder) ENDIF(WITH_AQBANKING) -SET_LOCAL_DIST(aqbanking_DIST_local CMakeLists.txt Makefile.am migratable-prefs-aqbanking.xml +SET_LOCAL_DIST(aqbanking_DIST_local CMakeLists.txt migratable-prefs-aqbanking.xml ${aqbanking_SOURCES} ${aqbanking_noinst_HEADERS} ${aqbanking_EXTRA_DIST} ${aqbanking_GLADE} ${aqbanking_UI}) diff --git a/gnucash/import-export/aqb/Makefile.am b/gnucash/import-export/aqb/Makefile.am deleted file mode 100644 index 9463a0a6fc..0000000000 --- a/gnucash/import-export/aqb/Makefile.am +++ /dev/null @@ -1,82 +0,0 @@ -SUBDIRS = . gschemas test - -pkglib_LTLIBRARIES = libgncmod-aqbanking.la - -libgncmod_aqbanking_la_SOURCES = \ - dialog-ab-trans.c \ - dialog-ab-daterange.c \ - assistant-ab-initial.c \ - gnc-ab-getbalance.c \ - gnc-ab-gettrans.c \ - gnc-ab-kvp.c \ - gnc-ab-transfer.c \ - gnc-ab-utils.c \ - gnc-file-aqb-import.c \ - gnc-gwen-gui.c \ - gnc-plugin-aqbanking.c \ - gncmod-aqbanking.c - -noinst_HEADERS = \ - dialog-ab-trans.h \ - dialog-ab-daterange.h \ - assistant-ab-initial.h \ - gnc-ab-getbalance.h \ - gnc-ab-gettrans.h \ - gnc-ab-kvp.h \ - gnc-ab-transfer.h \ - gnc-ab-utils.h \ - gnc-file-aqb-import.h \ - gnc-gwen-gui.h \ - gnc-plugin-aqbanking.h - -libgncmod_aqbanking_la_LDFLAGS = -avoid-version -if OS_WIN32 -libgncmod_aqbanking_la_LDFLAGS += -export-symbols-regex .* -endif -libgncmod_aqbanking_la_LIBADD = \ - ${top_builddir}/gnucash/import-export/libgncmod-generic-import.la \ - ${top_builddir}/gnucash/gnome/libgnc-gnome.la \ - ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \ - ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${top_builddir}/borrowed/gwengui-gtk3/libgwengui-gtk3.la \ - ${GTK_LIBS} \ - ${GLIB_LIBS} \ - ${AQBANKING_LIBS} - -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_srcdir}/borrowed/gwengui-gtk3 \ - -I${top_srcdir}/gnucash/import-export \ - -I${top_srcdir}/gnucash/gnome \ - -I${top_srcdir}/gnucash/register/ledger-core \ - -I${top_srcdir}/gnucash/register/register-gnome \ - -I${top_srcdir}/gnucash/register/register-core \ - -I${top_srcdir}/gnucash/gnome-utils \ - -I${top_srcdir}/libgnucash/app-utils \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/gnc-module \ - ${GTK_CFLAGS} \ - ${GLIB_CFLAGS} \ - ${AQBANKING_CFLAGS} - -uidir = $(GNC_UI_DIR) -ui_DATA = \ - gnc-plugin-aqbanking-ui.xml - -gtkbuilderdir = $(GNC_GTKBUILDER_DIR) -gtkbuilder_DATA = \ - assistant-ab-initial.glade \ - dialog-ab.glade \ - dialog-ab-pref.glade - -EXTRA_DIST = \ - ${ui_DATA} \ - ${gtkbuilder_DATA} \ - migratable-prefs-aqbanking.xml \ - CMakeLists.txt - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.aqbanking\" diff --git a/gnucash/import-export/aqb/gschemas/CMakeLists.txt b/gnucash/import-export/aqb/gschemas/CMakeLists.txt index a16fdad0d1..e97fa4f11b 100644 --- a/gnucash/import-export/aqb/gschemas/CMakeLists.txt +++ b/gnucash/import-export/aqb/gschemas/CMakeLists.txt @@ -5,4 +5,4 @@ IF (WITH_AQBANKING) add_gschema_targets("${aqb_GSCHEMA}") ENDIF(WITH_AQBANKING) -SET_DIST_LIST(aqbanking_gschema_DIST CMakeLists.txt Makefile.am org.gnucash.dialogs.import.hbci.gschema.xml.in.in) +SET_DIST_LIST(aqbanking_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.hbci.gschema.xml.in.in) diff --git a/gnucash/import-export/aqb/gschemas/Makefile.am b/gnucash/import-export/aqb/gschemas/Makefile.am deleted file mode 100644 index 58eaea9d17..0000000000 --- a/gnucash/import-export/aqb/gschemas/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -@INTLTOOL_XML_NOMERGE_RULE@ - -gschema_in_files = \ - org.gnucash.dialogs.import.hbci.gschema.xml.in - -gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml) - -@GSETTINGS_RULES@ - -CLEANFILES = $(gsettings_SCHEMAS) - -EXTRA_DIST = CMakeLists.txt diff --git a/gnucash/import-export/aqb/test/CMakeLists.txt b/gnucash/import-export/aqb/test/CMakeLists.txt index f665052fa3..26a97f7b5c 100644 --- a/gnucash/import-export/aqb/test/CMakeLists.txt +++ b/gnucash/import-export/aqb/test/CMakeLists.txt @@ -27,7 +27,7 @@ set(test_aqb_LIBS ) SET_DIST_LIST(test_aqb_DIST ${test_aqb_SOURCES} file-book.gnucash - file-book-hbcislot.gnucash CMakeLists.txt Makefile.am) + file-book-hbcislot.gnucash CMakeLists.txt ) IF(WITH_AQBANKING) GNC_ADD_TEST(test-aqb "${test_aqb_SOURCES}" diff --git a/gnucash/import-export/aqb/test/Makefile.am b/gnucash/import-export/aqb/test/Makefile.am deleted file mode 100644 index 830d794153..0000000000 --- a/gnucash/import-export/aqb/test/Makefile.am +++ /dev/null @@ -1,73 +0,0 @@ -# A template Makefile.am for GLib g_test-based test directories. -# Copyright 2011 John Ralls - -include $(top_srcdir)/test-templates/Makefile.decl - - -#You will only need one of these: It points to the module directory -#after $(top_srcdir) or ${top_builddir}: -MODULEPATH = gnucash/import-export/aqb - -#The test program. You'll need to add to this if you have more than one module above. - -check_PROGRAMS = test-aqb - -TESTS = ${check_PROGRAMS} - -test_aqbdir = ${top_srcdir}/${MODULEPATH}/test - -#Program files for tests go here. It's probably best to have one for -#each file in the parent directory. Include -#test_foo_support.c if you have one and aren't building the -#support library. -test_aqb_SOURCES = \ - test-aqb.c \ - test-kvp.c - -test_aqb_HEADERSS = - -#The tests might require more libraries, but try to keep them -#as independent as possible. -test_aqb_LDADD = \ - ${top_builddir}/${MODULEPATH}/libgncmod-aqbanking.la \ - ${top_builddir}/gnucash/import-export/libgncmod-generic-import.la \ - ${top_builddir}/gnucash/gnome/libgnc-gnome.la \ - ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \ - ${top_builddir}/gnucash/register/ledger-core/libgncmod-ledger-core.la \ - ${top_builddir}/gnucash/report/report-gnome/libgncmod-report-gnome.la \ - ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \ - ${top_builddir}/libgnucash/backend/xml/libgnc-backend-xml-utils.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${GLIB_LIBS} - -test_aqb_CFLAGS = \ - -DTESTPROG=test_aqb \ - ${DEFAULT_INCLUDES} \ - -I$(top_srcdir)/${MODULEPATH}/ \ - -I${top_srcdir}/common \ - -I${top_srcdir}/gnucash/import-export \ - -I${top_srcdir}/gnucash/gnome \ - -I${top_srcdir}/gnucash/register/ledger-core \ - -I${top_srcdir}/gnucash/register/register-gnome \ - -I${top_srcdir}/gnucash/register/register-core \ - -I${top_srcdir}/gnucash/gnome-utils \ - -I${top_srcdir}/libgnucash/app-utils \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/backend/xml \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/gnc-module \ - ${GTK_CFLAGS} \ - ${GLIB_CFLAGS} \ - ${AQBANKING_CFLAGS} - - TESTS_ENVIRONMENT = \ - GNC_BUILDDIR=${abs_top_builddir} \ - SRCDIR=${srcdir} \ - G_DEBUG= - -EXTRA_DIST += \ - file-book-hbcislot.gnucash \ - file-book.gnucash \ - CMakeLists.txt diff --git a/gnucash/import-export/bi-import/CMakeLists.txt b/gnucash/import-export/bi-import/CMakeLists.txt index e012953276..710fc5d0b5 100644 --- a/gnucash/import-export/bi-import/CMakeLists.txt +++ b/gnucash/import-export/bi-import/CMakeLists.txt @@ -49,5 +49,5 @@ INSTALL(TARGETS gncmod-bi-import RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) # No headers to install. -SET_LOCAL_DIST(bi_import_DIST_local CMakeLists.txt Makefile.am README ${bi_import_SOURCES} ${bi_import_noinst_HEADERS}) +SET_LOCAL_DIST(bi_import_DIST_local CMakeLists.txt README ${bi_import_SOURCES} ${bi_import_noinst_HEADERS}) SET(bi_import_DIST ${bi_import_DIST_local} ${bi_import_ui_DIST} ${bi_import_glade_DIST} PARENT_SCOPE) diff --git a/gnucash/import-export/bi-import/Makefile.am b/gnucash/import-export/bi-import/Makefile.am deleted file mode 100644 index e6c5eb07cd..0000000000 --- a/gnucash/import-export/bi-import/Makefile.am +++ /dev/null @@ -1,51 +0,0 @@ -SUBDIRS = ui gtkbuilder . - -pkglib_LTLIBRARIES = libgncmod-bi-import.la - -libgncmod_bi_import_la_SOURCES = \ - gnc-plugin-bi-import.c \ - gncmod-bi-import.c \ - dialog-bi-import-gui.c \ - dialog-bi-import-helper.c \ - dialog-bi-import.c - -noinst_HEADERS = \ - gnc-plugin-bi-import.h \ - dialog-bi-import-gui.h \ - dialog-bi-import-helper.h \ - dialog-bi-import.h - -libgncmod_bi_import_la_LDFLAGS = -avoid-version - -libgncmod_bi_import_la_LIBADD = \ - ${top_builddir}/gnucash/gnome/libgnc-gnome.la \ - ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \ - ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${top_builddir}/borrowed/libc/libc-missing.la \ - ${GLIB_LIBS} - -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_builddir}/common \ - -I${top_srcdir}/gnucash/gnome \ - -I${top_srcdir}/gnucash/report/report-gnome \ - -I${top_srcdir}/gnucash/gnome-search/ \ - -I${top_srcdir}/gnucash/register/ledger-core \ - -I${top_srcdir}/gnucash/register/ledger-business \ - -I${top_srcdir}/gnucash/register/register-gnome \ - -I${top_srcdir}/gnucash/register/register-core \ - -I${top_srcdir}/gnucash/gnome-utils \ - -I${top_srcdir}/libgnucash/app-utils \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/borrowed/libc \ - ${GTK_CFLAGS} \ - ${GLIB_CFLAGS} - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.plugin.bi-import\" - -EXTRA_DIST = CMakeLists.txt diff --git a/gnucash/import-export/bi-import/gtkbuilder/CMakeLists.txt b/gnucash/import-export/bi-import/gtkbuilder/CMakeLists.txt index 33d3b37084..5940a2ed46 100644 --- a/gnucash/import-export/bi-import/gtkbuilder/CMakeLists.txt +++ b/gnucash/import-export/bi-import/gtkbuilder/CMakeLists.txt @@ -10,4 +10,4 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PATTERN Makefile.* EXCLUDE PATTERN CMakeLists.txt EXCLUDE) -SET_DIST_LIST(bi_import_glade_DIST CMakeLists.txt Makefile.am dialog-bi-import-gui.glade) \ No newline at end of file +SET_DIST_LIST(bi_import_glade_DIST CMakeLists.txt dialog-bi-import-gui.glade) \ No newline at end of file diff --git a/gnucash/import-export/bi-import/gtkbuilder/Makefile.am b/gnucash/import-export/bi-import/gtkbuilder/Makefile.am deleted file mode 100644 index e9b70f7b37..0000000000 --- a/gnucash/import-export/bi-import/gtkbuilder/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -gtkbuilderdir = $(GNC_GTKBUILDER_DIR) -gtkbuilder_DATA = dialog-bi-import-gui.glade - -EXTRA_DIST = ${gtkbuilder_DATA} CMakeLists.txt diff --git a/gnucash/import-export/bi-import/ui/CMakeLists.txt b/gnucash/import-export/bi-import/ui/CMakeLists.txt index 1a6569a968..51d6bf185d 100644 --- a/gnucash/import-export/bi-import/ui/CMakeLists.txt +++ b/gnucash/import-export/bi-import/ui/CMakeLists.txt @@ -8,4 +8,4 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PATTERN Makefile.* EXCLUDE PATTERN CMakeLists.txt EXCLUDE) -SET_DIST_LIST(bi_import_ui_DIST CMakeLists.txt Makefile.am gnc-plugin-bi-import-ui.xml) +SET_DIST_LIST(bi_import_ui_DIST CMakeLists.txt gnc-plugin-bi-import-ui.xml) diff --git a/gnucash/import-export/bi-import/ui/Makefile.am b/gnucash/import-export/bi-import/ui/Makefile.am deleted file mode 100644 index 8545219246..0000000000 --- a/gnucash/import-export/bi-import/ui/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -uidir = $(GNC_UI_DIR) -ui_DATA = \ - gnc-plugin-bi-import-ui.xml - -EXTRA_DIST = $(ui_DATA) CMakeLists.txt diff --git a/gnucash/import-export/csv-exp/CMakeLists.txt b/gnucash/import-export/csv-exp/CMakeLists.txt index d4d65a43a0..204765180d 100644 --- a/gnucash/import-export/csv-exp/CMakeLists.txt +++ b/gnucash/import-export/csv-exp/CMakeLists.txt @@ -48,7 +48,7 @@ FILE(COPY ${csv_export_UI} FILE(COPY ${csv_export_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder) -SET_LOCAL_DIST(csv_export_DIST_local CMakeLists.txt Makefile.am +SET_LOCAL_DIST(csv_export_DIST_local CMakeLists.txt ${csv_export_SOURCES} ${csv_export_noinst_HEADERS} ${csv_export_GLADE} ${csv_export_UI}) SET(csv_export_DIST ${csv_export_DIST_local} ${csv_exp_gschema_DIST} PARENT_SCOPE) diff --git a/gnucash/import-export/csv-exp/Makefile.am b/gnucash/import-export/csv-exp/Makefile.am deleted file mode 100644 index 328535dd0d..0000000000 --- a/gnucash/import-export/csv-exp/Makefile.am +++ /dev/null @@ -1,60 +0,0 @@ -SUBDIRS = . gschemas - -pkglib_LTLIBRARIES=libgncmod-csv-export.la - -libgncmod_csv_export_la_SOURCES = \ - gncmod-csv-export.c \ - gnc-plugin-csv-export.c \ - assistant-csv-export.c \ - csv-tree-export.c \ - csv-transactions-export.c - -noinst_HEADERS = \ - gnc-plugin-csv-export.h \ - assistant-csv-export.h \ - csv-tree-export.h \ - csv-transactions-export.h - -libgncmod_csv_export_la_LDFLAGS = -avoid-version - -libgncmod_csv_export_la_LIBADD = \ - ${top_builddir}/gnucash/import-export/libgncmod-generic-import.la \ - ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \ - ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \ - ${top_builddir}/gnucash/gnome/libgnc-gnome.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${top_builddir}/borrowed/libc/libc-missing.la \ - ${GTK_LIBS} \ - ${GLIB_LIBS} - -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/libgnucash/app-utils \ - -I${top_srcdir}/gnucash/gnome \ - -I${top_srcdir}/gnucash/gnome-utils \ - -I${top_srcdir}/gnucash/register/ledger-core \ - -I${top_srcdir}/gnucash/register/register-core \ - -I${top_srcdir}/gnucash/register/register-gnome \ - -I${top_srcdir}/gnucash/import-export \ - -I${top_srcdir}/borrowed/libc \ - -I${top_srcdir}/lib \ - ${GUILE_CFLAGS} \ - ${GLIB_CFLAGS} \ - $(GTK_CFLAGS) - -uidir = $(GNC_UI_DIR) -ui_DATA = \ - gnc-plugin-csv-export-ui.xml - -gtkbuilderdir = ${GNC_GTKBUILDER_DIR} -gtkbuilder_DATA = \ - assistant-csv-export.glade - -EXTRA_DIST = $(ui_DATA) $(gtkbuilder_DATA) CMakeLists.txt - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.export.csv\" diff --git a/gnucash/import-export/csv-exp/gschemas/CMakeLists.txt b/gnucash/import-export/csv-exp/gschemas/CMakeLists.txt index d5cfcf195f..04c045c311 100644 --- a/gnucash/import-export/csv-exp/gschemas/CMakeLists.txt +++ b/gnucash/import-export/csv-exp/gschemas/CMakeLists.txt @@ -3,4 +3,4 @@ SET(csv_exp_GSCHEMA org.gnucash.dialogs.export.csv.gschema.xml) add_gschema_targets("${csv_exp_GSCHEMA}") -SET_DIST_LIST(csv_exp_gschema_DIST CMakeLists.txt Makefile.am org.gnucash.dialogs.export.csv.gschema.xml.in.in) +SET_DIST_LIST(csv_exp_gschema_DIST CMakeLists.txt org.gnucash.dialogs.export.csv.gschema.xml.in.in) diff --git a/gnucash/import-export/csv-exp/gschemas/Makefile.am b/gnucash/import-export/csv-exp/gschemas/Makefile.am deleted file mode 100644 index 87fcf8666a..0000000000 --- a/gnucash/import-export/csv-exp/gschemas/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -@INTLTOOL_XML_NOMERGE_RULE@ - -gschema_in_files = \ - org.gnucash.dialogs.export.csv.gschema.xml.in - -gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml) - -@GSETTINGS_RULES@ - -CLEANFILES = $(gsettings_SCHEMAS) - -EXTRA_DIST = CMakeLists.txt diff --git a/gnucash/import-export/csv-imp/CMakeLists.txt b/gnucash/import-export/csv-imp/CMakeLists.txt index 93bdfa6c3b..0fa66a854d 100644 --- a/gnucash/import-export/csv-imp/CMakeLists.txt +++ b/gnucash/import-export/csv-imp/CMakeLists.txt @@ -107,7 +107,7 @@ FILE(COPY ${csv_import_UI} FILE(COPY ${csv_import_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder) -SET_LOCAL_DIST(csv_import_DIST_local CMakeLists.txt Makefile.am +SET_LOCAL_DIST(csv_import_DIST_local CMakeLists.txt ${csv_import_SOURCES} ${csv_import_noinst_HEADERS} ${csv_import_GLADE} ${csv_import_UI}) SET(csv_import_DIST ${csv_import_DIST_local} ${test_csv_import_DIST} ${csv_import_gschema_DIST} PARENT_SCOPE) diff --git a/gnucash/import-export/csv-imp/Makefile.am b/gnucash/import-export/csv-imp/Makefile.am deleted file mode 100644 index b4ab800b87..0000000000 --- a/gnucash/import-export/csv-imp/Makefile.am +++ /dev/null @@ -1,93 +0,0 @@ -SUBDIRS = . gschemas test - -pkglib_LTLIBRARIES=libgncmod-csv-import.la - -libgncmod_csv_import_la_SOURCES = \ - gncmod-csv-import.c \ - assistant-csv-account-import.c \ - assistant-csv-price-import.cpp \ - assistant-csv-trans-import.cpp \ - gnc-plugin-csv-import.c \ - csv-account-import.c \ - gnc-csv-account-map.c \ - gnc-csv-tokenizer.cpp \ - gnc-csv-gnumeric-popup.c \ - gnc-dummy-tokenizer.cpp \ - gnc-fw-tokenizer.cpp \ - gnc-price-import.cpp \ - gnc-price-props.cpp \ - gnc-tokenizer.cpp \ - gnc-tx-import.cpp \ - gnc-trans-props.cpp \ - gnc-csv-import-settings.cpp \ - gnc-csv-price-import-settings.cpp \ - gnc-csv-trans-import-settings.cpp - -noinst_HEADERS = \ - assistant-csv-account-import.h \ - assistant-csv-price-import.h \ - assistant-csv-trans-import.h \ - gnc-plugin-csv-import.h \ - csv-account-import.h \ - gnc-csv-account-map.h \ - gnc-csv-tokenizer.hpp \ - gnc-csv-gnumeric-popup.h \ - gnc-dummy-tokenizer.hpp \ - gnc-fw-tokenizer.hpp \ - gnc-price-import.hpp \ - gnc-price-props.hpp \ - gnc-tokenizer.hpp \ - gnc-tx-import.hpp \ - gnc-trans-props.hpp \ - gnc-csv-import-settings.hpp \ - gnc-csv-price-import-settings.hpp \ - gnc-csv-trans-import-settings.hpp - -libgncmod_csv_import_la_LDFLAGS = -avoid-version - -libgncmod_csv_import_la_LIBADD = \ - ${top_builddir}/gnucash/import-export/libgncmod-generic-import.la \ - ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \ - ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${top_builddir}/borrowed/goffice/libgnc-goffice.la \ - ${top_builddir}/borrowed/libc/libc-missing.la \ - ${GLIB_LIBS} \ - ${GTK_LIBS} \ - ${ICU4C_I18N_LIBS} \ - ${BOOST_LDFLAGS} \ - -lboost_regex \ - -lboost_locale - -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/libgnucash/app-utils \ - -I${top_srcdir}/gnucash/gnome \ - -I${top_srcdir}/gnucash/gnome-utils \ - -I${top_srcdir}/gnucash/import-export \ - -I${top_srcdir}/borrowed/libc \ - -I${top_srcdir}/borrowed/goffice \ - ${GUILE_CFLAGS} \ - ${GLIB_CFLAGS} \ - ${GTK_CFLAGS} \ - ${ICU4C_I18N_CFLAGS} \ - ${BOOST_CPPFLAGS} - -uidir = $(GNC_UI_DIR) -ui_DATA = \ - gnc-plugin-csv-import-ui.xml - -gtkbuilderdir = ${GNC_GTKBUILDER_DIR} -gtkbuilder_DATA = \ - assistant-csv-account-import.glade \ - assistant-csv-price-import.glade \ - assistant-csv-trans-import.glade - -EXTRA_DIST = $(ui_DATA) $(gtkbuilder_DATA) CMakeLists.txt - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.csv\" diff --git a/gnucash/import-export/csv-imp/gschemas/CMakeLists.txt b/gnucash/import-export/csv-imp/gschemas/CMakeLists.txt index 509ee8167c..8dc5631f5c 100644 --- a/gnucash/import-export/csv-imp/gschemas/CMakeLists.txt +++ b/gnucash/import-export/csv-imp/gschemas/CMakeLists.txt @@ -2,4 +2,4 @@ SET(csv_imp_GSCHEMA org.gnucash.dialogs.import.csv.gschema.xml) add_gschema_targets("${csv_imp_GSCHEMA}") -SET_DIST_LIST(csv_import_gschema_DIST CMakeLists.txt Makefile.am org.gnucash.dialogs.import.csv.gschema.xml.in.in) +SET_DIST_LIST(csv_import_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.csv.gschema.xml.in.in) diff --git a/gnucash/import-export/csv-imp/gschemas/Makefile.am b/gnucash/import-export/csv-imp/gschemas/Makefile.am deleted file mode 100644 index 014a3e3635..0000000000 --- a/gnucash/import-export/csv-imp/gschemas/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -@INTLTOOL_XML_NOMERGE_RULE@ - -gschema_in_files = \ - org.gnucash.dialogs.import.csv.gschema.xml.in - -gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml) - -@GSETTINGS_RULES@ - -CLEANFILES = $(gsettings_SCHEMAS) - -EXTRA_DIST = CMakeLists.txt diff --git a/gnucash/import-export/csv-imp/test/CMakeLists.txt b/gnucash/import-export/csv-imp/test/CMakeLists.txt index 6fc282d7bc..f9406e4705 100644 --- a/gnucash/import-export/csv-imp/test/CMakeLists.txt +++ b/gnucash/import-export/csv-imp/test/CMakeLists.txt @@ -32,6 +32,6 @@ IF (NOT WIN32) gtest_csv_imp_INCLUDES gtest_csv_imp_LIBS) ENDIF() -SET_DIST_LIST(test_csv_import_DIST CMakeLists.txt Makefile.am +SET_DIST_LIST(test_csv_import_DIST CMakeLists.txt test-tx-import.cpp test-tokenizer.cpp sample1.csv ${test_csv_imp_SOURCES}) diff --git a/gnucash/import-export/csv-imp/test/Makefile.am b/gnucash/import-export/csv-imp/test/Makefile.am deleted file mode 100644 index fdfed5b70e..0000000000 --- a/gnucash/import-export/csv-imp/test/Makefile.am +++ /dev/null @@ -1,117 +0,0 @@ -# A template Makefile.am for GLib g_test-based test directories. -# Copyright 2011 John Ralls - -include $(top_srcdir)/test-templates/Makefile.decl - - -#You will only need one of these: It points to the module directory -#after $(top_srcdir) or ${top_builddir}: -MODULEPATH = gnucash/import-export/csv-imp - -#The test program. You'll need to add to this if you have more than one module above. - -check_PROGRAMS = test-tokenizer \ - test-tx-import - -TESTS = ${check_PROGRAMS} - -#Program files for tests go here. It's probably best to have one for -#each file in the parent directory. Include -#test_foo_support.c if you have one and aren't building the -#support library. -test_tokenizer_SOURCES = \ - test-tokenizer.cpp - -test_tx_import_SOURCES = \ - test-tx-import.cpp - -if !GOOGLE_TEST_LIBS -nodist_test_tokenizer_SOURCES = \ - ${GTEST_SRC}/src/gtest_main.cc - -nodist_test_tx_import_SOURCES = \ - ${GTEST_SRC}/src/gtest_main.cc -endif - -IMP_TEST_CPPFLAGS = \ - ${DEFAULT_INCLUDES} \ - -I$(top_srcdir)/${MODULEPATH}/ \ - -I${top_srcdir}/common/test-core \ - -I${top_srcdir}/common \ - -I${top_srcdir}/gnucash/import-export \ - -I${top_srcdir}/gnucash/gnome \ - -I${top_srcdir}/gnucash/register/ledger-core \ - -I${top_srcdir}/gnucash/register/register-gnome \ - -I${top_srcdir}/gnucash/register/register-core \ - -I${top_srcdir}/gnucash/gnome-utils \ - -I${top_srcdir}/libgnucash/app-utils \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/borrowed/libc \ - ${GTK_CFLAGS} \ - ${GLIB_CFLAGS} \ - $(BOOST_CPPFLAGS) - -test_tokenizer_CPPFLAGS = \ - -I$(GTEST_HEADERS) \ - $(IMP_TEST_CPPFLAGS) - -test_tx_import_CPPFLAGS = \ - -I$(GTEST_HEADERS) \ - $(IMP_TEST_CPPFLAGS) - -#The tests might require more libraries, but try to keep them -#as independent as possible. -IMP_TEST_LDFLAGS = \ - ${top_builddir}/${MODULEPATH}/libgncmod-csv-import.la \ - ${top_builddir}/gnucash/import-export/libgncmod-generic-import.la \ - ${top_builddir}/gnucash/gnome/libgnc-gnome.la \ - ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \ - ${top_builddir}/gnucash/register/ledger-core/libgncmod-ledger-core.la \ - ${top_builddir}/gnucash/report/report-gnome/libgncmod-report-gnome.la \ - ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \ - ${top_builddir}/libgnucash/backend/xml/libgnc-backend-xml-utils.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${GLIB_LIBS} \ - $(BOOST_LDFLAGS) - -test_tokenizer_LDADD = \ - ${IMP_TEST_LDFLAGS} \ - $(GTEST_LIBS) - -test_tx_import_LDADD = \ - ${IMP_TEST_LDFLAGS} \ - $(GTEST_LIBS) - -GNC_TEST_DEPS = \ ---library-dir ${top_builddir}/${MODULEPATH} \ ---library-dir ${top_builddir}/gnucash/import-export \ ---library-dir ${top_builddir}/gnucash/gnome \ ---library-dir ${top_builddir}/gnucash/gnome-utils \ ---library-dir ${top_builddir}/gnucash/gnome-search \ ---library-dir ${top_builddir}/gnucash/register/ledger-core \ ---library-dir ${top_builddir}/gnucash/register/register-core \ ---library-dir ${top_builddir}/gnucash/register/register-gnome \ ---library-dir ${top_builddir}/gnucash/report/report-system \ ---library-dir ${top_builddir}/gnucash/report/report-gnome \ ---library-dir ${top_builddir}/gnucash/html \ ---library-dir ${top_builddir}/libgnucash/app-utils \ ---library-dir ${top_builddir}/libgnucash/backend/xml \ ---library-dir ${top_builddir}/libgnucash/engine \ ---library-dir ${top_builddir}/libgnucash/core-utils \ ---library-dir ${top_builddir}/libgnucash/gnc-module - -TESTS_ENVIRONMENT = \ - SRCDIR=${srcdir} \ - G_DEBUG= \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS}) - -EXTRA_DIST += \ - sample1.csv \ - CMakeLists.txt - - -AM_CPPFLAGS = -DG_LOG_DOMAIN=\"gnc.import.csv\" diff --git a/gnucash/import-export/customer-import/CMakeLists.txt b/gnucash/import-export/customer-import/CMakeLists.txt index 98c43e5191..7b165949b5 100644 --- a/gnucash/import-export/customer-import/CMakeLists.txt +++ b/gnucash/import-export/customer-import/CMakeLists.txt @@ -40,5 +40,5 @@ INSTALL(TARGETS gncmod-customer-import RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) # No headers to install. -SET_LOCAL_DIST(customer_import_DIST_local CMakeLists.txt Makefile.am ${customer_import_SOURCES} ${customer_import_noinst_HEADERS}) +SET_LOCAL_DIST(customer_import_DIST_local CMakeLists.txt ${customer_import_SOURCES} ${customer_import_noinst_HEADERS}) SET(customer_import_DIST ${customer_import_DIST_local} ${customer_import_glade_DIST} ${customer_import_ui_DIST} PARENT_SCOPE) diff --git a/gnucash/import-export/customer-import/Makefile.am b/gnucash/import-export/customer-import/Makefile.am deleted file mode 100644 index 6ad828621f..0000000000 --- a/gnucash/import-export/customer-import/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -SUBDIRS = ui gtkbuilder . - -pkglib_LTLIBRARIES = libgncmod-customer-import.la - -libgncmod_customer_import_la_SOURCES = \ - gnc-plugin-customer-import.c \ - gncmod-customer-import.c \ - dialog-customer-import-gui.c \ - dialog-customer-import.c - -noinst_HEADERS = \ - gnc-plugin-customer-import.h \ - dialog-customer-import-gui.h \ - dialog-customer-import.h - -libgncmod_customer_import_la_LDFLAGS = -avoid-version - -libgncmod_customer_import_la_LIBADD = \ - ${top_builddir}/gnucash/gnome/libgnc-gnome.la \ - ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \ - ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${top_builddir}/borrowed/libc/libc-missing.la \ - ${GLIB_LIBS} - -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_builddir}/common \ - -I${top_srcdir}/gnucash/gnome \ - -I${top_srcdir}/gnucash/report/report-gnome \ - -I${top_srcdir}/gnucash/gnome-search/ \ - -I${top_srcdir}/gnucash/register/ledger-core \ - -I${top_srcdir}/gnucash/register/register-gnome \ - -I${top_srcdir}/gnucash/register/register-core \ - -I${top_srcdir}/gnucash/gnome-utils \ - -I${top_srcdir}/libgnucash/app-utils \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/borrowed/libc \ - ${GTK_CFLAGS} \ - ${GLIB_CFLAGS} - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.plugin.customer-import\" - -EXTRA_DIST = CMakeLists.txt diff --git a/gnucash/import-export/customer-import/gtkbuilder/CMakeLists.txt b/gnucash/import-export/customer-import/gtkbuilder/CMakeLists.txt index 0f9b152ddd..45ff7788dd 100644 --- a/gnucash/import-export/customer-import/gtkbuilder/CMakeLists.txt +++ b/gnucash/import-export/customer-import/gtkbuilder/CMakeLists.txt @@ -8,4 +8,4 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PATTERN Makefile.* EXCLUDE PATTERN CMakeLists.txt EXCLUDE) -SET_DIST_LIST(customer_import_glade_DIST CMakeLists.txt Makefile.am dialog-customer-import-gui.glade) +SET_DIST_LIST(customer_import_glade_DIST CMakeLists.txt dialog-customer-import-gui.glade) diff --git a/gnucash/import-export/customer-import/gtkbuilder/Makefile.am b/gnucash/import-export/customer-import/gtkbuilder/Makefile.am deleted file mode 100644 index 93c4ba1367..0000000000 --- a/gnucash/import-export/customer-import/gtkbuilder/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -gtkbuilderdir = $(GNC_GTKBUILDER_DIR) -gtkbuilder_DATA = dialog-customer-import-gui.glade - -EXTRA_DIST = ${gtkbuilder_DATA} CMakeLists.txt diff --git a/gnucash/import-export/customer-import/ui/CMakeLists.txt b/gnucash/import-export/customer-import/ui/CMakeLists.txt index d62d64be85..2fad3e5b0f 100644 --- a/gnucash/import-export/customer-import/ui/CMakeLists.txt +++ b/gnucash/import-export/customer-import/ui/CMakeLists.txt @@ -8,4 +8,4 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PATTERN Makefile.* EXCLUDE PATTERN CMakeLists.txt EXCLUDE) -SET_DIST_LIST(customer_import_ui_DIST CMakeLists.txt Makefile.am gnc-plugin-customer-import-ui.xml) +SET_DIST_LIST(customer_import_ui_DIST CMakeLists.txt gnc-plugin-customer-import-ui.xml) diff --git a/gnucash/import-export/customer-import/ui/Makefile.am b/gnucash/import-export/customer-import/ui/Makefile.am deleted file mode 100644 index 56416b7626..0000000000 --- a/gnucash/import-export/customer-import/ui/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -uidir = $(GNC_UI_DIR) -ui_DATA = \ - gnc-plugin-customer-import-ui.xml - -EXTRA_DIST = $(ui_DATA) CMakeLists.txt diff --git a/gnucash/import-export/gschemas/CMakeLists.txt b/gnucash/import-export/gschemas/CMakeLists.txt index f67450301e..4f3f74d844 100644 --- a/gnucash/import-export/gschemas/CMakeLists.txt +++ b/gnucash/import-export/gschemas/CMakeLists.txt @@ -3,4 +3,4 @@ SET(generic_import_GSCHEMA org.gnucash.dialogs.import.generic.gschema.xml) add_gschema_targets("${generic_import_GSCHEMA}") -SET_DIST_LIST(generic_import_gschema_DIST CMakeLists.txt Makefile.am org.gnucash.dialogs.import.generic.gschema.xml.in.in) +SET_DIST_LIST(generic_import_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.generic.gschema.xml.in.in) diff --git a/gnucash/import-export/gschemas/Makefile.am b/gnucash/import-export/gschemas/Makefile.am deleted file mode 100644 index f207d6300e..0000000000 --- a/gnucash/import-export/gschemas/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -@INTLTOOL_XML_NOMERGE_RULE@ - -gschema_in_files = \ - org.gnucash.dialogs.import.generic.gschema.xml.in - -gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml) - -@GSETTINGS_RULES@ - -CLEANFILES = $(gsettings_SCHEMAS) - -EXTRA_DIST = CMakeLists.txt diff --git a/gnucash/import-export/log-replay/CMakeLists.txt b/gnucash/import-export/log-replay/CMakeLists.txt index 6c8ae63ff8..4e8f39db4a 100644 --- a/gnucash/import-export/log-replay/CMakeLists.txt +++ b/gnucash/import-export/log-replay/CMakeLists.txt @@ -37,5 +37,5 @@ INSTALL(FILES ${log_replay_UI} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/ui) FILE(COPY ${log_replay_UI} DESTINATION ${DATADIR_BUILD}/gnucash/ui) -SET_DIST_LIST(log_report_DIST CMakeLists.txt Makefile.am +SET_DIST_LIST(log_report_DIST CMakeLists.txt ${log_replay_SOURCES} ${log_replay_noinst_HEADERS} ${log_replay_UI}) diff --git a/gnucash/import-export/log-replay/Makefile.am b/gnucash/import-export/log-replay/Makefile.am deleted file mode 100644 index 3529e06c20..0000000000 --- a/gnucash/import-export/log-replay/Makefile.am +++ /dev/null @@ -1,43 +0,0 @@ -SUBDIRS = . - -pkglib_LTLIBRARIES=libgncmod-log-replay.la - -libgncmod_log_replay_la_SOURCES = \ - gnc-log-replay.c \ - gnc-plugin-log-replay.c \ - gncmod-log-replay.c - -noinst_HEADERS = \ - gnc-log-replay.h \ - gnc-plugin-log-replay.h - -libgncmod_log_replay_la_LDFLAGS = -avoid-version - -libgncmod_log_replay_la_LIBADD = \ - ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \ - ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${GTK_LIBS} \ - ${GLIB_LIBS} - -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/libgnucash/app-utils \ - -I${top_srcdir}/gnucash/gnome \ - -I${top_srcdir}/gnucash/gnome-utils \ - -I${top_srcdir}/gnucash/import-export \ - ${GTK_CFLAGS} \ - ${GLIB_CFLAGS} - -uidir = $(GNC_UI_DIR) -dist_ui_DATA = \ - gnc-plugin-log-replay-ui.xml - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.log-replay\" - -EXTRA_DIST = CMakeLists.txt diff --git a/gnucash/import-export/ofx/CMakeLists.txt b/gnucash/import-export/ofx/CMakeLists.txt index 2f8a845c7d..00baf568d5 100644 --- a/gnucash/import-export/ofx/CMakeLists.txt +++ b/gnucash/import-export/ofx/CMakeLists.txt @@ -44,5 +44,5 @@ ENDIF() DESTINATION ${DATADIR_BUILD}/gnucash/ui) ENDIF() -SET_LOCAL_DIST(ofx_DIST_local CMakeLists.txt Makefile.am migratable-prefs-ofx.xml ${ofx_SOURCES} ${ofx_noinst_HEADERS} ${ofx_UI}) +SET_LOCAL_DIST(ofx_DIST_local CMakeLists.txt migratable-prefs-ofx.xml ${ofx_SOURCES} ${ofx_noinst_HEADERS} ${ofx_UI}) SET(ofx_DIST ${ofx_DIST_local} ${test_ofx_DIST} ${ofx_gschema_DIST} PARENT_SCOPE) diff --git a/gnucash/import-export/ofx/Makefile.am b/gnucash/import-export/ofx/Makefile.am deleted file mode 100644 index 629d6d0e46..0000000000 --- a/gnucash/import-export/ofx/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -SUBDIRS = . gschemas test - -pkglib_LTLIBRARIES=libgncmod-ofx.la - -libgncmod_ofx_la_SOURCES = \ - gnc-ofx-import.c \ - gnc-ofx-kvp.c \ - gncmod-ofx-import.c \ - gnc-plugin-ofx.c - -noinst_HEADERS = \ - gnc-ofx-import.h \ - gnc-ofx-kvp.h \ - gnc-plugin-ofx.h - -libgncmod_ofx_la_LDFLAGS = -avoid-version - -libgncmod_ofx_la_LIBADD = \ - ${top_builddir}/gnucash/import-export/libgncmod-generic-import.la \ - ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \ - ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${GLIB_LIBS} \ - ${LIBOFX_LIBS} - -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/libgnucash/app-utils \ - -I${top_srcdir}/gnucash/gnome \ - -I${top_srcdir}/gnucash/gnome-utils \ - -I${top_srcdir}/gnucash/import-export \ - ${GTK_CFLAGS} \ - ${GLIB_CFLAGS} \ - ${LIBOFX_CFLAGS} - -uidir = $(GNC_UI_DIR) -ui_DATA = \ - gnc-plugin-ofx-ui.xml - -EXTRA_DIST = $(ui_DATA) migratable-prefs-ofx.xml CMakeLists.txt - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.ofx\" diff --git a/gnucash/import-export/ofx/gschemas/CMakeLists.txt b/gnucash/import-export/ofx/gschemas/CMakeLists.txt index ff8a3f90dd..7cb99c20f7 100644 --- a/gnucash/import-export/ofx/gschemas/CMakeLists.txt +++ b/gnucash/import-export/ofx/gschemas/CMakeLists.txt @@ -5,4 +5,4 @@ IF (WITH_OFX) add_gschema_targets("${ofx_GSCHEMA}") ENDIF (WITH_OFX) -SET_DIST_LIST(ofx_gschema_DIST CMakeLists.txt Makefile.am org.gnucash.dialogs.import.ofx.gschema.xml.in.in) +SET_DIST_LIST(ofx_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.ofx.gschema.xml.in.in) diff --git a/gnucash/import-export/ofx/gschemas/Makefile.am b/gnucash/import-export/ofx/gschemas/Makefile.am deleted file mode 100644 index 30ad6106e2..0000000000 --- a/gnucash/import-export/ofx/gschemas/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -@INTLTOOL_XML_NOMERGE_RULE@ - -gschema_in_files = \ - org.gnucash.dialogs.import.ofx.gschema.xml.in - -gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml) - -@GSETTINGS_RULES@ - -CLEANFILES = $(gsettings_SCHEMAS) - -EXTRA_DIST = CMakeLists.txt diff --git a/gnucash/import-export/ofx/test/CMakeLists.txt b/gnucash/import-export/ofx/test/CMakeLists.txt index 911d91c8be..859f87f5b1 100644 --- a/gnucash/import-export/ofx/test/CMakeLists.txt +++ b/gnucash/import-export/ofx/test/CMakeLists.txt @@ -7,4 +7,4 @@ IF(WITH_OFX) GNC_ADD_TEST(test-link-ofx test-link.c OFX_TEST_INCLUDE_DIRS OFX_TEST_LIBS) ENDIF(WITH_OFX) -SET_DIST_LIST(test_ofx_DIST CMakeLists.txt Makefile.am test-link.c) \ No newline at end of file +SET_DIST_LIST(test_ofx_DIST CMakeLists.txt test-link.c) \ No newline at end of file diff --git a/gnucash/import-export/ofx/test/Makefile.am b/gnucash/import-export/ofx/test/Makefile.am deleted file mode 100644 index 2e784d42ec..0000000000 --- a/gnucash/import-export/ofx/test/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -TESTS=test-link - -AM_CPPFLAGS=${LIBOFX_CFLAGS} -check_PROGRAMS=test-link - -test_link_SOURCES=test-link.c -test_link_LDADD=\ - $(top_builddir)/libgnucash/engine/libgncmod-engine.la \ - $(top_builddir)/libgnucash/app-utils/libgncmod-app-utils.la \ - ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \ - ../libgncmod-ofx.la - -EXTRA_DIST = CMakeLists.txt diff --git a/gnucash/import-export/qif-imp/CMakeLists.txt b/gnucash/import-export/qif-imp/CMakeLists.txt index 5d1e052f99..a947439c13 100644 --- a/gnucash/import-export/qif-imp/CMakeLists.txt +++ b/gnucash/import-export/qif-imp/CMakeLists.txt @@ -83,6 +83,6 @@ FILE(COPY ${qif_import_UI} FILE(COPY ${qif_import_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder) -SET_LOCAL_DIST(qif_import_DIST_local CMakeLists.txt Makefile.am file-format.txt ${qif_import_SOURCES} ${qif_import_noinst_HEADERS} +SET_LOCAL_DIST(qif_import_DIST_local CMakeLists.txt file-format.txt ${qif_import_SOURCES} ${qif_import_noinst_HEADERS} ${qif_import_SCHEME} ${qif_import_SCHEME_2} ${qif_import_GLADE} ${qif_import_UI}) SET(qif_import_DIST ${qif_import_DIST_local} ${test_qif_import_DIST} ${qif_import_gschema_DIST} PARENT_SCOPE) diff --git a/gnucash/import-export/qif-imp/Makefile.am b/gnucash/import-export/qif-imp/Makefile.am deleted file mode 100644 index 894dff4ec7..0000000000 --- a/gnucash/import-export/qif-imp/Makefile.am +++ /dev/null @@ -1,143 +0,0 @@ -SUBDIRS = . test gschemas - -pkglib_LTLIBRARIES=libgncmod-qif-import.la - -libgncmod_qif_import_la_SOURCES = \ - dialog-account-picker.c \ - assistant-qif-import.c \ - gnc-plugin-qif-import.c \ - gncmod-qif-import.c - -noinst_HEADERS = \ - dialog-account-picker.h \ - assistant-qif-import.h \ - gnc-plugin-qif-import.h - -libgncmod_qif_import_la_LDFLAGS = -avoid-version - -libgncmod_qif_import_la_LIBADD = \ - ${top_builddir}/gnucash/import-export/libgncmod-generic-import.la \ - ${top_builddir}/gnucash/gnome/libgnc-gnome.la \ - ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \ - ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${GUILE_LIBS} \ - ${GLIB_LIBS} - - -gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/import-export -gncscmmod_DATA = qif-import.scm - -gncscmdir = ${GNC_SCM_INSTALL_DIR}/qif-import - -gncscm_DATA = \ - qif-dialog-utils.scm \ - qif-file.scm \ - qif-guess-map.scm \ - qif-import.scm \ - qif-merge-groups.scm \ - qif-objects.scm \ - qif-parse.scm \ - qif-to-gnc.scm \ - qif-utils.scm - -gtkbuilderdir = ${GNC_GTKBUILDER_DIR} -gtkbuilder_DATA = \ - dialog-account-picker.glade \ - assistant-qif-import.glade - -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_builddir}/common \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/libgnucash/app-utils \ - -I${top_srcdir}/gnucash/gnome \ - -I${top_srcdir}/gnucash/gnome-utils \ - -I${top_srcdir}/gnucash/import-export \ - ${GUILE_CFLAGS} \ - ${GLIB_CFLAGS} \ - ${GTK_CFLAGS} - -uidir = $(GNC_UI_DIR) -ui_DATA = \ - gnc-plugin-qif-import-ui.xml - -EXTRA_DIST = \ - ${gncscm_DATA} \ - ${gtkbuilder_DATA} \ - file-format.txt \ - $(ui_DATA) \ - CMakeLists.txt - -CLEANFILES = - -if GNUCASH_SEPARATE_BUILDDIR -SCM_FILE_LINKS = \ - ${gncscm_DATA} -endif - -noinst_DATA = .scm-links - -.scm-links: - $(RM) -rf gnucash - mkdir -p gnucash qif-import - mkdir -p gnucash/import-export -if GNUCASH_SEPARATE_BUILDDIR - for X in ${SCM_FILE_LINKS} ; do \ - $(LN_S) -f ${srcdir}/$$X . ; \ - done -endif - ( cd gnucash/import-export; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../../$$A . ; done ) - ( cd qif-import; for A in $(gncscm_DATA) ; do $(LN_S) -f ../$$A . ; done ) -if ! OS_WIN32 -# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567). - touch .scm-links -endif - -GUILE_COMPILE_ENV = \ - --gnc-module-dir ${top_builddir}/libgnucash/engine \ - --guile-load-dir ${top_builddir}/libgnucash/app-utils \ - --guile-load-dir ${top_builddir}/libgnucash/core-utils \ - --guile-load-dir ${top_builddir}/libgnucash/engine \ - --guile-load-dir ${top_builddir}/libgnucash/gnc-module \ - --guile-load-dir ${top_builddir}/libgnucash/scm \ - --library-dir ${top_builddir}/libgnucash/engine \ - --library-dir ${top_builddir}/libgnucash/core-utils \ - --library-dir ${top_builddir}/libgnucash/app-utils \ - --library-dir ${top_builddir}/gnucash/gnome \ - --library-dir ${top_builddir}/libgnucash/gnc-module \ - --library-dir ${top_builddir}/gnucash/gnome-utils \ - --library-dir ${top_builddir}/libgnucash/backend/xml \ - --library-dir ${top_builddir}/libgnucash/backend/sql \ - --library-dir ${top_builddir}/gnucash/html \ - --library-dir ${top_builddir}/gnucash/report/report-system \ - --library-dir ${top_builddir}/gnucash/report/report-gnome \ - --library-dir ${top_builddir}/gnucash/register/register-gnome \ - --library-dir ${top_builddir}/gnucash/register/register-core \ - --library-dir ${top_builddir}/gnucash/register/ledger-core \ - --library-dir ${top_builddir}/gnucash/gnome-search - - -%.go : %.scm .scm-links $(pkglib_LTLIBRARIES) - GNC_UNINSTALLED=yes \ - GNC_BUILDDIR=${top_builddir} \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \ - $(GUILD) compile -o $@ $< - -gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/import-export -gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) - -gncscmcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/qif-import -gncscmcache_DATA = $(gncscm_DATA:.scm=.go) - -clean-local: - $(RM) -rf gnucash qif-import - -CLEANFILES += .scm-links ${gncscmmodcache_DATA} ${gncscmcache_DATA} -DISTCLEANFILES = ${SCM_FILE_LINKS} - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.qif.import\" diff --git a/gnucash/import-export/qif-imp/gschemas/CMakeLists.txt b/gnucash/import-export/qif-imp/gschemas/CMakeLists.txt index 0715558466..ddb41bf215 100644 --- a/gnucash/import-export/qif-imp/gschemas/CMakeLists.txt +++ b/gnucash/import-export/qif-imp/gschemas/CMakeLists.txt @@ -3,4 +3,4 @@ set(qif_imp_GSCHEMA org.gnucash.dialogs.import.qif.gschema.xml) add_gschema_targets("${qif_imp_GSCHEMA}") -SET_DIST_LIST(qif_import_gschema_DIST CMakeLists.txt Makefile.am org.gnucash.dialogs.import.qif.gschema.xml.in.in) +SET_DIST_LIST(qif_import_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.qif.gschema.xml.in.in) diff --git a/gnucash/import-export/qif-imp/gschemas/Makefile.am b/gnucash/import-export/qif-imp/gschemas/Makefile.am deleted file mode 100644 index 87746934cc..0000000000 --- a/gnucash/import-export/qif-imp/gschemas/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -@INTLTOOL_XML_NOMERGE_RULE@ - -gschema_in_files = \ - org.gnucash.dialogs.import.qif.gschema.xml.in - -gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml) - -@GSETTINGS_RULES@ - -CLEANFILES = $(gsettings_SCHEMAS) - -EXTRA_DIST = CMakeLists.txt diff --git a/gnucash/import-export/qif-imp/test/CMakeLists.txt b/gnucash/import-export/qif-imp/test/CMakeLists.txt index 1db47e7a55..f98286b036 100644 --- a/gnucash/import-export/qif-imp/test/CMakeLists.txt +++ b/gnucash/import-export/qif-imp/test/CMakeLists.txt @@ -5,4 +5,4 @@ SET(QIF_IMP_TEST_LIBS) GNC_ADD_TEST(test-link-qif-imp test-link.c QIF_IMP_TEST_INCLUDE_DIRS QIF_IMP_TEST_LIBS) -SET_DIST_LIST(test_qif_import_DIST CMakeLists.txt Makefile.am test-link.c) \ No newline at end of file +SET_DIST_LIST(test_qif_import_DIST CMakeLists.txt test-link.c) \ No newline at end of file diff --git a/gnucash/import-export/qif-imp/test/Makefile.am b/gnucash/import-export/qif-imp/test/Makefile.am deleted file mode 100644 index 712379303f..0000000000 --- a/gnucash/import-export/qif-imp/test/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -TESTS=test-link - -check_PROGRAMS=test-link - -test_link_SOURCES = \ - test-link.c - -test_link_LDADD=../libgncmod-qif-import.la \ - ${top_builddir}/gnucash/register/ledger-core/libgncmod-ledger-core.la \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${top_builddir}/gnucash/gnome/libgnc-gnome.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \ - ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \ - ${LIBXML2_LIBS} - -EXTRA_DIST = CMakeLists.txt diff --git a/gnucash/import-export/qif/CMakeLists.txt b/gnucash/import-export/qif/CMakeLists.txt index 6c2a0435fa..32c007bac7 100644 --- a/gnucash/import-export/qif/CMakeLists.txt +++ b/gnucash/import-export/qif/CMakeLists.txt @@ -39,5 +39,5 @@ INSTALL(TARGETS gncmod-qif RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) # No headers to install. -SET_LOCAL_DIST(qif_DIST_local CMakeLists.txt Makefile.am ${qif_SOURCES} ${qif_noinst_HEADERS}) +SET_LOCAL_DIST(qif_DIST_local CMakeLists.txt ${qif_SOURCES} ${qif_noinst_HEADERS}) SET(qif_DIST ${qif_DIST_local} ${test_qif_DIST} PARENT_SCOPE) diff --git a/gnucash/import-export/qif/Makefile.am b/gnucash/import-export/qif/Makefile.am deleted file mode 100644 index a9c19c29c0..0000000000 --- a/gnucash/import-export/qif/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -#SUBDIRS = . test -DIST_SUBDIRS = test - -pkglib_LTLIBRARIES=libgncmod-qif.la - -libgncmod_qif_la_SOURCES = \ - qif-context.c \ - qif-defaults.c \ - qif-file.c \ - qif-objects.c \ - qif-parse.c - -noinst_HEADERS = \ - qif-file.h \ - qif-defaults.h \ - qif-import-p.h \ - qif-import.h \ - qif-objects.h \ - qif-objects-p.h \ - qif-parse.h - -libgncmod_qif_la_LIBADD = \ - ${top_builddir}/gnucash/import-export/libgncmod-generic-import.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${REGEX_LIBS} \ - ${GLIB_LIBS} - -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/libgnucash/app-utils \ - -I${top_srcdir}/gnucash/import-export \ - ${GLIB_CFLAGS} \ - ${GUILE_CFLAGS} - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.qif\" - -EXTRA_DIST = CMakeLists.txt diff --git a/gnucash/import-export/qif/test/CMakeLists.txt b/gnucash/import-export/qif/test/CMakeLists.txt index 072fdee7c5..fa7f453b9a 100644 --- a/gnucash/import-export/qif/test/CMakeLists.txt +++ b/gnucash/import-export/qif/test/CMakeLists.txt @@ -15,4 +15,4 @@ IF (FALSE) GNC_TEST_FILES=${CMAKE_CURRENT_SOURCE_DIR}/test-files) ENDIF() -SET_DIST_LIST(test_qif_DIST CMakeLists.txt Makefile.am test-link.c test-qif.c test-files/test-1-bank-txn.qif) +SET_DIST_LIST(test_qif_DIST CMakeLists.txt test-link.c test-qif.c test-files/test-1-bank-txn.qif) diff --git a/gnucash/import-export/qif/test/Makefile.am b/gnucash/import-export/qif/test/Makefile.am deleted file mode 100644 index bbd63054ca..0000000000 --- a/gnucash/import-export/qif/test/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/common/test-core \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/app-utils \ - -I${top_srcdir}/gnucash/import-export \ - -I${top_srcdir}/gnucash/import-export/qif \ - ${GUILE_CFLAGS} \ - ${GLIB_CFLAGS} - -LDADD = \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${top_builddir}/common/test-core/libtest-core.la \ - ../../libgncmod-generic-import.la \ - ../libgncmod-qif.la \ - ${GLIB_LIBS} - -TESTS = \ - test-link \ - test-qif - -GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/libgnucash/core-utils \ - --gnc-module-dir ${top_builddir}/libgnucash/gnc-module \ - --gnc-module-dir ${top_builddir}/libgnucash/engine \ - --gnc-module-dir ${top_builddir}/libgnucash/app-utils \ - --gnc-module-dir ${top_builddir}/gnucash/import-export \ - --gnc-module-dir ${top_builddir}/gnucash/import-export/qif \ - --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \ - --gnc-module-dir ${top_srcdir}/libgnucash/gnc-module \ - --gnc-module-dir ${top_srcdir}/libgnucash/engine \ - --gnc-module-dir ${top_srcdir}/libgnucash/app-utils \ - --gnc-module-dir ${top_srcdir}/gnucash/gnome-utils \ - --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \ - --gnc-module-dir ${top_builddir}/gnucash/gnome \ - --guile-load-dir ${top_srcdir}/libgnucash/scm \ - --guile-load-dir ${top_srcdir}/gnucash/import-export \ - --guile-load-dir ${top_srcdir}/gnucash/import-export/qif - -TESTS_ENVIRONMENT = \ - GNC_TEST_FILES=${srcdir}/test-files \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS}) - -check_PROGRAMS = \ - test-link \ - test-qif - -EXTRA_DIST = \ - test-files/test-1-bank-txn.qif CMakeLists.txt diff --git a/gnucash/import-export/test/CMakeLists.txt b/gnucash/import-export/test/CMakeLists.txt index e411d2445a..b6fd39a75f 100644 --- a/gnucash/import-export/test/CMakeLists.txt +++ b/gnucash/import-export/test/CMakeLists.txt @@ -22,5 +22,5 @@ GNC_ADD_TEST(test-link-generic-import test-link.c GNC_ADD_TEST(test-import-pending-matches test-import-pending-matches.cpp GENERIC_IMPORT_TEST_INCLUDE_DIRS GENERIC_IMPORT_TEST_LIBS ) -SET_DIST_LIST(test_generic_import_DIST CMakeLists.txt Makefile.am +SET_DIST_LIST(test_generic_import_DIST CMakeLists.txt test-link.c test-import-parse.c test-import-pending-matches.cpp) diff --git a/gnucash/import-export/test/Makefile.am b/gnucash/import-export/test/Makefile.am deleted file mode 100644 index 1c7d573e73..0000000000 --- a/gnucash/import-export/test/Makefile.am +++ /dev/null @@ -1,79 +0,0 @@ -include $(top_srcdir)/test-templates/Makefile.decl - -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/common/test-core \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/app-utils \ - -I${top_srcdir}/gnucash/import-export \ - -I${top_srcdir}/libgnucash/engine/test-core \ - ${GTK_CFLAGS} \ - ${GUILE_CFLAGS} \ - ${GLIB_CFLAGS} - -LDADD = \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${top_builddir}/common/test-core/libtest-core.la \ - ../libgncmod-generic-import.la \ - $(top_builddir)/libgnucash/app-utils/libgncmod-app-utils.la \ - ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${GLIB_LIBS} \ - ${GUILE_LIBS} - -TESTS = \ - test-link \ - test-import-parse \ - test-import-pending-matches - -GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/libgnucash/engine \ - --gnc-module-dir ${top_builddir}/libgnucash/app-utils \ - --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \ - --gnc-module-dir ${top_builddir}/gnucash/import-export \ - --guile-load-dir ${top_builddir}/libgnucash/gnc-module \ - --guile-load-dir ${top_builddir}/libgnucash/scm \ - --guile-load-dir ${top_builddir}/libgnucash/engine \ - --guile-load-dir ${top_builddir}/libgnucash/core-utils \ - --guile-load-dir ${top_builddir}/libgnucash/app-utils \ - --guile-load-dir ${top_builddir}/gnucash/gnome-utils \ -\ - --library-dir ${top_builddir}/libgnucash/core-utils \ - --library-dir ${top_builddir}/libgnucash/app-utils \ - --library-dir ${top_builddir}/gnucash/gnome-utils \ - --library-dir ${top_builddir}/libgnucash/engine \ - --library-dir ${top_builddir}/libgnucash/backend/xml \ - --library-dir ${top_builddir}/libgnucash/backend/sql \ - --library-dir ${top_builddir}/libgnucash/gnc-module - -TESTS_ENVIRONMENT = \ - GUILE_WARN_DEPRECATED=no \ - GNC_BUILDDIR="${abs_top_builddir}" \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS}) - -check_PROGRAMS = \ - test-link \ - test-import-parse \ - test-import-pending-matches - -noinst_PROGRAMS = $(TEST_PROGS) $(check_PROGRAMS) - -test_import_pending_matches_SOURCES = test-import-pending-matches.cpp - -test_import_pending_matches_LDADD = \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ../libgncmod-generic-import.la \ - ${top_builddir}/libgnucash/engine/test-core/libgncmod-test-engine.la \ - ${top_builddir}/common/test-core/libtest-core.la \ - ${GLIB_LIBS} - -test_import_pending_matches_CFLAGS = $(AM_CPPFLAGS) - -clean-local: - rm -f translog.* - -distclean-local: clean-local - -EXTRA_DIST += CMakeLists.txt diff --git a/gnucash/python/CMakeLists.txt b/gnucash/python/CMakeLists.txt index 88f154873b..719203808c 100644 --- a/gnucash/python/CMakeLists.txt +++ b/gnucash/python/CMakeLists.txt @@ -26,6 +26,6 @@ ENDIF() FILE(COPY pycons DESTINATION ${CMAKE_BINARY_DIR}/share/gnucash/python) ENDIF(WITH_PYTHON) -SET_LOCAL_DIST(python_DIST_local CMakeLists.txt Makefile.am gncmod-python.c init.py) +SET_LOCAL_DIST(python_DIST_local CMakeLists.txt gncmod-python.c init.py) SET(python_DIST ${python_DIST_local} ${pycons_DIST} PARENT_SCOPE) diff --git a/gnucash/python/Makefile.am b/gnucash/python/Makefile.am deleted file mode 100644 index b3f79719c0..0000000000 --- a/gnucash/python/Makefile.am +++ /dev/null @@ -1,62 +0,0 @@ -SUBDIRS = pycons -#test - -pkglib_LTLIBRARIES = libgncmod-python.la - -libgncmod_python_la_SOURCES = \ - gncmod-python.c - -libgncmod_python_la_LDFLAGS = -avoid-version \ - ${PYTHON_LDFLAGS} - -libgncmod_python_la_LIBADD = \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils-python.la \ - ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils-python.la \ - ${PYTHON_LIBS} \ - ${PYTHON_EXTRA_LIBS} \ - ${GLIB_LIBS} - -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/gnc-module \ - ${PYTHON_CPPFLAGS} \ - ${GLIB_CFLAGS} - - -gncpymoddir = ${GNC_SHAREDIR}/python/ -gncpymod_DATA = \ - init.py - -if GNUCASH_SEPARATE_BUILDDIR -#For executing test cases -PY_FILE_LINKS = ${gncpymod_DATA} -endif - -.py-links: - $(RM) -rf gnucash - mkdir -p gnucash - mkdir -p gnucash/python -if GNUCASH_SEPARATE_BUILDDIR - for X in ${PY_FILE_LINKS} ; do \ - $(LN_S) -f ${srcdir}/$$X . ; \ - done -endif - ( cd gnucash/python; for A in $(gncpymod_DATA) ; do $(LN_S) -f ../../$$A . ; done ) -if ! OS_WIN32 -# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567). - touch .py-links -endif - -clean-local: - $(RM) -rf gnucash - -noinst_DATA = .py-links - -EXTRA_DIST = ${gncpymod_DATA} CMakeLists.txt - -CLEANFILES = .py-links -DISTCLEANFILES = ${PY_FILE_LINKS} - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.python\" diff --git a/gnucash/python/pycons/CMakeLists.txt b/gnucash/python/pycons/CMakeLists.txt index 3beb27ad59..874bef8c7a 100644 --- a/gnucash/python/pycons/CMakeLists.txt +++ b/gnucash/python/pycons/CMakeLists.txt @@ -10,4 +10,4 @@ SET(pycons_DATA simple_plot.py ) -SET_DIST_LIST(pycons_DIST CMakeLists.txt Makefile.am ${pycons_DATA}) \ No newline at end of file +SET_DIST_LIST(pycons_DIST CMakeLists.txt ${pycons_DATA}) \ No newline at end of file diff --git a/gnucash/python/pycons/Makefile.am b/gnucash/python/pycons/Makefile.am deleted file mode 100644 index 6572cfba14..0000000000 --- a/gnucash/python/pycons/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -SUBDIRS = . - -pyconsdir = ${GNC_SHAREDIR}/python/pycons/ -pycons_DATA = \ - console.py \ - __init__.py \ - ishell.py \ - pycons \ - setup.py \ - shell.py \ - simple_plot.py - - EXTRA_DIST = ${pycons_DATA} CMakeLists.txt - diff --git a/gnucash/register/CMakeLists.txt b/gnucash/register/CMakeLists.txt index ae7f53a185..28192dd8db 100644 --- a/gnucash/register/CMakeLists.txt +++ b/gnucash/register/CMakeLists.txt @@ -2,5 +2,5 @@ ADD_SUBDIRECTORY(ledger-core) ADD_SUBDIRECTORY(register-core) ADD_SUBDIRECTORY(register-gnome) -SET_LOCAL_DIST(register_DIST_local CMakeLists.txt Makefile.am) +SET_LOCAL_DIST(register_DIST_local CMakeLists.txt ) SET(register_DIST ${register_DIST_local} ${ledger_core_DIST} ${register_core_DIST} ${register_gnome_DIST} PARENT_SCOPE) \ No newline at end of file diff --git a/gnucash/register/Makefile.am b/gnucash/register/Makefile.am deleted file mode 100644 index 1741d63504..0000000000 --- a/gnucash/register/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS=register-core register-gnome ledger-core - -EXTRA_DIST = CMakeLists.txt diff --git a/gnucash/register/ledger-core/CMakeLists.txt b/gnucash/register/ledger-core/CMakeLists.txt index 62e4f8a50c..9826f90b69 100644 --- a/gnucash/register/ledger-core/CMakeLists.txt +++ b/gnucash/register/ledger-core/CMakeLists.txt @@ -64,6 +64,6 @@ INSTALL(TARGETS gncmod-ledger-core # No headers to install -SET_LOCAL_DIST(ledger_core_DIST_local CMakeLists.txt Makefile.am ${ledger_core_SOURCES} ${ledger_core_HEADERS}) +SET_LOCAL_DIST(ledger_core_DIST_local CMakeLists.txt ${ledger_core_SOURCES} ${ledger_core_HEADERS}) SET(ledger_core_DIST ${ledger_core_DIST_local} ${test_ledger_core_DIST} PARENT_SCOPE) diff --git a/gnucash/register/ledger-core/Makefile.am b/gnucash/register/ledger-core/Makefile.am deleted file mode 100644 index c0bf2ac861..0000000000 --- a/gnucash/register/ledger-core/Makefile.am +++ /dev/null @@ -1,71 +0,0 @@ -SUBDIRS = . test - -pkglib_LTLIBRARIES = libgncmod-ledger-core.la - -libgncmod_ledger_core_la_SOURCES = \ - gnc-ledger-display.c \ - gnc-ledger-display2.c \ - gncmod-ledger-core.c \ - split-register.c \ - split-register-control.c \ - split-register-layout.c \ - split-register-load.c \ - split-register-model.c \ - split-register-model-save.c \ - split-register-util.c \ - gncEntryLedger.c \ - gncEntryLedgerControl.c \ - gncEntryLedgerDisplay.c \ - gncEntryLedgerLayout.c \ - gncEntryLedgerLoad.c \ - gncEntryLedgerModel.c - -noinst_HEADERS = \ - gnc-ledger-display.h \ - gnc-ledger-display2.h \ - split-register.h \ - split-register-control.h \ - split-register-layout.h \ - split-register-model.h \ - split-register-model-save.h \ - split-register-p.h \ - gncEntryLedger.h \ - gncEntryLedgerP.h \ - gncEntryLedgerControl.h \ - gncEntryLedgerLayout.h \ - gncEntryLedgerModel.h - -libgncmod_ledger_core_la_LDFLAGS = -avoid-version - -libgncmod_ledger_core_la_LIBADD = \ - ${top_builddir}/gnucash/register/register-gnome/libgncmod-register-gnome.la \ - ${top_builddir}/gnucash/register/register-core/libgncmod-register-core.la \ - ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \ - ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${GUILE_LIBS} \ - ${GTK_LIBS} \ - ${GLIB_LIBS} - -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_builddir}/common \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/app-utils \ - -I${top_srcdir}/gnucash/gnome-utils \ - -I${top_builddir}/gnucash/gnome-utils \ - -I${top_srcdir}/gnucash/register/register-core \ - -I${top_srcdir}/gnucash/register/register-gnome \ - ${GUILE_CFLAGS} \ - ${GTK_CFLAGS} \ - ${GLIB_CFLAGS} \ - ${GNOME_CFLAGS} - - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.register.ledger\" - -EXTRA_DIST = CMakeLists.txt diff --git a/gnucash/register/ledger-core/test/CMakeLists.txt b/gnucash/register/ledger-core/test/CMakeLists.txt index a6500d9807..8dbd7d1755 100644 --- a/gnucash/register/ledger-core/test/CMakeLists.txt +++ b/gnucash/register/ledger-core/test/CMakeLists.txt @@ -6,4 +6,4 @@ GNC_ADD_TEST(test-link-module-ledger-core test-link-module.c LEDGER_CORE_TEST_INCLUDE_DIRS LEDGER_CORE_TEST_LIBS ) -SET_DIST_LIST(test_ledger_core_DIST CMakeLists.txt Makefile.am test-link-module.c) \ No newline at end of file +SET_DIST_LIST(test_ledger_core_DIST CMakeLists.txt test-link-module.c) \ No newline at end of file diff --git a/gnucash/register/ledger-core/test/Makefile.am b/gnucash/register/ledger-core/test/Makefile.am deleted file mode 100644 index 34fe1b9f22..0000000000 --- a/gnucash/register/ledger-core/test/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -TESTS = test-link-module - -check_PROGRAMS = test-link-module - -test_link_module_SOURCES=test-link-module.c -test_link_module_LDADD=\ - $(top_builddir)/libgnucash/engine/libgncmod-engine.la \ - $(top_builddir)/libgnucash/app-utils/libgncmod-app-utils.la \ - ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \ - ${top_builddir}/gnucash/gnome/libgnc-gnome.la \ - ../libgncmod-ledger-core.la - -AM_CPPFLAGS = -I${top_srcdir}/common/test-core -I.. ${GLIB_CFLAGS} - -EXTRA_DIST = CMakeLists.txt diff --git a/gnucash/register/register-core/CMakeLists.txt b/gnucash/register/register-core/CMakeLists.txt index bd696bc668..a423122f20 100644 --- a/gnucash/register/register-core/CMakeLists.txt +++ b/gnucash/register/register-core/CMakeLists.txt @@ -62,6 +62,6 @@ INSTALL(TARGETS gncmod-register-core INSTALL(FILES ${register_core_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnucash) -SET_LOCAL_DIST(register_core_DIST_local CMakeLists.txt Makefile.am README ${register_core_SOURCES} ${register_core_HEADERS}) +SET_LOCAL_DIST(register_core_DIST_local CMakeLists.txt README ${register_core_SOURCES} ${register_core_HEADERS}) SET(register_core_DIST ${register_core_DIST_local} ${test_register_core_DIST} PARENT_SCOPE) diff --git a/gnucash/register/register-core/Makefile.am b/gnucash/register/register-core/Makefile.am deleted file mode 100644 index 83324a6db1..0000000000 --- a/gnucash/register/register-core/Makefile.am +++ /dev/null @@ -1,70 +0,0 @@ -SUBDIRS = . test - -pkglib_LTLIBRARIES = libgncmod-register-core.la - -libgncmod_register_core_la_LDFLAGS = -avoid-version - -libgncmod_register_core_la_LIBADD = \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \ - ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \ - ${GUILE_LIBS} \ - ${GLIB_LIBS} - -libgncmod_register_core_la_SOURCES = \ - gncmod-register-core.c \ - basiccell.c \ - cell-factory.c \ - cellblock.c \ - formulacell.c \ - gtable.c \ - numcell.c \ - pricecell.c \ - quickfillcell.c \ - recncell.c \ - checkboxcell.c \ - register-common.c \ - table-allgui.c \ - table-control.c \ - table-layout.c \ - table-model.c - - -gncincludedir = ${GNC_INCLUDE_DIR} -gncinclude_HEADERS = \ - basiccell.h \ - cell-factory.h \ - cellblock.h \ - combocell.h \ - datecell.h \ - formulacell.h \ - gtable.h \ - numcell.h \ - pricecell.h \ - quickfillcell.h \ - recncell.h \ - checkboxcell.h \ - register-common.h \ - table-allgui.h \ - table-control.h \ - table-layout.h \ - table-model.h - -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/app-utils \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/gnucash/gnome-utils \ - ${GUILE_CFLAGS} \ - ${GTK_CFLAGS} \ - ${GLIB_CFLAGS} - -CLEANFILES = $(BUILT_SOURCES) - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.register.core\" - -EXTRA_DIST = CMakeLists.txt diff --git a/gnucash/register/register-core/test/CMakeLists.txt b/gnucash/register/register-core/test/CMakeLists.txt index 79c43a0d50..90ea60d58e 100644 --- a/gnucash/register/register-core/test/CMakeLists.txt +++ b/gnucash/register/register-core/test/CMakeLists.txt @@ -6,4 +6,4 @@ GNC_ADD_TEST(test-link-module-register-core test-link-module.c REGISTER_CORE_TEST_INCLUDE_DIRS REGISTER_CORE_TEST_LIBS ) -SET_DIST_LIST(test_register_core_DIST CMakeLists.txt Makefile.am test-link-module.c) \ No newline at end of file +SET_DIST_LIST(test_register_core_DIST CMakeLists.txt test-link-module.c) \ No newline at end of file diff --git a/gnucash/register/register-core/test/Makefile.am b/gnucash/register/register-core/test/Makefile.am deleted file mode 100644 index b9b3407700..0000000000 --- a/gnucash/register/register-core/test/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -TESTS = \ - test-link-module - -#GNC_TEST_DEPS := \ -# - -#TESTS_ENVIRONMENT := \ -# $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS}) - -check_PROGRAMS = \ - test-link-module - -test_link_module_SOURCES=test-link-module.c -test_link_module_LDADD=\ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \ - ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \ - ../libgncmod-register-core.la - -EXTRA_DIST = CMakeLists.txt - -AM_CPPFLAGS = ${GLIB_CFLAGS} -I${top_srcdir}/common/test-core -I.. diff --git a/gnucash/register/register-gnome/CMakeLists.txt b/gnucash/register/register-gnome/CMakeLists.txt index b6c111a2b4..9bcb78e589 100644 --- a/gnucash/register/register-gnome/CMakeLists.txt +++ b/gnucash/register/register-gnome/CMakeLists.txt @@ -63,6 +63,6 @@ INSTALL(TARGETS gncmod-register-gnome RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) # No headers to install -SET_LOCAL_DIST(register_gnome_DIST_local CMakeLists.txt Makefile.am ${register_gnome_SOURCES} ${register_gnome_noinst_HEADERS}) +SET_LOCAL_DIST(register_gnome_DIST_local CMakeLists.txt ${register_gnome_SOURCES} ${register_gnome_noinst_HEADERS}) SET(register_gnome_DIST ${register_gnome_DIST_local} ${test_register_gnome_DIST} PARENT_SCOPE) diff --git a/gnucash/register/register-gnome/Makefile.am b/gnucash/register/register-gnome/Makefile.am deleted file mode 100644 index 87c45fc211..0000000000 --- a/gnucash/register/register-gnome/Makefile.am +++ /dev/null @@ -1,69 +0,0 @@ -SUBDIRS = . test - -pkglib_LTLIBRARIES = libgncmod-register-gnome.la - -libgncmod_register_gnome_la_LDFLAGS = -avoid-version - -libgncmod_register_gnome_la_LIBADD = \ - ${top_builddir}/gnucash/register/register-core/libgncmod-register-core.la \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \ - ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \ - ${GLIB_LIBS} \ - ${GTK_LIBS} - -libgncmod_register_gnome_la_SOURCES = \ - gncmod-register-gnome.c \ - combocell-gnome.c \ - datecell-gnome.c \ - formulacell-gnome.c \ - gnucash-color.c \ - gnucash-cursor.c \ - gnucash-date-picker.c \ - gnucash-header.c \ - gnucash-item-edit.c \ - gnucash-item-list.c \ - gnucash-register.c \ - gnucash-scrolled-window.c \ - gnucash-sheet-private.c \ - gnucash-sheet.c \ - gnucash-style.c \ - pricecell-gnome.c \ - quickfillcell-gnome.c \ - table-gnome.c - -noinst_HEADERS = \ - formulacell-gnome.h \ - gnucash-color.h \ - gnucash-cursor.h \ - gnucash-date-picker.h \ - gnucash-header.h \ - gnucash-item-edit.h \ - gnucash-item-list.h \ - gnucash-register.h \ - gnucash-scrolled-window.h \ - gnucash-sheet.h \ - gnucash-sheetP.h \ - gnucash-style.h \ - pricecell-gnome.h \ - quickfillcell-gnome.h \ - table-gnome.h - -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/libgnucash/app-utils \ - -I${top_srcdir}/gnucash/gnome-utils \ - -I${top_srcdir}/gnucash/register/ledger-core \ - -I${top_srcdir}/gnucash/register/register-core \ - ${GLIB_CFLAGS} \ - ${GTK_CFLAGS} \ - ${GTK_XIM_FLAGS} - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.register.gnome\" - -EXTRA_DIST = CMakeLists.txt diff --git a/gnucash/register/register-gnome/test/CMakeLists.txt b/gnucash/register/register-gnome/test/CMakeLists.txt index 6268ae3708..d712d810a8 100644 --- a/gnucash/register/register-gnome/test/CMakeLists.txt +++ b/gnucash/register/register-gnome/test/CMakeLists.txt @@ -6,4 +6,4 @@ GNC_ADD_TEST(test-link-module-register-gnome test-link-module.c REGISTER_GNOME_TEST_INCLUDE_DIRS REGISTER_GNOME_TEST_LIBS ) -SET_DIST_LIST(test_register_gnome_DIST CMakeLists.txt Makefile.am test-link-module.c) \ No newline at end of file +SET_DIST_LIST(test_register_gnome_DIST CMakeLists.txt test-link-module.c) \ No newline at end of file diff --git a/gnucash/register/register-gnome/test/Makefile.am b/gnucash/register/register-gnome/test/Makefile.am deleted file mode 100644 index f04642a691..0000000000 --- a/gnucash/register/register-gnome/test/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -TESTS = \ - test-link-module - -#GNC_TEST_DEPS := \ -# - -#TESTS_ENVIRONMENT := \ -# $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS}) - -check_PROGRAMS = \ - test-link-module - -test_link_module_SOURCES = test-link-module.c -test_link_module_LDADD = \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \ - ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \ - ../libgncmod-register-gnome.la - -EXTRA_DIST = CMakeLists.txt - -AM_CPPFLAGS = -I${top_srcdir}/common/test-core -I.. ${GLIB_CFLAGS} diff --git a/gnucash/report/CMakeLists.txt b/gnucash/report/CMakeLists.txt index 4e188d3e79..fb13c2357f 100644 --- a/gnucash/report/CMakeLists.txt +++ b/gnucash/report/CMakeLists.txt @@ -8,6 +8,6 @@ ADD_SUBDIRECTORY(standard-reports) ADD_SUBDIRECTORY(stylesheets) ADD_SUBDIRECTORY(utility-reports) -SET_LOCAL_DIST(report_DIST_local CMakeLists.txt Makefile.am) +SET_LOCAL_DIST(report_DIST_local CMakeLists.txt ) SET(report_DIST ${report_DIST_local} ${business_reports_DIST} ${jqplot_DIST} ${locale_specific_DIST} ${report_gnome_DIST} ${report_system_DIST} ${standard_reports_DIST} ${stylesheets_DIST} ${utility_reports_DIST} PARENT_SCOPE) \ No newline at end of file diff --git a/gnucash/report/Makefile.am b/gnucash/report/Makefile.am deleted file mode 100644 index bd41143cff..0000000000 --- a/gnucash/report/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -NONGUI_SUBDIRS = \ - report-system \ - standard-reports \ - utility-reports \ - business-reports \ - locale-specific \ - jqplot - -GUI_SUBDIRS = \ - report-gnome \ - stylesheets - -if GNUCASH_ENABLE_GUI -SUBDIRS = $(NONGUI_SUBDIRS) $(GUI_SUBDIRS) -else -SUBDIRS = $(NONGUI_SUBDIRS) -endif - -EXTRA_DIST = CMakeLists.txt diff --git a/gnucash/report/business-reports/CMakeLists.txt b/gnucash/report/business-reports/CMakeLists.txt index c55e626807..910065da8b 100644 --- a/gnucash/report/business-reports/CMakeLists.txt +++ b/gnucash/report/business-reports/CMakeLists.txt @@ -36,4 +36,4 @@ GNC_ADD_SCHEME_TARGETS(scm-business-reports INSTALL(FILES ${business_reports_DATA} DESTINATION ${SCHEME_INSTALLED_SOURCE_DIR}/gnucash/report) -SET_DIST_LIST(business_reports_DIST CMakeLists.txt Makefile.am ${business_reports_SCHEME} ${business_reports_DATA}) +SET_DIST_LIST(business_reports_DIST CMakeLists.txt ${business_reports_SCHEME} ${business_reports_DATA}) diff --git a/gnucash/report/business-reports/Makefile.am b/gnucash/report/business-reports/Makefile.am deleted file mode 100644 index 07bc62b7ce..0000000000 --- a/gnucash/report/business-reports/Makefile.am +++ /dev/null @@ -1,97 +0,0 @@ -gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/report -gncscmmod_DATA = \ - aging.scm \ - customer-summary.scm \ - easy-invoice.scm \ - fancy-invoice.scm \ - taxinvoice.scm \ - receipt.scm \ - invoice.scm \ - job-report.scm \ - owner-report.scm \ - payables.scm \ - receivables.scm \ - balsheet-eg.scm \ - business-reports.scm - -# Note: list these files separately because they can't be compiled by guile2 -# templates are a mixture of scheme and hmtl -# css files are not scheme at all -gncscmtpldir = ${GNC_SCM_INSTALL_DIR}/gnucash/report -gncscmtpl_DATA = \ - taxinvoice.eguile.scm \ - taxinvoice.css \ - receipt.eguile.scm \ - receipt.css \ - balsheet-eg.css \ - balsheet-eg.eguile.scm - -if GNUCASH_SEPARATE_BUILDDIR -SCM_FILE_LINKS = ${gncscmmod_DATA} \ - ${gncscmtpl_DATA} -endif - -.scm-links: - $(RM) -rf gnucash - mkdir -p gnucash - mkdir -p gnucash/report -if GNUCASH_SEPARATE_BUILDDIR - for X in ${SCM_FILE_LINKS} ; do \ - $(LN_S) -f ${srcdir}/$$X . ; \ - done -endif - ( cd gnucash/report; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../../$$A . ; done ) -if ! OS_WIN32 -# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567). - touch .scm-links -endif - -GUILE_COMPILE_ENV = \ - --gnc-module-dir ${top_builddir}/libgnucash/app-utils \ - --gnc-module-dir ${top_builddir}/libgnucash/engine \ - --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \ - --gnc-module-dir ${top_builddir}/gnucash/html \ - --gnc-module-dir ${top_builddir}/gnucash/report/report-system \ - --guile-load-dir ${top_builddir}/libgnucash/app-utils \ - --guile-load-dir ${top_builddir}/libgnucash/core-utils \ - --guile-load-dir ${top_builddir}/libgnucash/engine \ - --guile-load-dir ${top_builddir}/libgnucash/gnc-module \ - --guile-load-dir ${top_builddir}/gnucash/gnome-utils \ - --guile-load-dir ${top_builddir}/gnucash/report/report-system \ - --guile-load-dir ${top_builddir}/gnucash/report/standard-reports \ - --guile-load-dir ${top_builddir}/gnucash/report/business-reports \ - --guile-load-dir ${top_builddir}/libgnucash/scm \ - --library-dir ${top_builddir}/libgnucash/engine \ - --library-dir ${top_builddir}/libgnucash/app-utils \ - --library-dir ${top_builddir}/libgnucash/core-utils \ - --library-dir ${top_builddir}/gnucash/gnome-utils \ - --library-dir ${top_builddir}/libgnucash/backend/xml \ - --library-dir ${top_builddir}/libgnucash/backend/sql \ - --library-dir ${top_builddir}/gnucash/html \ - --library-dir ${top_builddir}/libgnucash/gnc-module \ - --library-dir ${top_builddir}/gnucash/report/report-system - - -%.go : %.scm .scm-links $(pkglib_LTLIBRARIES) - GNC_UNINSTALLED=yes \ - GNC_BUILDDIR=${top_builddir} \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \ - $(GUILD) compile -o $@ $< - -gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report -gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) - -clean-local: - $(RM) -rf gnucash - -noinst_DATA = .scm-links - -EXTRA_DIST = \ - ${gncscmmod_DATA} \ - ${gncscmtpl_DATA} \ - CMakeLists.txt - -CLEANFILES = .scm-links ${gncscmmodcache_DATA} -DISTCLEANFILES = ${SCM_FILE_LINKS} - -AM_CPPFLAGS = -DG_LOG_DOMAIN=\"gnc.business.reports\" diff --git a/gnucash/report/jqplot/CMakeLists.txt b/gnucash/report/jqplot/CMakeLists.txt index cd7fbf8f19..6bbf52a9d6 100644 --- a/gnucash/report/jqplot/CMakeLists.txt +++ b/gnucash/report/jqplot/CMakeLists.txt @@ -32,4 +32,4 @@ SET(gncjqplot_DATA INSTALL(FILES ${gncjqplot_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/jqplot) -SET_DIST_LIST(jqplot_DIST CMakeLists.txt Makefile.am jquery.js ${gncjqplot_DATA}) +SET_DIST_LIST(jqplot_DIST CMakeLists.txt jquery.js ${gncjqplot_DATA}) diff --git a/gnucash/report/jqplot/Makefile.am b/gnucash/report/jqplot/Makefile.am deleted file mode 100644 index 610d5f1675..0000000000 --- a/gnucash/report/jqplot/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -SUBDIRS = . - -gncjqplotdir = ${GNC_SHAREDIR}/jqplot/ -gncjqplot_DATA = \ - jquery.min.js \ - jquery.jqplot.js \ - jquery.jqplot.css \ - plugins/jqplot.barRenderer.js \ - plugins/jqplot.BezierCurveRenderer.js \ - plugins/jqplot.blockRenderer.js \ - plugins/jqplot.bubbleRenderer.js \ - plugins/jqplot.canvasAxisLabelRenderer.js \ - plugins/jqplot.canvasAxisTickRenderer.js \ - plugins/jqplot.canvasTextRenderer.js \ - plugins/jqplot.categoryAxisRenderer.js \ - plugins/jqplot.ciParser.js \ - plugins/jqplot.cursor.js \ - plugins/jqplot.dateAxisRenderer.js \ - plugins/jqplot.donutRenderer.js \ - plugins/jqplot.dragable.js \ - plugins/jqplot.enhancedLegendRenderer.js \ - plugins/jqplot.funnelRenderer.js \ - plugins/jqplot.highlighter.js \ - plugins/jqplot.json2.js \ - plugins/jqplot.logAxisRenderer.js \ - plugins/jqplot.mekkoAxisRenderer.js \ - plugins/jqplot.mekkoRenderer.js \ - plugins/jqplot.meterGaugeRenderer.js \ - plugins/jqplot.ohlcRenderer.js \ - plugins/jqplot.pieRenderer.js \ - plugins/jqplot.pointLabels.js \ - plugins/jqplot.trendline.js - -# Also ship jquery.js since it is the source for jquery.min.js -EXTRA_DIST = \ - ${gncjqplot_DATA} \ - jquery.js \ - CMakeLists.txt diff --git a/gnucash/report/locale-specific/CMakeLists.txt b/gnucash/report/locale-specific/CMakeLists.txt index 160fed9d5c..59354bfb7d 100644 --- a/gnucash/report/locale-specific/CMakeLists.txt +++ b/gnucash/report/locale-specific/CMakeLists.txt @@ -1,4 +1,4 @@ ADD_SUBDIRECTORY(us) -SET_LOCAL_DIST(locale_specific_DIST_local CMakeLists.txt Makefile.am) +SET_LOCAL_DIST(locale_specific_DIST_local CMakeLists.txt ) SET(locale_specific_DIST ${locale_specific_DIST_local} ${locale_specific_us_DIST} PARENT_SCOPE) \ No newline at end of file diff --git a/gnucash/report/locale-specific/Makefile.am b/gnucash/report/locale-specific/Makefile.am deleted file mode 100644 index a40468e2dc..0000000000 --- a/gnucash/report/locale-specific/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = us - -EXTRA_DIST = CMakeLists.txt diff --git a/gnucash/report/locale-specific/us/CMakeLists.txt b/gnucash/report/locale-specific/us/CMakeLists.txt index a6ecc2e467..085aab2d26 100644 --- a/gnucash/report/locale-specific/us/CMakeLists.txt +++ b/gnucash/report/locale-specific/us/CMakeLists.txt @@ -46,7 +46,7 @@ GNC_ADD_SCHEME_TARGETS(scm-report-locale-specific-2 FALSE ) -SET_LOCAL_DIST(locale_specific_us_DIST_local CMakeLists.txt Makefile.am +SET_LOCAL_DIST(locale_specific_us_DIST_local CMakeLists.txt ${locale_reports_us_SOURCES} ${gncmod_local_reports_us_SCHEME_1} ${gncmod_local_reports_us_SCHEME_2}) SET(locale_specific_us_DIST ${locale_specific_us_DIST_local} ${test_locale_specific_us_DIST} PARENT_SCOPE) diff --git a/gnucash/report/locale-specific/us/Makefile.am b/gnucash/report/locale-specific/us/Makefile.am deleted file mode 100644 index bcf84f681d..0000000000 --- a/gnucash/report/locale-specific/us/Makefile.am +++ /dev/null @@ -1,111 +0,0 @@ -SUBDIRS = . test - -pkglib_LTLIBRARIES = libgncmod-locale-reports-us.la - -libgncmod_locale_reports_us_la_SOURCES = \ - gncmod-locale-reports-us.c - -libgncmod_locale_reports_us_la_LDFLAGS = -avoid-version - -libgncmod_locale_reports_us_la_LIBADD = \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - $(top_builddir)/libgnucash/app-utils/libgncmod-app-utils.la \ - $(top_builddir)/gnucash/gnome-utils/libgncmod-gnome-utils.la \ - ${GUILE_LIBS} \ - ${GLIB_LIBS} - - -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_srcdir}/libgnucash/gnc-module \ - ${GUILE_CFLAGS} ${GLIB_CFLAGS} - -## This is unused and therefore no longer installed and/or loaded -gncscmrptdir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/locale-specific -gncscmrpt_DATA = us.scm de_DE.scm - -gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/ -gncscmmod_DATA = taxtxf.scm taxtxf-de_DE.scm - -if GNUCASH_SEPARATE_BUILDDIR -#For executing test cases -SCM_FILE_LINKS = \ - ${gncscmrpt_DATA} \ - ${gncscmmod_DATA} -endif - -.scm-links: - $(RM) -rf gnucash - mkdir -p gnucash - mkdir -p gnucash/report - mkdir -p gnucash/report/locale-specific -if GNUCASH_SEPARATE_BUILDDIR - for X in ${SCM_FILE_LINKS} ; do \ - $(LN_S) -f ${srcdir}/$$X . ; \ - done -endif - ( cd gnucash/report/locale-specific; for A in $(gncscmrpt_DATA) ; do $(LN_S) -f ../../../$$A . ; done ) - ( cd gnucash/report; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../../$$A . ; done ) -if ! OS_WIN32 -# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567). - touch .scm-links -endif - -GUILE_COMPILE_ENV = \ - --gnc-module-dir ${top_builddir}/libgnucash/app-utils \ - --gnc-module-dir ${top_builddir}/libgnucash/engine \ - --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \ - --gnc-module-dir ${top_builddir}/gnucash/html \ - --gnc-module-dir ${top_builddir}/gnucash/report/report-system \ - --gnc-module-dir ${top_builddir}/gnucash/report/locale-specific/us \ - --gnc-module-dir ${top_builddir}/libgnucash/tax/us \ - --guile-load-dir ${top_builddir}/libgnucash/app-utils \ - --guile-load-dir ${top_builddir}/libgnucash/core-utils \ - --guile-load-dir ${top_builddir}/libgnucash/engine \ - --guile-load-dir ${top_builddir}/libgnucash/gnc-module \ - --guile-load-dir ${top_builddir}/gnucash/gnome-utils \ - --guile-load-dir ${top_builddir}/gnucash/report/report-system \ - --guile-load-dir ${top_builddir}/gnucash/report/locale-specific/us \ - --guile-load-dir ${top_builddir}/libgnucash/scm \ - --guile-load-dir ${top_builddir}/libgnucash/tax/us \ - --library-dir ${top_builddir}/libgnucash/engine \ - --library-dir ${top_builddir}/libgnucash/app-utils \ - --library-dir ${top_builddir}/libgnucash/core-utils \ - --library-dir ${top_builddir}/libgnucash/gnc-module \ - --library-dir ${top_builddir}/gnucash/gnome-utils \ - --library-dir ${top_builddir}/libgnucash/backend/xml \ - --library-dir ${top_builddir}/libgnucash/backend/sql \ - --library-dir ${top_builddir}/gnucash/html \ - --library-dir ${top_builddir}/gnucash/report/report-system \ - --library-dir ${top_builddir}/gnucash/report/locale-specific/us - -%.go : %.scm .scm-links $(pkglib_LTLIBRARIES) - GNC_UNINSTALLED=yes \ - GNC_BUILDDIR=${top_builddir} \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \ - $(GUILD) compile -o $@ $< - -gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report -gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) - -gncscmrptcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report/locale-specific -gncscmrptcache_DATA = $(gncscmrpt_DATA:.scm=.go) - -clean-local: - $(RM) -rf gnucash - -noinst_DATA = .scm-links - -EXTRA_DIST = \ - ${gncscmmod_DATA} \ - ${gncscmrpt_DATA} \ - CMakeLists.txt - -CLEANFILES = \ - .scm-links \ - ${gncscmmodcache_DATA} \ - ${gncscmrptcache_DATA} - -DISTCLEANFILES = ${SCM_FILE_LINKS} - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.report.locale.us\" diff --git a/gnucash/report/locale-specific/us/test/CMakeLists.txt b/gnucash/report/locale-specific/us/test/CMakeLists.txt index d5db185441..4b846316bc 100644 --- a/gnucash/report/locale-specific/us/test/CMakeLists.txt +++ b/gnucash/report/locale-specific/us/test/CMakeLists.txt @@ -21,4 +21,4 @@ GNC_ADD_TEST(test-link-module-report-locale-specific-us test-link-module.c # ) #GNC_ADD_SCHEME_TESTS(test-load-report-locale-specific-us-module.scm) -SET_DIST_LIST(test_locale_specific_us_DIST CMakeLists.txt Makefile.am test-link-module.c test-load-report-locale-specific-module.scm) +SET_DIST_LIST(test_locale_specific_us_DIST CMakeLists.txt test-link-module.c test-load-report-locale-specific-module.scm) diff --git a/gnucash/report/locale-specific/us/test/Makefile.am b/gnucash/report/locale-specific/us/test/Makefile.am deleted file mode 100644 index 18c7ff97c8..0000000000 --- a/gnucash/report/locale-specific/us/test/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -TESTS = test-link-module - -GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/libgnucash/engine \ - --gnc-module-dir ${top_builddir}/libgnucash/tax/us \ - --gnc-module-dir ${top_builddir}/gnucash/report/report-system \ - --gnc-module-dir ${top_builddir}/gnucash/report/locale-specific/us \ - --guile-load-dir ${top_builddir}/libgnucash/gnc-module \ - --guile-load-dir ${top_builddir}/libgnucash/engine \ - --guile-load-dir ${top_builddir}/libgnucash/tax/us \ - --library-dir ${top_builddir}/libgnucash/core-utils \ - --library-dir ${top_builddir}/libgnucash/gnc-module \ - --library-dir ${top_builddir}/libgnucash/engine \ - --library-dir ${top_builddir}/libgnucash/app-utils - -TESTS_ENVIRONMENT = \ - GUILE_WARN_DEPRECATED=no \ - GUILE="${GUILE}" \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS}) - -check_PROGRAMS = test-link-module - -testit: - ${TESTS_ENVIRONMENT} gdb guile - -test_link_module_SOURCES = test-link-module.c -test_link_module_LDADD= \ - ${top_builddir}/gnucash/report/locale-specific/us/libgncmod-locale-reports-us.la - -EXTRA_DIST = CMakeLists.txt diff --git a/gnucash/report/report-gnome/CMakeLists.txt b/gnucash/report/report-gnome/CMakeLists.txt index 2e83ac626b..ee2996a9f4 100644 --- a/gnucash/report/report-gnome/CMakeLists.txt +++ b/gnucash/report/report-gnome/CMakeLists.txt @@ -74,6 +74,6 @@ INSTALL(FILES ${report_gnome_UI} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/u FILE(COPY ${report_gnome_UI} DESTINATION ${DATADIR_BUILD}/gnucash/ui) FILE(COPY ${report_gnome_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder) -SET_LOCAL_DIST(report_gnome_DIST_local CMakeLists.txt Makefile.am report-gnome.i ${report_gnome_HEADERS} ${report_gnome_SOURCES} +SET_LOCAL_DIST(report_gnome_DIST_local CMakeLists.txt report-gnome.i ${report_gnome_HEADERS} ${report_gnome_SOURCES} ${report_gnome_SCHEME} ${report_gnome_GLADE} ${report_gnome_UI}) SET(report_gnome_DIST ${report_gnome_DIST_local} ${test_report_gnome_DIST} PARENT_SCOPE) diff --git a/gnucash/report/report-gnome/Makefile.am b/gnucash/report/report-gnome/Makefile.am deleted file mode 100644 index 88b945f132..0000000000 --- a/gnucash/report/report-gnome/Makefile.am +++ /dev/null @@ -1,138 +0,0 @@ -SUBDIRS = . test - -pkglib_LTLIBRARIES = libgncmod-report-gnome.la - -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_builddir}/common \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/app-utils \ - -I${top_srcdir}/gnucash/gnome-utils \ - -I${top_srcdir}/gnucash/gnome \ - -I${top_srcdir}/gnucash/html \ - -I${top_srcdir}/gnucash/report/report-system \ - ${GUILE_CFLAGS} \ - ${GTK_CFLAGS} \ - ${GLIB_CFLAGS} - -libgncmod_report_gnome_la_SOURCES = \ - swig-report-gnome.c \ - dialog-report-column-view.c \ - dialog-custom-report.c \ - dialog-report-style-sheet.c \ - gnc-plugin-page-report.c \ - gncmod-report-gnome.c \ - window-report.c - -gncincludedir = ${GNC_INCLUDE_DIR} -gncinclude_HEADERS = \ - dialog-report-column-view.h \ - dialog-custom-report.h \ - dialog-report-style-sheet.h \ - gnc-plugin-page-report.h \ - window-report.h - -libgncmod_report_gnome_la_LDFLAGS = -avoid-version - -libgncmod_report_gnome_la_LIBADD = \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \ - ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \ - ${top_builddir}/gnucash/html/libgncmod-html.la \ - ${top_builddir}/gnucash/report/report-system/libgncmod-report-system.la \ - ${GUILE_LIBS} \ - ${GLIB_LIBS} - -if BUILDING_FROM_VCS -swig-report-gnome.c: report-gnome.i ${top_srcdir}/common/base-typemaps.i - $(SWIG) -guile -Linkage module \ - -I${top_srcdir}/common -o $@ $< -endif - -gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/report -gncscmmod_DATA = report-gnome.scm - -noinst_DATA = .scm-links - -gtkbuilderdir = $(GNC_GTKBUILDER_DIR) -gtkbuilder_DATA = \ - dialog-report.glade \ - dialog-custom-report.glade - -uidir = $(GNC_UI_DIR) - -ui_DATA = \ - gnc-plugin-page-report-ui.xml - -EXTRA_DIST = \ - report-gnome.i \ - ${gtkbuilder_DATA} \ - ${gncscmmod_DATA} \ - ${ui_DATA} \ - CMakeLists.txt - -if GNUCASH_SEPARATE_BUILDDIR -#Only needed when srcdir and builddir are different -# for running -SCM_FILE_LINKS = ${gncscmmod_DATA} -endif - -.scm-links: - $(RM) -rf gnucash - mkdir -p gnucash - mkdir -p gnucash/report -if GNUCASH_SEPARATE_BUILDDIR - for X in ${SCM_FILE_LINKS} ; do \ - $(LN_S) -f ${srcdir}/$$X . ; \ - done -endif - ( cd gnucash/report; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../../$$A . ; done ) -if ! OS_WIN32 -# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567). - touch .scm-links -endif - -GUILE_COMPILE_ENV = \ - --gnc-module-dir ${top_builddir}/libgnucash/app-utils \ - --gnc-module-dir ${top_builddir}/libgnucash/engine \ - --gnc-module-dir ${top_builddir}/gnucash/html \ - --gnc-module-dir ${top_builddir}/gnucash/report/report-system \ - --guile-load-dir ${top_builddir}/libgnucash/app-utils \ - --guile-load-dir ${top_builddir}/libgnucash/core-utils \ - --guile-load-dir ${top_builddir}/libgnucash/engine \ - --guile-load-dir ${top_builddir}/libgnucash/gnc-module \ - --guile-load-dir ${top_builddir}/gnucash/gnome-utils \ - --guile-load-dir ${top_builddir}/gnucash/report/report-system \ - --guile-load-dir ${top_builddir}/gnucash/report/utility-reports \ - --guile-load-dir ${top_builddir}/libgnucash/scm \ - --library-dir ${top_builddir}/libgnucash/engine \ - --library-dir ${top_builddir}/libgnucash/app-utils \ - --library-dir ${top_builddir}/libgnucash/core-utils \ - --library-dir ${top_builddir}/libgnucash/gnc-module \ - --library-dir ${top_builddir}/gnucash/gnome-utils \ - --library-dir ${top_builddir}/libgnucash/backend/xml \ - --library-dir ${top_builddir}/libgnucash/backend/sql \ - --library-dir ${top_builddir}/gnucash/html \ - --library-dir ${top_builddir}/gnucash/report/report-system \ - --library-dir ${top_builddir}/gnucash/report/report-gnome - -%.go : %.scm .scm-links $(pkglib_LTLIBRARIES) - GNC_UNINSTALLED=yes \ - GNC_BUILDDIR=${top_builddir} \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \ - $(GUILD) compile -o $@ $< - -gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report -gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) - -clean-local: - rm -rf gnucash - -CLEANFILES = report .scm-links ${SCM_FILE_LINKS} ${gncscmmodcache_DATA} -MAINTAINERCLEANFILES = swig-report-gnome.c - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.report.gui\" diff --git a/gnucash/report/report-gnome/test/CMakeLists.txt b/gnucash/report/report-gnome/test/CMakeLists.txt index 7005e96fdc..0ec6df2497 100644 --- a/gnucash/report/report-gnome/test/CMakeLists.txt +++ b/gnucash/report/report-gnome/test/CMakeLists.txt @@ -25,5 +25,5 @@ GNC_ADD_SCHEME_TARGETS(scm-test-load-report-gnome-module ) GNC_ADD_SCHEME_TESTS(test-load-report-gnome-module.scm) -SET_DIST_LIST(test_report_gnome_DIST CMakeLists.txt Makefile.am test-link-module.c test-load-report-gnome-module.scm) +SET_DIST_LIST(test_report_gnome_DIST CMakeLists.txt test-link-module.c test-load-report-gnome-module.scm) diff --git a/gnucash/report/report-gnome/test/Makefile.am b/gnucash/report/report-gnome/test/Makefile.am deleted file mode 100644 index fb66d7b522..0000000000 --- a/gnucash/report/report-gnome/test/Makefile.am +++ /dev/null @@ -1,74 +0,0 @@ -AM_CPPFLAGS = \ - -I${top_srcdir} \ - -I${top_srcdir}/common \ - -I${top_srcdir}/common/test-core \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/gnc-module \ - ${GUILE_CFLAGS} \ - ${GLIB_CFLAGS} - -LDADD = \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${top_builddir}/gnucash/report/report-gnome/libgncmod-report-gnome.la \ - $(top_builddir)/libgnucash/app-utils/libgncmod-app-utils.la \ - ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \ - ${GLIB_LIBS} \ - ${GUILE_LIBS} - -TESTS = \ - test-link-module \ - ${SCM_TESTS} - -GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/libgnucash/engine \ - --gnc-module-dir ${top_builddir}/libgnucash/app-utils \ - --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \ - --gnc-module-dir ${top_builddir}/gnucash/html \ - --gnc-module-dir ${top_builddir}/gnucash/report/report-system \ - --gnc-module-dir ${top_builddir}/gnucash/report/report-gnome \ -\ - --guile-load-dir ${top_builddir}/libgnucash/gnc-module \ - --guile-load-dir ${top_builddir}/libgnucash/scm \ - --guile-load-dir ${top_builddir}/libgnucash/engine \ - --guile-load-dir ${top_builddir}/libgnucash/core-utils \ - --guile-load-dir ${top_builddir}/libgnucash/app-utils \ - --guile-load-dir ${top_builddir}/gnucash/gnome-utils \ - --guile-load-dir ${top_builddir}/gnucash/report/report-system \ - --guile-load-dir ${top_builddir}/gnucash/report/standard-reports \ - --guile-load-dir ${top_builddir}/gnucash/report/business-reports \ - --guile-load-dir ${top_builddir}/gnucash/report/utility-reports \ - --guile-load-dir ${top_builddir}/gnucash/report/report-gnome \ -\ - --library-dir ${top_builddir}/gnucash/report/report-gnome \ - --library-dir ${top_builddir}/gnucash/report/report-system \ - --library-dir ${top_builddir}/libgnucash/core-utils \ - --library-dir ${top_builddir}/libgnucash/app-utils \ - --library-dir ${top_builddir}/libgnucash/gnc-module \ - --library-dir ${top_builddir}/libgnucash/engine \ - --library-dir ${top_builddir}/libgnucash/backend/xml \ - --library-dir ${top_builddir}/libgnucash/backend/sql \ - --library-dir ${top_builddir}/gnucash/gnome-utils \ - --library-dir ${top_builddir}/gnucash/html \ - --library-dir ${top_builddir}/gnucash/report/report-system \ - --library-dir ${top_builddir}/gnucash/report/report-gnome - - -TESTS_ENVIRONMENT = \ - GUILE_WARN_DEPRECATED=no \ - GUILE="${GUILE}" \ - GNC_BUILDDIR="${abs_top_builddir}" \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS}) - - -SCM_TESTS = test-load-report-gnome-module -SCM_TEST_SRCS = $(SCM_TESTS:%=%.scm) - -$(SCM_TESTS): %: $(srcdir)/%.scm Makefile - echo 'export GNC_BUILDDIR="${abs_top_builddir}";' > $@ - echo 'export GNC_UNINSTALLED=yes;' >> $@ - echo '${GUILE} --debug -l $(srcdir)/$*.scm -c "(exit (run-test))"' >> $@ - chmod a+x $@ - -check_PROGRAMS = test-link-module - -EXTRA_DIST = ${SCM_TEST_SRCS} CMakeLists.txt diff --git a/gnucash/report/report-system/CMakeLists.txt b/gnucash/report/report-system/CMakeLists.txt index d8c4a77c97..0ed1d8e0ea 100644 --- a/gnucash/report/report-system/CMakeLists.txt +++ b/gnucash/report/report-system/CMakeLists.txt @@ -111,7 +111,7 @@ GNC_ADD_SCHEME_TARGETS(scm-report-system-3 FALSE ) -SET_LOCAL_DIST(report_system_DIST_local CMakeLists.txt Makefile.am +SET_LOCAL_DIST(report_system_DIST_local CMakeLists.txt report-system.i ${report_system_HEADERS} ${report_system_SOURCES} ${report_system_SCHEME} ${report_system_SCHEME_1} diff --git a/gnucash/report/report-system/Makefile.am b/gnucash/report/report-system/Makefile.am deleted file mode 100644 index d92f372a10..0000000000 --- a/gnucash/report/report-system/Makefile.am +++ /dev/null @@ -1,161 +0,0 @@ -SUBDIRS = . test - -pkglib_LTLIBRARIES = libgncmod-report-system.la - -libgncmod_report_system_la_SOURCES = \ - swig-report-system.c \ - gncmod-report-system.c \ - gnc-report.c - -gncincludedir = ${GNC_INCLUDE_DIR} -gncinclude_HEADERS = \ - gnc-report.h - -libgncmod_report_system_la_LDFLAGS = -avoid-version - -libgncmod_report_system_la_LIBADD = \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${GUILE_LIBS} \ - ${GLIB_LIBS} \ - ${GTK_LIBS} - -if BUILDING_FROM_VCS -swig-report-system.c: report-system.i ${top_srcdir}/common/base-typemaps.i - $(SWIG) -guile -Linkage module \ - -I${top_srcdir}/common -o $@ $< -endif - -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/libgnucash/app-utils \ - -I${top_srcdir}/libgnucash/engine \ - ${GLIB_CFLAGS} \ - ${GTK_CFLAGS} \ - ${GUILE_CFLAGS} - -gncscmdir = ${GNC_SCM_INSTALL_DIR} -gncscm_DATA = \ - commodity-utilities.scm \ - html-acct-table.scm \ - html-barchart.scm \ - html-document.scm \ - html-fonts.scm \ - html-piechart.scm \ - html-scatter.scm \ - html-linechart.scm \ - html-style-info.scm \ - html-style-sheet.scm \ - html-table.scm \ - html-text.scm \ - html-utilities.scm \ - html-jqplot.scm \ - options-utilities.scm \ - report-utilities.scm \ - report.scm - -gncmodscmdir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/report-system -gncmodscm_DATA = \ - collectors.scm \ - list-extras.scm \ - report-collectors.scm - -gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/ -gncscmmod_DATA = \ - report-system.scm \ - eguile-gnc.scm \ - eguile-utilities.scm \ - eguile-html-utilities.scm - -if GNUCASH_SEPARATE_BUILDDIR -#For executing test cases -# for running -SCM_FILE_LINKS = \ - ${gncscmmod_DATA} \ - ${gncscm_DATA} \ - ${gncmodscm_DATA} -endif - -.scm-links: - $(RM) -rf gnucash - mkdir -p gnucash - mkdir -p gnucash/report - mkdir -p gnucash/report/report-system -if GNUCASH_SEPARATE_BUILDDIR - for X in ${SCM_FILE_LINKS} ; do \ - $(LN_S) -f ${srcdir}/$$X . ; \ - done -endif - ( cd gnucash/report; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../../$$A . ; done ) - ( cd gnucash/report/report-system; for A in $(gncmodscm_DATA) ; do $(LN_S) -f ../../../$$A . ; done ) -if ! OS_WIN32 -# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567). - touch .scm-links -endif - -GUILE_COMPILE_ENV = \ - --gnc-module-dir ${top_builddir}/libgnucash/app-utils \ - --gnc-module-dir ${top_builddir}/libgnucash/engine \ - --gnc-module-dir ${top_builddir}/gnucash/html \ - --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \ - --gnc-module-dir ${top_builddir}/gnucash/report/report-system \ - --guile-load-dir ${top_builddir}/libgnucash/app-utils \ - --guile-load-dir ${top_builddir}/libgnucash/core-utils \ - --guile-load-dir ${top_builddir}/libgnucash/engine \ - --guile-load-dir ${top_builddir}/libgnucash/gnc-module \ - --guile-load-dir ${top_builddir}/gnucash/gnome-utils \ - --guile-load-dir ${top_builddir}/libgnucash/scm \ - --guile-load-dir ${top_builddir}/gnucash/report/report-system \ - --library-dir ${top_builddir}/libgnucash/engine \ - --library-dir ${top_builddir}/libgnucash/app-utils \ - --library-dir ${top_builddir}/libgnucash/core-utils \ - --library-dir ${top_builddir}/libgnucash/gnc-module \ - --library-dir ${top_builddir}/gnucash/gnome-utils \ - --library-dir ${top_builddir}/libgnucash/backend/xml \ - --library-dir ${top_builddir}/libgnucash/backend/sql \ - --library-dir ${top_builddir}/gnucash/html \ - --library-dir ${top_builddir}/gnucash/report/report-system - -%.go : %.scm .scm-links $(pkglib_LTLIBRARIES) - GNC_UNINSTALLED=yes \ - GNC_BUILDDIR=${top_builddir} \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \ - $(GUILD) compile -o $@ $< - -gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report -gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) - -gncmodscmcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report/report-system -gncmodscmcache_DATA = $(gncmodscm_DATA:.scm=.go) - -gncscmcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@ -gncscmcache_DATA = $(gncscm_DATA:.scm=.go) - -noinst_DATA = .scm-links - -EXTRA_DIST = \ - report-system.i \ - ${gncscmmod_DATA} \ - ${gncscm_DATA} \ - ${gncmodscm_DATA} \ - CMakeLists.txt - -clean-local: - rm -rf gnucash - -CLEANFILES = \ - report \ - .scm-links \ - ${SCM_FILE_LINKS} \ - ${gncscmmodcache_DATA} \ - ${gncmodscmcache_DATA} \ - ${gncscmcache_DATA} - -MAINTAINERCLEANFILES = swig-report-system.c - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.report.core\" diff --git a/gnucash/report/report-system/test/CMakeLists.txt b/gnucash/report/report-system/test/CMakeLists.txt index 5d35d15076..536f4f0fdc 100644 --- a/gnucash/report/report-system/test/CMakeLists.txt +++ b/gnucash/report/report-system/test/CMakeLists.txt @@ -36,7 +36,7 @@ GNC_ADD_SCHEME_TARGETS(scm-test-report-system-2 SET_DIST_LIST(test_report_system_DIST CMakeLists.txt - Makefile.am + ${scm_test_report_system_SOURCES} test-extras.scm test-link-module.c diff --git a/gnucash/report/report-system/test/Makefile.am b/gnucash/report/report-system/test/Makefile.am deleted file mode 100644 index b79dadc447..0000000000 --- a/gnucash/report/report-system/test/Makefile.am +++ /dev/null @@ -1,100 +0,0 @@ -AM_CPPFLAGS = \ - -I${top_srcdir} \ - -I${top_srcdir}/common \ - -I${top_srcdir}/common/test-core \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/gnc-module \ - ${GUILE_CFLAGS} \ - ${GLIB_CFLAGS} - -LDADD = \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${GLIB_LIBS} \ - ${GUILE_LIBS} - -TESTS = \ - test-link-module \ - $(SCM_TESTS) - -SCM_TESTS = \ - test-load-report-system-module \ - test-collectors \ - test-list-extras \ - test-report-utilities - -SCM_TEST_SRCS = $(SCM_TESTS:%=%.scm) - -GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/libgnucash/engine \ - --gnc-module-dir ${top_builddir}/libgnucash/app-utils \ - --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \ - --gnc-module-dir ${top_builddir}/gnucash/html \ - --gnc-module-dir ${top_builddir}/gnucash/report/report-system \ - --gnc-module-dir ${top_builddir}/gnucash/report/report-system/test \ - --gnc-module-dir ${top_builddir}/libgnucash/engine/test \ - --gnc-module-dir ${top_builddir}/libgnucash/backend/xml \ - --gnc-module-dir ${top_builddir}/libgnucash/backend/sql \ - --gnc-module-dir ${top_builddir}/libgnucash/backend/dbi \ - \ - --guile-load-dir ${top_builddir}/libgnucash/gnc-module \ - --guile-load-dir ${top_builddir}/libgnucash/scm \ - --guile-load-dir ${top_builddir}/libgnucash/engine \ - --guile-load-dir ${top_builddir}/libgnucash/engine/test \ - --guile-load-dir ${top_builddir}/libgnucash/core-utils \ - --guile-load-dir ${top_builddir}/libgnucash/app-utils \ - --guile-load-dir ${top_builddir}/gnucash/gnome-utils \ - --guile-load-dir ${top_builddir}/gnucash/report/report-system \ - --guile-load-dir ${top_builddir}/gnucash/report/report-system/test \ -\ - --library-dir ${top_builddir}/gnucash/report/report-system \ - --library-dir ${top_builddir}/libgnucash/core-utils \ - --library-dir ${top_builddir}/libgnucash/app-utils \ - --library-dir ${top_builddir}/gnucash/gnome-utils \ - --library-dir ${top_builddir}/libgnucash/engine \ - --library-dir ${top_builddir}/libgnucash/backend/xml \ - --library-dir ${top_builddir}/libgnucash/backend/sql \ - --library-dir ${top_builddir}/libgnucash/backend/dbi \ - --library-dir ${top_builddir}/libgnucash/gnc-module - -$(SCM_TESTS): %: $(srcdir)/%.scm Makefile .scm-links - echo 'export GNC_BUILDDIR="${abs_top_builddir}";' > $@ - echo 'export GNC_UNINSTALLED=yes;' >> $@ - echo '${GUILE} --debug -l $(srcdir)/$*.scm -c "(exit (run-test))"' >> $@ - chmod a+x $@ - -TESTS_ENVIRONMENT = \ - GUILE_WARN_DEPRECATED=no \ - GUILE="${GUILE}" \ - GNC_BUILDDIR="${abs_top_builddir}" \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS}) - - -check_PROGRAMS = test-link-module - -SCM_TEST_HELPERS = test-extras.scm - -EXTRA_DIST = \ - $(SCM_TEST_HELPERS) \ - $(SCM_TEST_SRCS) \ - CMakeLists.txt - -testit: - $(TESTS_ENVIRONMENT) libtool --mode execute gdb test-link-module - - -.scm-links: - $(RM) -rf gnucash - mkdir -p gnucash/report/report-system/test - ( cd gnucash/report/report-system/test; for A in $(SCM_TEST_HELPERS) ; do $(LN_S) -f $(abs_srcdir)/$$A . ; done ) -if ! OS_WIN32 -# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567). - touch .scm-links -endif - -clean-local: - $(RM) -rf gnucash - $(RM) *.log - -noinst_DATA = .scm-links -CLEANFILES = .scm-links -DISTCLEANFILES = $(SCM_TESTS) diff --git a/gnucash/report/standard-reports/CMakeLists.txt b/gnucash/report/standard-reports/CMakeLists.txt index fa7be34043..c9bd6c18c3 100644 --- a/gnucash/report/standard-reports/CMakeLists.txt +++ b/gnucash/report/standard-reports/CMakeLists.txt @@ -60,5 +60,5 @@ FILE(COPY standard-reports.scm DESTINATION ${STD_RPT_DIR}) FILE(MAKE_DIRECTORY ${STD_RPT_DIR}/standard-reports) FILE(COPY ${standard_reports_SCHEME_2} DESTINATION ${STD_RPT_DIR}/standard-reports) -SET_LOCAL_DIST(standard_reports_DIST_local CMakeLists.txt Makefile.am ${standard_reports_SCHEME} ${standard_reports_SCHEME_2}) +SET_LOCAL_DIST(standard_reports_DIST_local CMakeLists.txt ${standard_reports_SCHEME} ${standard_reports_SCHEME_2}) SET(standard_reports_DIST ${standard_reports_DIST_local} ${test_standard_reports_DIST} PARENT_SCOPE) diff --git a/gnucash/report/standard-reports/Makefile.am b/gnucash/report/standard-reports/Makefile.am deleted file mode 100644 index da4320617e..0000000000 --- a/gnucash/report/standard-reports/Makefile.am +++ /dev/null @@ -1,114 +0,0 @@ -SUBDIRS = . test - -gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/ -gncscmmod_DATA = \ - standard-reports.scm - -gncscmrptdir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/standard-reports -gncscmrpt_DATA = \ - account-piecharts.scm \ - account-summary.scm \ - advanced-portfolio.scm \ - average-balance.scm \ - balance-sheet.scm \ - budget.scm \ - budget-balance-sheet.scm \ - budget-barchart.scm \ - budget-flow.scm \ - budget-income-statement.scm \ - cash-flow.scm \ - cashflow-barchart.scm \ - category-barchart.scm \ - daily-reports.scm \ - equity-statement.scm \ - general-journal.scm \ - general-ledger.scm \ - income-gst-statement.scm \ - income-statement.scm \ - net-barchart.scm \ - net-linechart.scm \ - portfolio.scm \ - price-scatter.scm \ - register.scm \ - sx-summary.scm \ - trial-balance.scm \ - transaction.scm - - - -if GNUCASH_SEPARATE_BUILDDIR -#For executing test cases -SCM_FILE_LINKS = ${gncscmmod_DATA} ${gncscmrpt_DATA} -endif - -.scm-links: - $(RM) -rf gnucash - mkdir -p gnucash - mkdir -p gnucash/report - mkdir -p gnucash/report/standard-reports -if GNUCASH_SEPARATE_BUILDDIR - for X in ${SCM_FILE_LINKS} ; do \ - $(LN_S) -f ${srcdir}/$$X . ; \ - done -endif - ( cd gnucash/report; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../../$$A . ; done ) - ( cd gnucash/report/standard-reports; for A in $(gncscmrpt_DATA) ; do $(LN_S) -f ../../../$$A . ; done ) -if ! OS_WIN32 -# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567). - touch .scm-links -endif - -GUILE_COMPILE_ENV = \ - --gnc-module-dir ${top_builddir}/libgnucash/app-utils \ - --gnc-module-dir ${top_builddir}/libgnucash/engine \ - --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \ - --gnc-module-dir ${top_builddir}/gnucash/html \ - --gnc-module-dir ${top_builddir}/gnucash/report/report-system \ - --guile-load-dir ${top_builddir}/libgnucash/app-utils \ - --guile-load-dir ${top_builddir}/libgnucash/core-utils \ - --guile-load-dir ${top_builddir}/libgnucash/engine \ - --guile-load-dir ${top_builddir}/libgnucash/gnc-module \ - --guile-load-dir ${top_builddir}/gnucash/gnome-utils \ - --guile-load-dir ${top_builddir}/gnucash/report/report-system \ - --guile-load-dir ${top_builddir}/gnucash/report/standard-reports \ - --guile-load-dir ${top_builddir}/libgnucash/scm \ - --library-dir ${top_builddir}/libgnucash/engine \ - --library-dir ${top_builddir}/libgnucash/app-utils \ - --library-dir ${top_builddir}/libgnucash/core-utils \ - --library-dir ${top_builddir}/libgnucash/gnc-module \ - --library-dir ${top_builddir}/gnucash/gnome-utils \ - --library-dir ${top_builddir}/libgnucash/backend/xml \ - --library-dir ${top_builddir}/libgnucash/backend/sql \ - --library-dir ${top_builddir}/gnucash/html \ - --library-dir ${top_builddir}/gnucash/report/report-system - -%.go : %.scm .scm-links $(pkglib_LTLIBRARIES) - GNC_UNINSTALLED=yes \ - GNC_BUILDDIR=${top_builddir} \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \ - $(GUILD) compile -o $@ $< - -gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report -gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) - -gncscmrptcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report/standard-reports -gncscmrptcache_DATA = $(gncscmrpt_DATA:.scm=.go) - -clean-local: - $(RM) -rf gnucash - -noinst_DATA = .scm-links - -EXTRA_DIST = \ - ${gncscmmod_DATA} \ - ${gncscmrpt_DATA} \ - CMakeLists.txt - -CLEANFILES = \ - .scm-links \ - ${gncscmmodcache_DATA} \ - ${gncscmrptcache_DATA} - -DISTCLEANFILES = ${SCM_FILE_LINKS} - -AM_CPPFLAGS = -DG_LOG_DOMAIN=\"gnc.report.standard\" diff --git a/gnucash/report/standard-reports/test/CMakeLists.txt b/gnucash/report/standard-reports/test/CMakeLists.txt index 00d20cb96f..690a755127 100644 --- a/gnucash/report/standard-reports/test/CMakeLists.txt +++ b/gnucash/report/standard-reports/test/CMakeLists.txt @@ -28,5 +28,5 @@ GNC_ADD_SCHEME_TARGETS(scm-test-standard-reports FALSE ) -SET_DIST_LIST(test_standard_reports_DIST CMakeLists.txt Makefile.am +SET_DIST_LIST(test_standard_reports_DIST CMakeLists.txt ${scm_test_standard_reports_SOURCES} ${scm_test_report_SUPPORT}) diff --git a/gnucash/report/standard-reports/test/Makefile.am b/gnucash/report/standard-reports/test/Makefile.am deleted file mode 100644 index 6a14249e6f..0000000000 --- a/gnucash/report/standard-reports/test/Makefile.am +++ /dev/null @@ -1,92 +0,0 @@ -TESTS = $(SCM_TESTS) - -SCM_TESTS = \ - test-cash-flow \ - test-cashflow-barchart \ - test-standard-category-report \ - test-standard-net-barchart \ - test-standard-net-linechart - -# test-generic-category-report.scm,test-generic-net-barchart, and -# test-generic-net-linechart are support files used by the respective -# test-standard-* - -SCM_TEST_SRCS = $(SCM_TESTS:%=%.scm) - -GNC_TEST_DEPS = \ - --gnc-module-dir ${top_builddir}/libgnucash/engine \ - --gnc-module-dir ${top_builddir}/libgnucash/engine/test \ - --gnc-module-dir ${top_builddir}/libgnucash/app-utils \ - --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \ - --gnc-module-dir ${top_builddir}/gnucash/html \ - --gnc-module-dir ${top_builddir}/gnucash/report/app-utils \ - --gnc-module-dir ${top_builddir}/gnucash/report/report-system \ - --gnc-module-dir ${top_builddir}/gnucash/report/report-system/test \ -\ - --guile-load-dir ${top_builddir}/libgnucash/gnc-module \ - --guile-load-dir ${top_builddir}/libgnucash/scm \ - --guile-load-dir ${top_builddir}/libgnucash/engine \ - --guile-load-dir ${top_builddir}/libgnucash/engine/test \ - --guile-load-dir ${top_builddir}/libgnucash/core-utils \ - --guile-load-dir ${top_builddir}/libgnucash/app-utils \ - --guile-load-dir ${top_builddir}/gnucash/gnome-utils \ - --guile-load-dir ${top_builddir}/gnucash/report/report-system \ - --guile-load-dir ${top_builddir}/gnucash/report/report-system/test \ - --guile-load-dir ${top_builddir}/gnucash/report/standard-reports \ - --guile-load-dir ${top_builddir}/gnucash/report/standard-reports/test \ - --guile-load-dir ${top_builddir}/gnucash/report/stylesheets \ -\ - --library-dir ${top_builddir}/gnucash/report/report-system \ - --library-dir ${top_builddir}/libgnucash/core-utils \ - --library-dir ${top_builddir}/libgnucash/app-utils \ - --library-dir ${top_builddir}/gnucash/gnome-utils \ - --library-dir ${top_builddir}/libgnucash/engine \ - --library-dir ${top_builddir}/libgnucash/backend/xml \ - --library-dir ${top_builddir}/libgnucash/backend/sql \ - --library-dir ${top_builddir}/libgnucash/gnc-module - -$(SCM_TESTS): %: $(srcdir)/%.scm Makefile .scm-links - echo 'export GNC_BUILDDIR="${abs_top_builddir}";' > $@ - echo 'export GNC_UNINSTALLED=yes;' >> $@ - echo '${GUILE} --debug -l $(srcdir)/$*.scm -c "(exit (run-test))"' >> $@ - chmod a+x $@ - -TESTS_ENVIRONMENT = \ - GUILE_WARN_DEPRECATED=no \ - GUILE="${GUILE}" \ - GNC_BUILDDIR="${abs_top_builddir}" \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS}) - - -SCM_TEST_HELPERS = \ - test-generic-category-report.scm \ - test-generic-net-barchart.scm \ - test-generic-net-linechart.scm - -EXTRA_DIST = \ - $(SCM_TEST_HELPERS) \ - $(SCM_TEST_SRCS) \ - CMakeLists.txt - -.scm-links: - $(RM) -rf gnucash - mkdir -p gnucash/report/standard-reports/test - ( cd gnucash/report/standard-reports/test; for A in $(SCM_TEST_HELPERS) ; do $(LN_S) -f $(abs_srcdir)/$$A . ; done ) -if ! OS_WIN32 -# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567). - touch .scm-links -endif - -interp: - $(TESTS_ENVIRONMENT) ${GUILE} --debug - -debug: - $(TESTS_ENVIRONMENT) gdb --args $(shell cat $(TEST)) - -clean-local: - $(RM) -rf gnucash - -noinst_DATA = .scm-links -CLEANFILES = .scm-links *.log -DISTCLEANFILES = $(SCM_TESTS) - diff --git a/gnucash/report/stylesheets/CMakeLists.txt b/gnucash/report/stylesheets/CMakeLists.txt index f10de9a4c2..2bb245bb78 100644 --- a/gnucash/report/stylesheets/CMakeLists.txt +++ b/gnucash/report/stylesheets/CMakeLists.txt @@ -73,7 +73,7 @@ INSTALL(FILES ${stylesheets_UI} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/ui FILE(COPY ${stylesheets_UI} DESTINATION ${DATADIR_BUILD}/gnucash/ui) -SET_LOCAL_DIST(stylesheets_DIST_local CMakeLists.txt Makefile.am +SET_LOCAL_DIST(stylesheets_DIST_local CMakeLists.txt ${stylesheets_SOURCES} ${stylesheets_noinst_HEADERS} ${stylesheets_SCHEME_1} ${stylesheets_SCHEME_2} ${stylesheets_UI}) diff --git a/gnucash/report/stylesheets/Makefile.am b/gnucash/report/stylesheets/Makefile.am deleted file mode 100644 index a33bc4f87b..0000000000 --- a/gnucash/report/stylesheets/Makefile.am +++ /dev/null @@ -1,114 +0,0 @@ -SUBDIRS = . test - -pkglib_LTLIBRARIES = libgncmod-stylesheets.la - -libgncmod_stylesheets_la_SOURCES = \ - gnc-plugin-stylesheets.c \ - gncmod-stylesheets.c - -noinst_HEADERS = \ - gnc-plugin-stylesheets.h - -libgncmod_stylesheets_la_LDFLAGS = -module -avoid-version - -libgncmod_stylesheets_la_LIBADD = \ - ${top_builddir}/gnucash/report/report-gnome/libgncmod-report-gnome.la \ - ${top_builddir}/gnucash/report/report-system/libgncmod-report-system.la \ - ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${GUILE_LIBS} \ - ${GTK_LIBS} \ - ${GLIB_LIBS} - -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/app-utils \ - -I${top_srcdir}/gnucash/gnome \ - -I${top_srcdir}/gnucash/gnome-utils \ - -I${top_srcdir}/gnucash/report/report-gnome \ - ${GUILE_CFLAGS} \ - ${GLIB_CFLAGS} \ - ${GTK_CFLAGS} - -gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/ -gncscmmod_DATA = \ - stylesheets.scm \ - stylesheet-plain.scm \ - stylesheet-fancy.scm \ - stylesheet-footer.scm \ - stylesheet-easy.scm \ - stylesheet-head-or-tail.scm - -if GNUCASH_SEPARATE_BUILDDIR -#For executing test cases -SCM_FILE_LINKS = ${gncscmmod_DATA} -endif - -.scm-links: - $(RM) -rf gnucash - mkdir -p gnucash - mkdir -p gnucash/report -if GNUCASH_SEPARATE_BUILDDIR - for X in ${SCM_FILE_LINKS} ; do \ - $(LN_S) -f ${srcdir}/$$X . ; \ - done -endif - ( cd gnucash/report; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../../$$A . ; done ) -if ! OS_WIN32 -# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567). - touch .scm-links -endif - -GUILE_COMPILE_ENV = \ - --gnc-module-dir ${top_builddir}/libgnucash/app-utils \ - --gnc-module-dir ${top_builddir}/libgnucash/engine \ - --gnc-module-dir ${top_builddir}/gnucash/html \ - --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \ - --gnc-module-dir ${top_builddir}/gnucash/report/report-system \ - --gnc-module-dir ${top_builddir}/gnucash/report/stylesheets \ - --guile-load-dir ${top_builddir}/libgnucash/app-utils \ - --guile-load-dir ${top_builddir}/libgnucash/core-utils \ - --guile-load-dir ${top_builddir}/libgnucash/engine \ - --guile-load-dir ${top_builddir}/libgnucash/gnc-module \ - --guile-load-dir ${top_builddir}/gnucash/gnome-utils \ - --guile-load-dir ${top_builddir}/gnucash/report/report-system \ - --guile-load-dir ${top_builddir}/gnucash/report/stylesheets \ - --guile-load-dir ${top_builddir}/libgnucash/scm \ - --library-dir ${top_builddir}/libgnucash/engine \ - --library-dir ${top_builddir}/libgnucash/app-utils \ - --library-dir ${top_builddir}/libgnucash/core-utils \ - --library-dir ${top_builddir}/libgnucash/gnc-module \ - --library-dir ${top_builddir}/gnucash/gnome-utils \ - --library-dir ${top_builddir}/libgnucash/backend/xml \ - --library-dir ${top_builddir}/libgnucash/backend/sql \ - --library-dir ${top_builddir}/gnucash/html \ - --library-dir ${top_builddir}/gnucash/report/report-system \ - --library-dir ${top_builddir}/gnucash/report/stylesheets - -%.go : %.scm .scm-links $(pkglib_LTLIBRARIES) - GNC_UNINSTALLED=yes \ - GNC_BUILDDIR=${top_builddir} \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \ - $(GUILD) compile -o $@ $< - -gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report -gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) - -clean-local: - $(RM) -rf gnucash - -noinst_DATA = .scm-links - -uidir = $(GNC_UI_DIR) -dist_ui_DATA = \ - gnc-plugin-stylesheets-ui.xml - -EXTRA_DIST = ${gncscmmod_DATA} CMakeLists.txt - -CLEANFILES = .scm-links ${gncscmmodcache_DATA} -DISTCLEANFILES = ${SCM_FILE_LINKS} - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.report.core\" diff --git a/gnucash/report/stylesheets/test/CMakeLists.txt b/gnucash/report/stylesheets/test/CMakeLists.txt index 5d58607dbd..afd54e105c 100644 --- a/gnucash/report/stylesheets/test/CMakeLists.txt +++ b/gnucash/report/stylesheets/test/CMakeLists.txt @@ -21,4 +21,4 @@ GNC_ADD_SCHEME_TARGETS(scm-test-load-report-stylesheets-module GNC_ADD_SCHEME_TESTS("test-load-report-stylesheets-module.scm") -SET_DIST_LIST(test_stylesheets_DIST CMakeLists.txt Makefile.am test-load-report-stylesheets-module.scm) +SET_DIST_LIST(test_stylesheets_DIST CMakeLists.txt test-load-report-stylesheets-module.scm) diff --git a/gnucash/report/stylesheets/test/Makefile.am b/gnucash/report/stylesheets/test/Makefile.am deleted file mode 100644 index 998140d26f..0000000000 --- a/gnucash/report/stylesheets/test/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -TESTS = ${SCM_TESTS} - -GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/libgnucash/engine \ - --gnc-module-dir ${top_builddir}/libgnucash/app-utils \ - --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \ - --gnc-module-dir ${top_builddir}/gnucash/html \ - --gnc-module-dir ${top_builddir}/gnucash/report/report-system \ - --gnc-module-dir ${top_builddir}/gnucash/report/stylesheets \ -\ - --guile-load-dir ${top_builddir}/common/test-core \ - --guile-load-dir ${top_builddir}/libgnucash/gnc-module \ - --guile-load-dir ${top_builddir}/libgnucash/engine \ - --guile-load-dir ${top_builddir}/libgnucash/scm \ - --guile-load-dir ${top_builddir}/libgnucash/core-utils \ - --guile-load-dir ${top_builddir}/libgnucash/app-utils \ - --guile-load-dir ${top_builddir}/gnucash/gnome-utils \ - --guile-load-dir ${top_builddir}/gnucash/report/report-system \ - --guile-load-dir ${top_builddir}/gnucash/report/stylesheets \ -\ - --library-dir ${top_builddir}/common/test-core \ - --library-dir ${top_builddir}/libgnucash/core-utils \ - --library-dir ${top_builddir}/libgnucash/gnc-module \ - --library-dir ${top_builddir}/libgnucash/engine \ - --library-dir ${top_builddir}/libgnucash/backend/xml \ - --library-dir ${top_builddir}/libgnucash/backend/sql \ - --library-dir ${top_builddir}/libgnucash/app-utils \ - --library-dir ${top_builddir}/gnucash/gnome-utils \ - --library-dir ${top_builddir}/gnucash/html \ - --library-dir ${top_builddir}/gnucash/report/report-system \ - --library-dir ${top_builddir}/gnucash/report/report-gnome - -TESTS_ENVIRONMENT = \ - GUILE_WARN_DEPRECATED=no \ - GUILE="${GUILE}" \ - GNC_BUILDDIR="${abs_top_builddir}" \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS}) - -SCM_TESTS = test-load-report-stylesheets-module -SCM_TEST_SRCS = $(SCM_TESTS:%=%.scm) - -$(SCM_TESTS): %: $(srcdir)/%.scm Makefile - echo 'export GNC_BUILDDIR="${abs_top_builddir}";' > $@ - echo 'export GNC_UNINSTALLED=yes;' >> $@ - echo '${GUILE} --debug -l $(srcdir)/$*.scm -c "(exit (run-test))"' >> $@ - chmod a+x $@ - -EXTRA_DIST = \ - ${SCM_TEST_SRCS} \ - CMakeLists.txt diff --git a/gnucash/report/utility-reports/CMakeLists.txt b/gnucash/report/utility-reports/CMakeLists.txt index 64ffc1e558..f06540f1eb 100644 --- a/gnucash/report/utility-reports/CMakeLists.txt +++ b/gnucash/report/utility-reports/CMakeLists.txt @@ -17,6 +17,6 @@ GNC_ADD_SCHEME_TARGETS(scm-utility-reports TRUE ) -SET_LOCAL_DIST(utility_reports_DIST_local CMakeLists.txt Makefile.am +SET_LOCAL_DIST(utility_reports_DIST_local CMakeLists.txt ${utility_reports_SCHEME}) SET(utility_reports_DIST ${utility_reports_DIST_local} ${test_utility_reports_DIST} PARENT_SCOPE) diff --git a/gnucash/report/utility-reports/Makefile.am b/gnucash/report/utility-reports/Makefile.am deleted file mode 100644 index f5df74d27e..0000000000 --- a/gnucash/report/utility-reports/Makefile.am +++ /dev/null @@ -1,74 +0,0 @@ -gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/ -gncscmmod_DATA = \ - hello-world.scm \ - utility-reports.scm \ - view-column.scm \ - welcome-to-gnucash.scm - -# test-graphing.scm -- not intended for general public?!? Surely not translated at all. - -if GNUCASH_SEPARATE_BUILDDIR -#For separate build directory -SCM_FILE_LINKS = \ - ${gncscmmod_DATA} -endif - -.scm-links: - $(RM) -rf gnucash - mkdir -p gnucash - mkdir -p gnucash/report -if GNUCASH_SEPARATE_BUILDDIR - for X in ${SCM_FILE_LINKS} ; do \ - $(LN_S) -f ${srcdir}/$$X . ; \ - done -endif - ( cd gnucash/report; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../../$$A . ; done ) -if ! OS_WIN32 -# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567). - touch .scm-links -endif - -GUILE_COMPILE_ENV = \ - --gnc-module-dir ${top_builddir}/libgnucash/app-utils \ - --gnc-module-dir ${top_builddir}/libgnucash/engine \ - --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \ - --gnc-module-dir ${top_builddir}/gnucash/html \ - --gnc-module-dir ${top_builddir}/gnucash/report/report-system \ - --guile-load-dir ${top_builddir}/libgnucash/app-utils \ - --guile-load-dir ${top_builddir}/libgnucash/core-utils \ - --guile-load-dir ${top_builddir}/libgnucash/engine \ - --guile-load-dir ${top_builddir}/libgnucash/gnc-module \ - --guile-load-dir ${top_builddir}/gnucash/gnome-utils \ - --guile-load-dir ${top_builddir}/gnucash/report/report-system \ - --guile-load-dir ${top_builddir}/gnucash/report/utility-reports \ - --guile-load-dir ${top_builddir}/libgnucash/scm \ - --library-dir ${top_builddir}/libgnucash/engine \ - --library-dir ${top_builddir}/libgnucash/app-utils \ - --library-dir ${top_builddir}/libgnucash/core-utils \ - --library-dir ${top_builddir}/libgnucash/gnc-module \ - --library-dir ${top_builddir}/gnucash/gnome-utils \ - --library-dir ${top_builddir}/libgnucash/backend/xml \ - --library-dir ${top_builddir}/libgnucash/backend/sql \ - --library-dir ${top_builddir}/gnucash/html \ - --library-dir ${top_builddir}/gnucash/report/report-system - -%.go : %.scm .scm-links $(pkglib_LTLIBRARIES) - GNC_UNINSTALLED=yes \ - GNC_BUILDDIR=${top_builddir} \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \ - $(GUILD) compile -o $@ $< - -gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report -gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) - -clean-local: - $(RM) -rf gnucash - -noinst_DATA = .scm-links - -EXTRA_DIST = ${gncscmmod_DATA} CMakeLists.txt - -CLEANFILES = .scm-links ${gncscmmodcache_DATA} -DISTCLEANFILES = ${SCM_FILE_LINKS} - -AM_CPPFLAGS = -DG_LOG_DOMAIN=\"gnc.report.util\" diff --git a/libgnucash/CMakeLists.txt b/libgnucash/CMakeLists.txt index f03434248a..fc13ea9c48 100644 --- a/libgnucash/CMakeLists.txt +++ b/libgnucash/CMakeLists.txt @@ -13,7 +13,7 @@ ADD_SUBDIRECTORY (tax) ADD_DEFINITIONS (-DHAVE_CONFIG_H) -SET_LOCAL_DIST(libgnucash_DIST_local CMakeLists.txt Makefile.am ${libgnucash_EXTRA_DIST}) +SET_LOCAL_DIST(libgnucash_DIST_local CMakeLists.txt ${libgnucash_EXTRA_DIST}) SET(libgnucash_DIST ${libgnucash_DIST_local} ${app_utils_DIST} ${backend_DIST} ${core_utils_DIST} ${doc_DIST} ${engine_DIST} ${gnc_module_DIST} diff --git a/libgnucash/Makefile.am b/libgnucash/Makefile.am deleted file mode 100644 index 3b222b69ef..0000000000 --- a/libgnucash/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# These directories do not contain any gtk dependencies -# Note the unusual ordering of some test directories. This is -# because test-core depends on engine and the test directories -# in turn depend on test-core. This would not have been necessary -# if we had only one big Makefile instead of a recursive build. -# As we intend to move to cmake it's not worth fixing this any more. -SUBDIRS = \ - doc \ - core-utils \ - gnc-module \ - engine \ - ../common/test-core \ - core-utils/test \ - gnc-module/test \ - engine/test \ - backend \ - scm \ - quotes \ - app-utils \ - tax diff --git a/libgnucash/app-utils/CMakeLists.txt b/libgnucash/app-utils/CMakeLists.txt index ab073600c8..9f213316b5 100644 --- a/libgnucash/app-utils/CMakeLists.txt +++ b/libgnucash/app-utils/CMakeLists.txt @@ -209,6 +209,6 @@ ADD_CUSTOM_TARGET(scm-app-utils ALL DEPENDS scm-app-utils-3 scm-app-utils-2 scm- SET_LOCAL_DIST(app_utils_DIST_local ${app_utils_ALL_SOURCES} gettext.scm ${app_utils_SCHEME_1} ${app_utils_SCHEME_2} ${app_utils_SCHEME_3} - app-utils.i CMakeLists.txt gnc-help-utils.c Makefile.am + app-utils.i CMakeLists.txt gnc-help-utils.c make-prefs-migration-script.xsl migratable-prefs.xml.in README) SET(app_utils_DIST ${app_utils_DIST_local} ${test_app_utils_DIST} PARENT_SCOPE) diff --git a/libgnucash/app-utils/Makefile.am b/libgnucash/app-utils/Makefile.am deleted file mode 100644 index 87cef708b2..0000000000 --- a/libgnucash/app-utils/Makefile.am +++ /dev/null @@ -1,231 +0,0 @@ -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, contact: -# -# Free Software Foundation Voice: +1-617-542-5942 -# 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 -# Boston, MA 02110-1301, USA gnu@gnu.org - -SUBDIRS = . test - -pkglib_LTLIBRARIES = libgncmod-app-utils.la - -AM_CPPFLAGS = \ - -Wno-error=deprecated-declarations \ - -I$(top_srcdir)/borrowed/libc \ - -I${top_srcdir}/common \ - -I${top_builddir}/common \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/libgnucash/app-utils/calculation \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/backend \ - ${GUILE_CFLAGS} \ - ${PYTHON_CPPFLAGS} \ - ${GLIB_CFLAGS} \ - ${LIBXML2_CFLAGS} \ - ${LIBXSLT_CFLAGS} - -libgncmod_app_utils_la_SOURCES = \ - calculation/expression_parser.c \ - calculation/fin.c \ - swig-app-utils-guile.c \ - business-helpers.c \ - business-options.c \ - QuickFill.c \ - file-utils.c \ - gfec.c \ - gnc-account-merge.c \ - gnc-accounting-period.c \ - gnc-addr-quickfill.c \ - gnc-component-manager.c \ - gnc-entry-quickfill.c \ - gnc-euro.c \ - gnc-exp-parser.c \ - gnc-gettext-util.c \ - gnc-gsettings.c \ - gnc-helpers.c \ - gnc-prefs-utils.c \ - gnc-sx-instance-model.c \ - gnc-state.c \ - gncmod-app-utils.c \ - gnc-ui-balances.c \ - gnc-ui-util.c \ - guile-util.c \ - option-util.c - -gncincludedir = ${GNC_INCLUDE_DIR} -gncinclude_HEADERS = \ - QuickFill.h \ - business-helpers.h \ - business-options.h \ - file-utils.h \ - gfec.h \ - gnc-basic-gobject.h \ - gnc-account-merge.h \ - gnc-accounting-period.h \ - gnc-addr-quickfill.h \ - gnc-component-manager.h \ - gnc-entry-quickfill.h \ - gnc-euro.h \ - gnc-exp-parser.h \ - gnc-gettext-util.h \ - gnc-gsettings.h \ - gnc-help-utils.h \ - gnc-helpers.h \ - gnc-prefs-utils.h \ - gnc-sx-instance-model.h \ - gnc-state.h \ - gnc-ui-balances.h \ - gnc-ui-util.h \ - guile-util.h \ - option-util.h - -libgncmod_app_utils_la_LDFLAGS = -avoid-version - -libgncmod_app_utils_la_LIBADD = \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${GUILE_LIBS} \ - ${GLIB_LIBS} \ - ${LIBXML2_LIBS} \ - ${LIBXSLT_LIBS} - -if BUILDING_FROM_VCS -swig-app-utils-guile.c: app-utils.i ${top_srcdir}/common/base-typemaps.i - $(SWIG) -guile -Linkage module \ - -I${top_srcdir}/common -o $@ $< - -swig-app-utils-python.c: app-utils.i ${top_srcdir}/common/base-typemaps.i - $(SWIG) -python -Wall -Werror \ - -I${GLIB_CFLAGS} -I${top_srcdir}/common -o $@ $< -endif - -if WITH_PYTHON -pkglib_LTLIBRARIES += libgncmod-app-utils-python.la - -libgncmod_app_utils_python_la_SOURCES = \ - swig-app-utils-python.c - -libgncmod_app_utils_python_la_LDFLAGS = \ - ${PYTHON_LDFLAGS} - -libgncmod_app_utils_python_la_LIBADD = \ - ${PYTHON_LIBS} \ - ${PYTHON_EXTRA_LIBS} \ - libgncmod-app-utils.la -endif - -gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash -gncscmmod_DATA = \ - gettext.scm \ - app-utils.scm - -gncscmdir = ${GNC_SCM_INSTALL_DIR} -gncscm_DATA = \ - business-options.scm \ - business-prefs.scm \ - c-interface.scm \ - config-var.scm \ - date-utilities.scm \ - hooks.scm \ - migrate-prefs.scm \ - options.scm \ - prefs.scm \ - simple-obj.scm - -prefsmigrationdir = $(GNC_SHAREDIR) -prefsmigration_DATA = \ - make-prefs-migration-script.xsl \ - migratable-prefs.xml - -noinst_DATA = .scm-links - -noinst_HEADERS = \ - calculation/finvar.h \ - calculation/finproto.h \ - calculation/fin_spl_protos.h \ - calculation/fin_static_proto.h - -EXTRA_DIST = \ - swig-app-utils-python.c \ - app-utils.i \ - ${gncscmmod_DATA} \ - ${gncscm_DATA} \ - ${prefsmigration_DATA} \ - CMakeLists.txt - -if OS_WIN32 -libgncmod_app_utils_la_SOURCES += gnc-help-utils.c -libgncmod_app_utils_la_LIBADD += $(HTMLHELP_LIBS) -else -EXTRA_DIST += gnc-help-utils.c -endif - -if GNUCASH_SEPARATE_BUILDDIR -#For executing test cases -SCM_FILE_LINKS = \ - ${gncscmmod_DATA} \ - ${gncscm_DATA} -endif - -.scm-links: - $(RM) -rf gnucash - mkdir -p gnucash -if GNUCASH_SEPARATE_BUILDDIR - for X in ${SCM_FILE_LINKS} ; do \ - $(LN_S) -f ${srcdir}/$$X . ; \ - done -endif - ( cd gnucash; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../$$A . ; done ) -if ! OS_WIN32 -# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567). - touch .scm-links -endif - -GUILE_COMPILE_ENV = \ - --gnc-module-dir ${top_builddir}/libgnucash/engine \ - --guile-load-dir ${top_builddir}/libgnucash/app-utils \ - --guile-load-dir ${top_builddir}/libgnucash/core-utils \ - --guile-load-dir ${top_builddir}/libgnucash/engine \ - --guile-load-dir ${top_builddir}/libgnucash/gnc-module \ - --guile-load-dir ${top_builddir}/libgnucash/scm \ - --library-dir ${top_builddir}/libgnucash/core-utils \ - --library-dir ${top_builddir}/libgnucash/gnc-module \ - --library-dir ${top_builddir}/libgnucash/engine \ - --library-dir ${top_builddir}/libgnucash/app-utils - -%.go : %.scm .scm-links $(pkglib_LTLIBRARIES) - GNC_UNINSTALLED=yes \ - GNC_BUILDDIR=${top_builddir} \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \ - $(GUILD) compile -o $@ $< - -gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash -gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) - -gncscmcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@ -gncscmcache_DATA = $(gncscm_DATA:.scm=.go) - -clean-local: - rm -rf gnucash - -CLEANFILES = \ - ${SCM_FILE_LINKS} \ - .scm-links \ - ${gncscmcache_DATA} \ - ${gncscmmodcache_DATA} - -MAINTAINERCLEANFILES = swig-app-utils-guile.c swig-app-utils-python.c - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.app-utils\" diff --git a/libgnucash/app-utils/test/CMakeLists.txt b/libgnucash/app-utils/test/CMakeLists.txt index e343331dbb..54b9fd6324 100644 --- a/libgnucash/app-utils/test/CMakeLists.txt +++ b/libgnucash/app-utils/test/CMakeLists.txt @@ -63,7 +63,7 @@ GNC_ADD_TEST_WITH_GUILE(test-app-utils "${test_app_utils_SOURCES}" APP_UTILS_TES SET_DIST_LIST(test_app_utils_DIST CMakeLists.txt - Makefile.am + test-exp-parser.c test-link-module.c test-print-parse-amount.cpp diff --git a/libgnucash/app-utils/test/Makefile.am b/libgnucash/app-utils/test/Makefile.am deleted file mode 100644 index 5a25f24a2f..0000000000 --- a/libgnucash/app-utils/test/Makefile.am +++ /dev/null @@ -1,87 +0,0 @@ -include $(top_srcdir)/test-templates/Makefile.decl - -check_PROGRAMS = \ - test-link-module \ - test-exp-parser \ - test-scm-query-string \ - test-print-parse-amount \ - test-sx \ - test-app-utils - -TESTS = \ - ${check_PROGRAMS} \ - ${SCM_TESTS} - -test_scm_query_string_SOURCES = test-scm-query-string.cpp -test_sx_SOURCES = test-sx.cpp -test_print_parse_amount_SOURCES = test-print-parse-amount.cpp - -GNC_TEST_DEPS = \ - --gnc-module-dir ${top_builddir}/libgnucash/engine \ - --gnc-module-dir ${top_builddir}/libgnucash/engine/test \ - --gnc-module-dir ${top_builddir}/libgnucash/app-utils \ - --guile-load-dir ${top_builddir}/libgnucash/core-utils \ - --guile-load-dir ${top_builddir}/libgnucash/gnc-module \ - --guile-load-dir ${top_builddir}/libgnucash/engine \ - --guile-load-dir ${top_builddir}/libgnucash/engine/test \ - --guile-load-dir ${top_builddir}/libgnucash/scm \ - --guile-load-dir ${top_builddir}/libgnucash/app-utils \ - --library-dir ${top_builddir}/libgnucash/core-utils \ - --library-dir ${top_builddir}/libgnucash/gnc-module \ - --library-dir ${top_builddir}/libgnucash/engine \ - --library-dir ${top_builddir}/libgnucash/backend/xml \ - --library-dir ${top_builddir}/libgnucash/backend/sql \ - --library-dir ${top_builddir}/libgnucash/app-utils - -TESTS_ENVIRONMENT = \ - GUILE_WARN_DEPRECATED=no \ - GUILE="${GUILE}" \ - SRCDIR=${srcdir} \ - GNC_BUILDDIR="${abs_top_builddir}" \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS}) - -LDADD = \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \ - ${top_builddir}/common/test-core/libtest-core.la \ - ${top_builddir}/libgnucash/engine/test-core/libgncmod-test-engine.la \ - ${GUILE_LIBS} - -EXTRA_DIST += \ - test-print-queries.cpp \ - ${SCM_TEST_SRCS} \ - CMakeLists.txt - -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_srcdir}/common/test-core \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/engine/test-core \ - -I${top_srcdir}/libgnucash/app-utils \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/libgnucash/core-utils \ - ${GUILE_CFLAGS} \ - ${GLIB_CFLAGS} \ - ${BOOST_CPPFLAGS} - -test_app_utils_SOURCES = \ - test-app-utils.c \ - test-option-util.cpp \ - test-gnc-ui-util.c - -test_app_utils_CXXFLAGS = \ - ${DEFAULT_INCLUDES} \ - -I${top_srcdir}/${MODULEPATH}/ \ - -DTESTPROG=test_app_utils \ - ${GLIB_CFLAGS} - -SCM_TESTS = test-load-app-utils-module test-c-interface test-date-utilities -SCM_TEST_SRCS = $(SCM_TESTS:%=%.scm) - -$(SCM_TESTS): %: $(srcdir)/%.scm Makefile - echo 'export GNC_BUILDDIR="${abs_top_builddir}";' > $@ - echo 'export GNC_UNINSTALLED=yes;' >> $@ - echo '${GUILE} --debug -l $(srcdir)/$*.scm -c "(exit (run-test))"' >> $@ - chmod a+x $@ diff --git a/libgnucash/backend/CMakeLists.txt b/libgnucash/backend/CMakeLists.txt index 48209be437..f8d1416e55 100644 --- a/libgnucash/backend/CMakeLists.txt +++ b/libgnucash/backend/CMakeLists.txt @@ -5,5 +5,5 @@ ADD_SUBDIRECTORY (sql) -SET_LOCAL_DIST(backend_DIST_local CMakeLists.txt Makefile.am) +SET_LOCAL_DIST(backend_DIST_local CMakeLists.txt ) SET(backend_DIST ${backend_DIST_local} ${backend_dbi_DIST} ${backend_sql_DIST} ${backend_xml_DIST} PARENT_SCOPE) \ No newline at end of file diff --git a/libgnucash/backend/Makefile.am b/libgnucash/backend/Makefile.am deleted file mode 100644 index e30757a940..0000000000 --- a/libgnucash/backend/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -if WITH_DBI - DBI_DIR=dbi -endif -SUBDIRS = xml sql ${DBI_DIR} - -EXTRA_DIST = CMakeLists.txt diff --git a/libgnucash/backend/dbi/CMakeLists.txt b/libgnucash/backend/dbi/CMakeLists.txt index 859cf87346..b3bb506c75 100644 --- a/libgnucash/backend/dbi/CMakeLists.txt +++ b/libgnucash/backend/dbi/CMakeLists.txt @@ -19,7 +19,7 @@ SET (backend_dbi_noinst_HEADERS ) SET_LOCAL_DIST(backend_dbi_DIST_local - ${backend_dbi_SOURCES} ${backend_dbi_noinst_HEADERS} CMakeLists.txt Makefile.am) + ${backend_dbi_SOURCES} ${backend_dbi_noinst_HEADERS} CMakeLists.txt ) SET(backend_dbi_DIST ${backend_dbi_DIST_local} ${test_dbi_backend_DIST} PARENT_SCOPE) # Add dependency on config.h diff --git a/libgnucash/backend/dbi/Makefile.am b/libgnucash/backend/dbi/Makefile.am deleted file mode 100644 index e90dbc6200..0000000000 --- a/libgnucash/backend/dbi/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -SUBDIRS = . test - -# Now a shared library AND a GModule -pkglib_LTLIBRARIES = libgncmod-backend-dbi.la - - -# "${top_srcdir}/common/debug" below is for the splint header -AM_CPPFLAGS = \ - -I.. -I../.. \ - -DLOCALE_DIR=\""$(datadir)/locale"\" \ - -I${top_srcdir}/libgnucash/backend \ - -I${top_srcdir}/libgnucash/backend/sql \ - -I${top_srcdir}/common/debug \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/borrowed/libc \ - -I${top_srcdir}/common \ - ${GLIB_CFLAGS} \ - ${BOOST_CPPFLAGS} \ - ${WARN_CFLAGS} - -libgncmod_backend_dbi_la_SOURCES = \ - gnc-backend-dbi.cpp \ - gnc-dbisqlconnection.cpp \ - gnc-dbisqlresult.cpp - -noinst_HEADERS = \ - gnc-backend-dbi.h \ - gnc-backend-dbi.hpp \ - gnc-dbisqlconnection.hpp \ - gnc-dbisqlresult.hpp \ - gnc-dbiprovider.hpp \ - gnc-dbiproviderimpl.hpp - -libgncmod_backend_dbi_la_LDFLAGS = -shared -avoid-version -libgncmod_backend_dbi_la_LIBADD = \ - ${GLIB_LIBS} \ - ${top_builddir}/libgnucash/backend/sql/libgnc-backend-sql.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${BOOST_LDFLAGS} -lboost_regex \ - ${LIBDBI_LIBS} - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.dbi\" - -EXTRA_DIST = CMakeLists.txt diff --git a/libgnucash/backend/dbi/test/CMakeLists.txt b/libgnucash/backend/dbi/test/CMakeLists.txt index a009989ad3..e2be0bf237 100644 --- a/libgnucash/backend/dbi/test/CMakeLists.txt +++ b/libgnucash/backend/dbi/test/CMakeLists.txt @@ -24,7 +24,7 @@ SET(test_dbi_backend_SOURCES SET(test_dbi_backend_HEADERS test-dbi-business-stuff.h test-dbi-stuff.h) -SET_DIST_LIST(test_dbi_backend_DIST ${test_dbi_backend_SOURCES} ${test_dbi_backend_HEADERS} test-dbi.xml CMakeLists.txt Makefile.am) +SET_DIST_LIST(test_dbi_backend_DIST ${test_dbi_backend_SOURCES} ${test_dbi_backend_HEADERS} test-dbi.xml CMakeLists.txt ) # This test does not work on Win32 IF (WITH_SQL AND NOT WIN32) diff --git a/libgnucash/backend/dbi/test/Makefile.am b/libgnucash/backend/dbi/test/Makefile.am deleted file mode 100644 index 636e0c3265..0000000000 --- a/libgnucash/backend/dbi/test/Makefile.am +++ /dev/null @@ -1,81 +0,0 @@ -# Makefile.am for src/backend/dbi/test - -include $(top_srcdir)/test-templates/Makefile.decl - -AM_CPPFLAGS = \ --I${top_srcdir}/borrowed/libc \ - -I${top_srcdir}/common \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/common/test-core \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/engine/test-core \ - -I${top_srcdir}/libgnucash/backend/sql \ - -DTEST_MYSQL_URL=\"${TEST_MYSQL_URL}\" \ - -DTEST_PGSQL_URL=\"${TEST_PGSQL_URL}\" \ - ${GLIB_CFLAGS} \ - ${GUILE_CFLAGS} \ - ${BOOST_CPPFLAGS} - -LDADD = ${top_builddir}/common/test-core/libtest-core.la \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/engine/test-core/libgncmod-test-engine.la \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${top_builddir}/libgnucash/backend/sql/libgnc-backend-sql.la \ - ${top_builddir}/libgnucash/backend/xml/libgnc-backend-xml-utils.la \ - ${top_builddir}/borrowed/libc/libc-missing.la - -GNC_TEST_DEPS = \ - --gnc-module-dir ${top_builddir}/libgnucash/engine \ - --guile-load-dir ${top_builddir}/libgnucash/engine \ - --library-dir ${top_builddir}/libgnucash/core-utils \ - --library-dir ${top_builddir}/libgnucash/gnc-module \ - --library-dir ${top_builddir}/libgnucash/engine \ - --library-dir ${top_builddir}/libgnucash/backend/xml - -TESTS_ENVIRONMENT = \ - GNC_BUILDDIR=${abs_top_builddir} \ - GNC_ACCOUNT_PATH=${top_srcdir}/accounts/C \ - SRCDIR=${srcdir} \ - ${gnc_dbd_dir_override} \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS}) - -EXTRA_DIST += \ - test-dbi-stuff.h \ - test-dbi-business-stuff.h \ - test-dbi.xml \ - CMakeLists.txt - -check_PROGRAMS = test-backend-dbi - -TESTS = ${check_PROGRAMS} - -if CUSTOM_GNC_DBD_DIR -gnc_dbd_dir_override = GNC_DBD_DIR="@GNC_DBD_DIR@" -endif - -test_backend_dbi_SOURCES = \ - test-backend-dbi.cpp \ - test-backend-dbi-basic.cpp \ - test-dbi-stuff.cpp \ - test-dbi-business-stuff.cpp \ - ../gnc-dbisqlconnection.cpp \ - ../gnc-backend-dbi.cpp \ - ../gnc-dbisqlresult.cpp - -test_backend_dbi_CPPFLAGS = \ - -DDBI_TEST_XML_FILENAME=\"${srcdir}/test-dbi.xml\" \ - ${AM_CPPFLAGS} - -test_backend_dbi_LDADD = \ - ${BOOST_LDFLAGS} -lboost_regex \ - ${LIBDBI_LIBS} \ - ${LDADD} - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.dbi\" - -# If you let make run parallel builds it complains that there is no rule to make -# libgncmod-test-dbi.la. This is wrong, but I can't figure out how to fix it -# so I'll turn off parallel builds -#.NOTPARALLEL: diff --git a/libgnucash/backend/sql/CMakeLists.txt b/libgnucash/backend/sql/CMakeLists.txt index 34e07db9b3..612b868fae 100644 --- a/libgnucash/backend/sql/CMakeLists.txt +++ b/libgnucash/backend/sql/CMakeLists.txt @@ -58,7 +58,7 @@ SET (backend_sql_noinst_HEADERS escape.h ) -SET_LOCAL_DIST(backend_sql_DIST_local ${backend_sql_SOURCES} ${backend_sql_noinst_HEADERS} CMakeLists.txt Makefile.am) +SET_LOCAL_DIST(backend_sql_DIST_local ${backend_sql_SOURCES} ${backend_sql_noinst_HEADERS} CMakeLists.txt ) SET(backend_sql_DIST ${backend_sql_DIST_local} ${test_backend_sql_DIST} PARENT_SCOPE) # Add dependency on config.h diff --git a/libgnucash/backend/sql/Makefile.am b/libgnucash/backend/sql/Makefile.am deleted file mode 100644 index cf951229d6..0000000000 --- a/libgnucash/backend/sql/Makefile.am +++ /dev/null @@ -1,84 +0,0 @@ -include $(top_srcdir)/test-templates/Makefile.decl -SUBDIRS = . test -TEST_SUBDIRS = test - -# Now a shared library AND a GModule -lib_LTLIBRARIES = libgnc-backend-sql.la - -# "${top_srcdir}/common/debug" below is for the splint header -AM_CPPFLAGS = \ - -I.. -I../.. \ - -DLOCALE_DIR=\""$(datadir)/locale"\" \ - -I${top_srcdir}/libgnucash/backend \ - -I${top_srcdir}/common/debug \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/core-utils\ - -I${top_srcdir}/borrowed/libc\ - ${GLIB_CFLAGS} \ - ${GUILE_CFLAGS} \ - ${WARN_CFLAGS} \ - ${BOOST_CPPFLAGS} - -libgnc_backend_sql_la_SOURCES = \ - gnc-account-sql.cpp \ - gnc-address-sql.cpp \ - gnc-bill-term-sql.cpp \ - gnc-book-sql.cpp \ - gnc-budget-sql.cpp \ - gnc-commodity-sql.cpp \ - gnc-customer-sql.cpp \ - gnc-employee-sql.cpp \ - gnc-entry-sql.cpp \ - gnc-invoice-sql.cpp \ - gnc-job-sql.cpp \ - gnc-lots-sql.cpp \ - gnc-order-sql.cpp \ - gnc-owner-sql.cpp \ - gnc-price-sql.cpp \ - gnc-recurrence-sql.cpp \ - gnc-schedxaction-sql.cpp \ - gnc-slots-sql.cpp \ - gnc-tax-table-sql.cpp \ - gnc-transaction-sql.cpp \ - gnc-vendor-sql.cpp \ - gnc-sql-backend.cpp \ - gnc-sql-result.cpp \ - gnc-sql-column-table-entry.cpp \ - gnc-sql-object-backend.cpp \ - escape.cpp - -noinst_HEADERS = \ - gnc-account-sql.h \ - gnc-bill-term-sql.h \ - gnc-book-sql.h \ - gnc-budget-sql.h \ - gnc-commodity-sql.h \ - gnc-customer-sql.h \ - gnc-employee-sql.h \ - gnc-entry-sql.h \ - gnc-invoice-sql.h \ - gnc-job-sql.h \ - gnc-lots-sql.h \ - gnc-order-sql.h \ - gnc-price-sql.h \ - gnc-recurrence-sql.h \ - gnc-schedxaction-sql.h \ - gnc-slots-sql.h \ - gnc-tax-table-sql.h \ - gnc-transaction-sql.h \ - gnc-vendor-sql.h \ - gnc-sql-backend.hpp \ - gnc-sql-connection.hpp \ - gnc-sql-result.hpp \ - gnc-sql-column-table-entry.hpp \ - gnc-sql-object-backend.hpp \ - escape.h - -libgnc_backend_sql_la_LIBADD = \ - ${GLIB_LIBS} \ - ${GUILE_LIBS} \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.sql\" - -EXTRA_DIST += CMakeLists.txt diff --git a/libgnucash/backend/sql/test/CMakeLists.txt b/libgnucash/backend/sql/test/CMakeLists.txt index 1f7a38a935..8447e916f0 100644 --- a/libgnucash/backend/sql/test/CMakeLists.txt +++ b/libgnucash/backend/sql/test/CMakeLists.txt @@ -12,7 +12,7 @@ SET(test_backend_sql_SOURCES test-sqlbe.cpp utest-gnc-backend-sql.cpp) SET(BACKEND_SQL_TEST_LIBS gnc-backend-sql gncmod-engine test-core) SET_DIST_LIST(test_backend_sql_DIST ${test_backend_sql_SOURCES} CMakeLists.txt - Makefile.am test-column-types.cpp) + test-column-types.cpp) IF(WITH_SQL) # This test does not actually do anything. diff --git a/libgnucash/backend/sql/test/Makefile.am b/libgnucash/backend/sql/test/Makefile.am deleted file mode 100644 index a1db92716a..0000000000 --- a/libgnucash/backend/sql/test/Makefile.am +++ /dev/null @@ -1,72 +0,0 @@ -SUBDIRS = . - -include $(top_srcdir)/test-templates/Makefile.decl -MODULEPATH = libgnucash/backend/sql - -test_column_types_SOURCES = \ - test-column-types.cpp - -check_PROGRAMS = \ - test-column-types \ - test-sqlbe - -TESTS = ${check_PROGRAMS} - -GNC_TEST_DEPS = \ - --gnc-module-dir ${top_builddir}/libgnucash/engine \ - --guile-load-dir ${top_builddir}/libgnucash/engine \ - --library-dir ${top_builddir}/libgnucash/core-utils \ - --library-dir ${top_builddir}/libgnucash/gnc-module \ - --library-dir ${top_builddir}/libgnucash/engine \ - --library-dir ${top_builddir}/libgnucash/backend/sql - -TESTS_ENVIRONMENT = \ - GNC_ACCOUNT_PATH=${top_srcdir}/accounts/C \ - SRCDIR=${srcdir} \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS}) - -LDADD = ${top_builddir}/common/test-core/libtest-core.la \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${top_builddir}/libgnucash/backend/sql/libgnc-backend-sql.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/engine/test-core/libgncmod-test-engine.la \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${top_builddir}/borrowed/libc/libc-missing.la - -AM_CPPFLAGS = \ --I${top_srcdir}/borrowed/libc \ - -I${top_srcdir}/common \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/common/test-core \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/engine/test-core \ - -I${top_srcdir}/libgnucash/backend/sql \ - ${GLIB_CFLAGS} \ - ${GUILE_CFLAGS} - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.sql\" - -#test_sqlbedir = ${top_srcdir}/${MODULEPATH}/test - -test_sqlbe_SOURCES = \ - test-sqlbe.cpp \ - utest-gnc-backend-sql.cpp - -test_sqlbe_LDADD = \ - $(top_builddir)/$(MODULEPATH)/libgnc-backend-sql.la \ - $(top_builddir)/libgnucash/engine/libgncmod-engine.la \ - $(top_builddir)/common/test-core/libtest-core.la \ - $(top_builddir)/libgnucash/core-utils/libgnc-core-utils.la \ - $(GLIB_LIBS) - -test_sqlbe_CFLAGS = \ - -DTESTPROG=test_sqlbe \ - $(DEFAULT_INCLUDES) \ - -I$(top_srcdir)/$(MODULEPATH)/ \ - -I$(top_srcdir)/libgnucash/backend/dbi/ \ - -I$(top_srcdir)/libgnucash/engine/ \ - -I$(top_srcdir)/common/test-core/ \ - $(GLIB_CFLAGS) - -EXTRA_DIST += CMakeLists.txt diff --git a/libgnucash/backend/xml/CMakeLists.txt b/libgnucash/backend/xml/CMakeLists.txt index e231f7ad7b..b8f9cad396 100644 --- a/libgnucash/backend/xml/CMakeLists.txt +++ b/libgnucash/backend/xml/CMakeLists.txt @@ -71,7 +71,7 @@ SET (backend_xml_utils_SOURCES SET_LOCAL_DIST(backend_xml_DIST_local ${backend_xml_utils_SOURCES} ${backend_xml_utils_noinst_HEADERS} gnc-backend-xml.cpp CMakeLists.txt - Makefile.am) + ) SET(backend_xml_DIST ${backend_xml_DIST_local} ${test_backend_xml_DIST} PARENT_SCOPE) # Add dependency on config.h diff --git a/libgnucash/backend/xml/Makefile.am b/libgnucash/backend/xml/Makefile.am deleted file mode 100644 index dc35b8d89f..0000000000 --- a/libgnucash/backend/xml/Makefile.am +++ /dev/null @@ -1,107 +0,0 @@ -SUBDIRS = . test - -# Now a shared library AND a GModule -lib_LTLIBRARIES = libgnc-backend-xml-utils.la -pkglib_LTLIBRARIES = libgncmod-backend-xml.la - -AM_CPPFLAGS = \ - -I.. -I../.. \ - -DLOCALE_DIR=\""$(datadir)/locale"\" \ - -DU_SHOW_CPLUSPLUS_API=0 \ - -I${top_srcdir}/libgnucash/backend \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/borrowed/libc\ - -I$(top_srcdir)/common \ - ${LIBXML2_CFLAGS} \ - ${GLIB_CFLAGS} \ - ${BOOST_CPPFLAGS} - -libgnc_backend_xml_utils_la_SOURCES = \ - gnc-account-xml-v2.cpp \ - gnc-address-xml-v2.cpp \ - gnc-bill-term-xml-v2.cpp \ - gnc-book-xml-v2.cpp \ - gnc-budget-xml-v2.cpp \ - gnc-commodity-xml-v2.cpp \ - gnc-customer-xml-v2.cpp \ - gnc-employee-xml-v2.cpp \ - gnc-entry-xml-v2.cpp \ - gnc-freqspec-xml-v2.cpp \ - gnc-invoice-xml-v2.cpp \ - gnc-job-xml-v2.cpp \ - gnc-lot-xml-v2.cpp \ - gnc-order-xml-v2.cpp \ - gnc-owner-xml-v2.cpp \ - gnc-pricedb-xml-v2.cpp \ - gnc-recurrence-xml-v2.cpp \ - gnc-schedxaction-xml-v2.cpp \ - gnc-tax-table-xml-v2.cpp \ - gnc-transaction-xml-v2.cpp \ - gnc-vendor-xml-v2.cpp \ - gnc-xml-backend.cpp \ - gnc-xml-helper.cpp \ - io-example-account.cpp \ - io-gncxml-gen.cpp \ - io-gncxml-v1.cpp \ - io-gncxml-v2.cpp \ - io-utils.cpp \ - sixtp-dom-generators.cpp \ - sixtp-dom-parsers.cpp \ - sixtp-stack.cpp \ - sixtp-to-dom-parser.cpp \ - sixtp-utils.cpp \ - sixtp.cpp - -libgncmod_backend_xml_la_SOURCES = \ - gnc-backend-xml.cpp - -noinst_HEADERS = \ - gnc-backend-xml.h \ - gnc-xml.h \ - gnc-address-xml-v2.h \ - gnc-bill-term-xml-v2.h \ - gnc-customer-xml-v2.h \ - gnc-employee-xml-v2.h \ - gnc-entry-xml-v2.h \ - gnc-invoice-xml-v2.h \ - gnc-job-xml-v2.h \ - gnc-order-xml-v2.h \ - gnc-owner-xml-v2.h \ - gnc-tax-table-xml-v2.h \ - gnc-vendor-xml-v2.h \ - gnc-xml-backend.hpp \ - gnc-xml-helper.h \ - io-example-account.h \ - io-gncxml-gen.h \ - io-gncxml-v2.h \ - io-gncxml.h \ - io-utils.h \ - sixtp-dom-generators.h \ - sixtp-dom-parsers.h \ - sixtp-parsers.h \ - sixtp-stack.h \ - sixtp-utils.h \ - sixtp.h \ - xml-helpers.h - -libgnc_backend_xml_utils_la_LIBADD = \ - ${GLIB_LIBS} \ - ${LIBXML2_LIBS} \ - ${ZLIB_LIBS} \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la - -libgncmod_backend_xml_la_LDFLAGS = -module -avoid-version -libgncmod_backend_xml_la_LIBADD = \ - ${GLIB_LIBS} \ - ${LIBXML2_LIBS} \ - ${ZLIB_LIBS} \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - libgnc-backend-xml-utils.la - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.xml\" - -EXTRA_DIST = CMakeLists.txt diff --git a/libgnucash/backend/xml/test/CMakeLists.txt b/libgnucash/backend/xml/test/CMakeLists.txt index 342cb214a4..e74de225f4 100644 --- a/libgnucash/backend/xml/test/CMakeLists.txt +++ b/libgnucash/backend/xml/test/CMakeLists.txt @@ -57,7 +57,7 @@ SET(test_backend_xml_module_SOURCES ) SET_LOCAL_DIST(test_backend_xml_DIST_local CMakeLists.txt grab-types.pl - Makefile.am README test-date-converting.cpp test-dom-converters1.cpp + README test-date-converting.cpp test-dom-converters1.cpp test-dom-parser1.cpp test-file-stuff.cpp test-file-stuff.h test-kvp-frames.cpp test-load-backend.cpp test-load-example-account.cpp test-load-xml2.cpp test-save-in-lang.cpp test-string-converters.cpp test-xml2-is-file.cpp @@ -65,7 +65,7 @@ SET_LOCAL_DIST(test_backend_xml_DIST_local CMakeLists.txt grab-types.pl test-xml-pricedb.cpp test-xml-transaction.cpp) SET(test_backend_xml_DIST ${test_backend_xml_DIST_local} ${test_backend_xml_test_files_DIST} PARENT_SCOPE) -# The test test-dom-parser1.c is not run by Makefile.am +# The test test-dom-parser1.c is not run by # This line for autotools CONFIGURE_FILE(test-real-data.sh.in test-real-data.sh) diff --git a/libgnucash/backend/xml/test/Makefile.am b/libgnucash/backend/xml/test/Makefile.am deleted file mode 100644 index 11b2184714..0000000000 --- a/libgnucash/backend/xml/test/Makefile.am +++ /dev/null @@ -1,284 +0,0 @@ -# -SUBDIRS = test-files - -test_date_converting_SOURCES = \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-parsers.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-generators.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-utils.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-stack.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-to-dom-parser.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-xml-helper.cpp \ - test-date-converting.cpp - -test_dom_converters1_SOURCES = \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-parsers.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-generators.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-utils.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-stack.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-to-dom-parser.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-xml-helper.cpp \ - test-dom-converters1.cpp - -test_kvp_frames_SOURCES = \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-parsers.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-generators.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-utils.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-stack.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-to-dom-parser.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-xml-helper.cpp \ - test-kvp-frames.cpp - -test_load_backend_SOURCES = \ -test-load-backend.cpp -test_load_xml2_SOURCES = \ -test-load-xml2.cpp -test_save_in_lang_SOURCES = \ -test-save-in-lang.cpp - -# the xml backend is now a GModule - this test does -# not load it as a module and cannot link to it -# and remain portable. - -test_load_example_account_SOURCES = \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-parsers.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-generators.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-utils.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-stack.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-to-dom-parser.cpp \ - ${top_srcdir}/libgnucash/backend/xml/io-example-account.cpp \ - ${top_srcdir}/libgnucash/backend/xml/io-gncxml-gen.cpp \ - ${top_srcdir}/libgnucash/backend/xml/io-gncxml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/io-utils.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-account-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-budget-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-lot-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-recurrence-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-schedxaction-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-freqspec-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-transaction-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-commodity-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-book-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-pricedb-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-xml-helper.cpp \ - test-load-example-account.cpp - -test_string_converters_SOURCES = \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-parsers.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-generators.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-utils.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-stack.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-to-dom-parser.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-xml-helper.cpp \ - test-string-converters.cpp - -test_xml_account_SOURCES = \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-parsers.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-generators.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-utils.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-stack.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-to-dom-parser.cpp \ - ${top_srcdir}/libgnucash/backend/xml/io-gncxml-gen.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-account-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-lot-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-schedxaction-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-recurrence-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-freqspec-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-transaction-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-commodity-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-book-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-pricedb-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-budget-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/io-gncxml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/io-utils.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-xml-helper.cpp \ - test-xml-account.cpp - -test_xml_commodity_SOURCES = \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-parsers.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-generators.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-utils.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-stack.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-to-dom-parser.cpp \ - ${top_srcdir}/libgnucash/backend/xml/io-gncxml-gen.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-account-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-lot-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-schedxaction-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-recurrence-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-freqspec-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-transaction-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-commodity-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-book-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-pricedb-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-budget-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/io-gncxml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/io-utils.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-xml-helper.cpp \ - test-xml-commodity.cpp - -test_xml_pricedb_SOURCES = \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-parsers.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-generators.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-utils.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-stack.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-to-dom-parser.cpp \ - ${top_srcdir}/libgnucash/backend/xml/io-gncxml-gen.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-account-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-lot-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-schedxaction-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-recurrence-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-freqspec-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-transaction-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-commodity-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-book-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-pricedb-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-budget-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/io-gncxml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/io-utils.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-xml-helper.cpp \ - test-xml-pricedb.cpp - -test_xml_transaction_SOURCES = \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-parsers.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-generators.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-utils.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-stack.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-to-dom-parser.cpp \ - ${top_srcdir}/libgnucash/backend/xml/io-gncxml-gen.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-account-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-budget-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-lot-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-schedxaction-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-freqspec-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-recurrence-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-transaction-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-commodity-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-book-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-pricedb-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/io-gncxml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/io-utils.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-xml-helper.cpp \ - test-xml-transaction.cpp - -test_xml2_is_file_SOURCES = \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-parsers.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-dom-generators.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-utils.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-stack.cpp \ - ${top_srcdir}/libgnucash/backend/xml/sixtp-to-dom-parser.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-account-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-budget-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-lot-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-recurrence-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-schedxaction-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-freqspec-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-transaction-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-commodity-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-book-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-pricedb-xml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/io-gncxml-gen.cpp \ - ${top_srcdir}/libgnucash/backend/xml/io-gncxml-v2.cpp \ - ${top_srcdir}/libgnucash/backend/xml/io-utils.cpp \ - ${top_srcdir}/libgnucash/backend/xml/gnc-xml-helper.cpp \ - test-xml2-is-file.cpp - -TESTS = \ - test-date-converting \ - test-dom-converters1 \ - test-kvp-frames \ - test-load-example-account \ - test-load-backend \ - test-load-xml2 \ - test-real-data.sh \ - test-string-converters \ - test-xml-account \ - test-xml-commodity \ - test-xml-pricedb \ - test-xml-transaction \ - test-xml2-is-file - -GNC_TEST_DEPS = \ - --gnc-module-dir ${top_builddir}/libgnucash/gnc-module \ - --gnc-module-dir ${top_builddir}/libgnucash/engine \ - --guile-load-dir ${top_builddir}/libgnucash/gnc-module \ - --guile-load-dir ${top_builddir}/libgnucash/engine \ - --library-dir ${top_builddir}/libgnucash/core-utils \ - --library-dir ${top_builddir}/libgnucash/gnc-module \ - --library-dir ${top_builddir}/libgnucash/engine \ - --library-dir ${top_builddir}/libgnucash/backend/sql \ - --library-dir ${top_builddir}/libgnucash/backend/xml - -TESTS_ENVIRONMENT = \ - GUILE_WARN_DEPRECATED=no \ - GNC_ACCOUNT_PATH=${top_srcdir}/data/accounts/C \ - GNC_TEST_FILES=test-files/xml2 \ - SRCDIR=${srcdir} \ - GNC_BUILDDIR="${abs_top_builddir}" \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS}) - -check_LTLIBRARIES = libgnc-test-file-stuff.la - -libgnc_test_file_stuff_la_SOURCES = test-file-stuff.cpp -libgnc_test_file_stuff_la_LIBADD = \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la - -check_PROGRAMS = \ - test-date-converting \ - test-dom-converters1 \ - test-kvp-frames \ - test-load-backend \ - test-load-example-account \ - test-load-xml2 \ - test-save-in-lang \ - test-string-converters \ - test-xml-account \ - test-xml-commodity \ - test-xml-pricedb \ - test-xml-transaction \ - test-xml2-is-file - -noinst_HEADERS = test-file-stuff.h - -LDADD = \ - ${top_builddir}/common/test-core/libtest-core.la \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${top_builddir}/libgnucash/engine/test-core/libgncmod-test-engine.la \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ./libgnc-test-file-stuff.la \ - ${LIBXML2_LIBS} \ - ${ZLIB_LIBS} \ - ${top_builddir}/borrowed/libc/libc-missing.la - -AM_CPPFLAGS = \ - -I${top_srcdir}/borrowed/libc \ - -I${top_srcdir}/common \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/common/test-core \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/engine/test-core \ - -I${top_srcdir}/libgnucash/backend/xml \ - -DU_SHOW_CPLUSPLUS_API=0 \ - ${LIBXML2_CFLAGS} \ - ${GLIB_CFLAGS} \ - ${GUILE_CFLAGS} \ - ${BOOST_CPPFLAGS} - -EXTRA_DIST = \ - grab-types.pl \ - test-dom-parser1.cpp \ - test-real-data.sh \ - test-xml2-is-file.cpp \ - CMakeLists.txt - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.xml\" diff --git a/libgnucash/backend/xml/test/test-files/CMakeLists.txt b/libgnucash/backend/xml/test/test-files/CMakeLists.txt index c325fa52e6..27d115d4f2 100644 --- a/libgnucash/backend/xml/test/test-files/CMakeLists.txt +++ b/libgnucash/backend/xml/test/test-files/CMakeLists.txt @@ -1,6 +1,6 @@ ADD_SUBDIRECTORY(xml2) -SET_LOCAL_DIST(test_backend_xml_test_files_DIST_local CMakeLists.txt Makefile.am) +SET_LOCAL_DIST(test_backend_xml_test_files_DIST_local CMakeLists.txt ) SET(test_backend_xml_test_files_DIST ${test_backend_xml_test_files_DIST_local} ${xml2_DIST} PARENT_SCOPE) diff --git a/libgnucash/backend/xml/test/test-files/Makefile.am b/libgnucash/backend/xml/test/test-files/Makefile.am deleted file mode 100644 index 08b8e6b370..0000000000 --- a/libgnucash/backend/xml/test/test-files/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = xml2 - -EXTRA_DIST = CMakeLists.txt diff --git a/libgnucash/backend/xml/test/test-files/xml2/CMakeLists.txt b/libgnucash/backend/xml/test/test-files/xml2/CMakeLists.txt index a68999f7d1..1f6382d643 100644 --- a/libgnucash/backend/xml/test/test-files/xml2/CMakeLists.txt +++ b/libgnucash/backend/xml/test/test-files/xml2/CMakeLists.txt @@ -1,4 +1,4 @@ SET_DIST_LIST(xml2_DIST abcall.gml2 abc.gml2 carols-data-file.gml2 cbb-export.gml2 CMakeLists.txt conrads-file.gml2 - every.gml2 goonies-file.gml2 hierachical-data-file.gml2 Makefile.am Money95bank_fr.gml2 + every.gml2 goonies-file.gml2 hierachical-data-file.gml2 Money95bank_fr.gml2 Money95invst.gml2 Money95mutual.gml2 Money95stocks.gml2 ms-money.gml2 pricedb1.gml2) \ No newline at end of file diff --git a/libgnucash/backend/xml/test/test-files/xml2/Makefile.am b/libgnucash/backend/xml/test/test-files/xml2/Makefile.am deleted file mode 100644 index 5ded68ed1f..0000000000 --- a/libgnucash/backend/xml/test/test-files/xml2/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -ACCT_TST_FILES = \ - Money95bank_fr.gml2 \ - Money95invst.gml2 \ - Money95mutual.gml2 \ - Money95stocks.gml2 \ - abc.gml2 \ - abcall.gml2 \ - carols-data-file.gml2 \ - cbb-export.gml2 \ - conrads-file.gml2 \ - every.gml2 \ - goonies-file.gml2 \ - hierachical-data-file.gml2 \ - ms-money.gml2 \ - pricedb1.gml2 - -EXTRA_DIST = \ - $(ACCT_TST_FILES) \ - CMakeLists.txt - -check: - for file in $(ACCT_TST_FILES); do \ - test $(srcdir)/$$file -ef $(builddir)/$$file || \ - cp $(srcdir)/$$file $(builddir)/$$file; \ - done; - -clean-local: - rm -f *.gnucash diff --git a/libgnucash/core-utils/CMakeLists.txt b/libgnucash/core-utils/CMakeLists.txt index 80dd76b6b9..6d6809e8f8 100644 --- a/libgnucash/core-utils/CMakeLists.txt +++ b/libgnucash/core-utils/CMakeLists.txt @@ -149,7 +149,7 @@ SET(core_utils_ALL_INCLUDES ${GUILE_INCLUDE_DIRS} ${GTK_MAC_INCLUDE_DIRS}) -SET_LOCAL_DIST(core_utils_DIST_local ${core_utils_ALL_SOURCES} CMakeLists.txt Makefile.am core-utils.i core-utils.scm gncla-dir.h.in) +SET_LOCAL_DIST(core_utils_DIST_local ${core_utils_ALL_SOURCES} CMakeLists.txt core-utils.i core-utils.scm gncla-dir.h.in) SET(core_utils_DIST ${core_utils_DIST_local} ${test_core_utils_DIST} PARENT_SCOPE) IF (MAC_INTEGRATION) diff --git a/libgnucash/core-utils/Makefile.am b/libgnucash/core-utils/Makefile.am deleted file mode 100644 index f59f7a2b70..0000000000 --- a/libgnucash/core-utils/Makefile.am +++ /dev/null @@ -1,189 +0,0 @@ -# No SUBDIR variable here... -# The 'test' subdir is added via src/Makefile to handle -# it's dependency on src/engine - -lib_LTLIBRARIES = libgnc-core-utils.la - -libgnc_core_utils_la_SOURCES = \ - binreloc.c \ - gnc-prefs.c \ - gnc-environment.c \ - gnc-filepath-utils.cpp \ - gnc-gkeyfile-utils.c \ - gnc-glib-utils.c \ - gnc-guile-utils.c \ - gnc-jalali.c \ - gnc-locale-utils.c \ - gnc-path.c \ - swig-core-utils-guile.c - -libgnc_core_utils_la_LIBADD = \ - ${GUILE_LIBS} \ - ${GLIB_LIBS} \ - ${BINRELOC_LIBS} \ - ${GTK_MAC_LIBS} \ - ${BOOST_LDFLAGS} -lboost_filesystem - - -noinst_HEADERS = \ - binreloc.h \ - gnc-prefs.h \ - gnc-prefs-p.h \ - gnc-environment.h \ - gnc-filepath-utils.h \ - gnc-gkeyfile-utils.h \ - gnc-glib-utils.h \ - gnc-guile-utils.h \ - gnc-jalali.h \ - gnc-locale-utils.h \ - gnc-path.h - -if BUILDING_FROM_VCS -swig-core-utils-guile.c: core-utils.i ${top_srcdir}/common/base-typemaps.i - $(SWIG) -guile -Linkage module \ - -I${top_srcdir}/common -o $@ $< - -swig-core-utils-python.c: core-utils.i ${top_srcdir}/common/base-typemaps.i - $(SWIG) -python -Wall -Werror \ - -I${GLIB_CFLAGS} -I${top_srcdir}/common -I${srcdir} -o $@ $< -endif - -AM_CPPFLAGS = \ - ${GUILE_CFLAGS} \ - ${GLIB_CFLAGS} \ - -I${top_builddir}/common \ - -I${top_srcdir}/common \ - $(BOOST_CPPFLAGS) - -AM_CFLAGS = ${GTK_MAC_CFLAGS} -AM_CXXFLAGS = ${GTK_MAC_CXXFLAGS} - -gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash -gncscmmod_DATA = core-utils.scm - -if GNUCASH_SEPARATE_BUILDDIR -#Only needed when srcdir and builddir are different -#for running -SCM_FILE_LINKS = ${gncscmmod_DATA} -endif - -if WITH_PYTHON - -lib_LTLIBRARIES += libgnc-core-utils-python.la - -libgnc_core_utils_python_la_SOURCES = \ - swig-core-utils-python.c - -libgnc_core_utils_python_la_LIBADD = \ - ${PYTHON_LIBS} \ - libgnc-core-utils.la - -libgnc_core_utils_python_la_CPPFLAGS = \ - ${GLIB_CFLAGS} \ - ${GTK_MAC_CFLAGS} \ - ${PYTHON_CPPFLAGS} \ - -I${top_builddir}/common \ - -I${top_srcdir}/common - -endif - -.scm-links: - $(RM) -rf gnucash - mkdir -p gnucash -if GNUCASH_SEPARATE_BUILDDIR - for X in ${SCM_FILE_LINKS} ; do \ - $(LN_S) -f ${srcdir}/$$X . ; \ - done -endif - ( cd gnucash; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../$$A . ; done ) -if ! OS_WIN32 -# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567). - touch .scm-links -endif - -GUILE_COMPILE_ENV = \ - --library-dir ${top_builddir}/libgnucash/core-utils - -%.go : %.scm .scm-links $(lib_LTLIBRARIES) - GNC_UNINSTALLED=yes \ - GNC_BUILDDIR=${top_builddir} \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \ - $(GUILD) compile -o $@ $< - -gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash -gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) - -noinst_DATA = .scm-links -BUILT_SOURCES = gncla-dir.h gnc-version.h -EXTRA_DIST = \ - $(gncscmmod_DATA) \ - core-utils.i \ - gncla-dir.h.in \ - gnc-vcs-info.h \ - CMakeLists.txt - -clean-local: - rm -rf gnucash - -CLEANFILES = $(BUILT_SOURCES) .scm-links ${gncscmmodcache_DATA} - -MAINTAINERCLEANFILES = swig-core-utils-guile.c swig-core-utils-python.c - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.core-utils\" -DGNC_SCM_INSTALL_DIR="\"${GNC_SCM_INSTALL_DIR}\"" - -gncla-dir.h: gncla-dir.h.in ${top_builddir}/config.status Makefile - rm -f $@.tmp - sed < $< > $@.tmp \ - -e 's#[@]DATADIRNAME[@]#${DATADIRNAME}#g' \ - -e 's#[@]libdir[@]#${libdir}#g' \ - -e 's#[@]bindir[@]#${bindir}#g' \ - -e 's#[@]sysconfdir[@]#${sysconfdir}#g' \ - -e 's#[@]datadir[@]#${datadir}#g' \ - -e 's#[@]prefix[@]#${prefix}#g' - mv $@.tmp $@ - -gnc-version.h: _gnc-version.h - -if [ ! -f gnc-version.h ]; then cp _gnc-version.h gnc-version.h; fi - -cmp -s _gnc-version.h gnc-version.h || cp _gnc-version.h gnc-version.h - -rm -f _gnc-version.h - -_gnc-version.h: gnc-vcs-info.h Makefile - @echo "/* Autogenerated. Do not change. */" > _gnc-version.h - @echo "#ifndef GNC_VERSION_H" >> _gnc-version.h - @echo "#define GNC_VERSION_H" >> _gnc-version.h - @echo "" >> _gnc-version.h - @scm_info=`${top_srcdir}/util/gnc-vcs-info -t ${top_srcdir}` ; \ - if [ $$? = 0 ] ; then \ - echo "#define GNC_VCS \"$$scm_info\"" >> _gnc-version.h ; \ - fi - @echo "#include \"gnc-vcs-info.h\"" >> _gnc-version.h - @echo "#endif" >> _gnc-version.h - -if BUILDING_FROM_VCS -gnc-vcs-info.h: _gnc-vcs-info.h - -if [ ! -f gnc-vcs-info.h ]; then cp _gnc-vcs-info.h gnc-vcs-info.h; fi - -cmp -s _gnc-vcs-info.h gnc-vcs-info.h || cp _gnc-vcs-info.h gnc-vcs-info.h - -rm -f _gnc-vcs-info.h - -_gnc-vcs-info.h: Makefile - @scm_info=`${top_srcdir}/util/gnc-vcs-info -r ${top_srcdir}` ; \ - info_result=$$? ; \ - scm_date=`${top_srcdir}/util/gnc-vcs-info -d ${top_srcdir}` ; \ - date_result=$$? ; \ - if [ $$info_result != 0 ] || [ $$date_result != 0 ] ; then \ - echo "You're building from svn/svk/git/bzr... But your build system is broken" ; \ - echo "Don't do that. Complain to your build-system creator." ; \ - exit 1 ; \ - else \ - if [ -z "$$scm_info" ] || [ -z "$$scm_date" ] ; then \ - echo "gnc-vcs-info failed. figure out why." ; \ - echo "can't determine svn/svk/git/bzr revision from ${top_srcdir}." ; \ - exit 1 ; \ - fi ; \ - echo "/* Autogenerated. Do not change. */" > _gnc-vcs-info.h ; \ - echo "#define GNC_VCS_REV \"$$scm_info\"" >> _gnc-vcs-info.h ; \ - echo "#define GNC_VCS_REV_DATE \"$$scm_date\"" >> _gnc-vcs-info.h ; \ - echo "#define GNC_VCS_REV_YEAR \"$${scm_date%%-*}\"" >> _gnc-vcs-info.h ; \ - echo "#define GNC_VCS_REV_Y_M \"$${scm_date%-*}\"" >> _gnc-vcs-info.h ; \ - fi -endif diff --git a/libgnucash/core-utils/test/CMakeLists.txt b/libgnucash/core-utils/test/CMakeLists.txt index 2d7f46b6ee..10d53529be 100644 --- a/libgnucash/core-utils/test/CMakeLists.txt +++ b/libgnucash/core-utils/test/CMakeLists.txt @@ -52,6 +52,6 @@ set(test_gnc_path_util_SOURCES gnc_add_test(test-gnc-path-util "${test_gnc_path_util_SOURCES}" gtest_core_utils_INCLUDES gtest_core_utils_LIBS "GNC_UNINSTALLED=yes") -SET_DIST_LIST(test_core_utils_DIST CMakeLists.txt Makefile.am +SET_DIST_LIST(test_core_utils_DIST CMakeLists.txt test-gnc-glib-utils.c test-resolve-file-path.c test-userdata-dir.c test-userdata-dir-invalid-home.c gtest-path-utilities.cpp) diff --git a/libgnucash/core-utils/test/Makefile.am b/libgnucash/core-utils/test/Makefile.am deleted file mode 100644 index 7d8ba3d1f5..0000000000 --- a/libgnucash/core-utils/test/Makefile.am +++ /dev/null @@ -1,67 +0,0 @@ -include $(top_srcdir)/test-templates/Makefile.decl -MODULEPATH = libgnucash/core-utils - -# We add src/engine here, just to load qof.h, which -# is pulled in via test-core -AM_CPPFLAGS = \ - -I${top_srcdir} \ - -I${top_srcdir}/common \ - -I${top_srcdir}/common/test-core \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/engine \ - ${GUILE_CFLAGS} \ - ${GLIB_CFLAGS} \ - ${GTK_MAC_CFLAGS} \ - $(BOOST_CPPFLAGS) - -LDADD = \ - ../libgnc-core-utils.la \ - ${top_builddir}/common/test-core/libtest-core.la \ - ${GLIB_LIBS} \ - ${GTK_MAC_LIBS} \ - ${BOOST_LDFLAGS} - -# these tests are ordered kind more or less in the order -# that they should be executed, with more basic tests coming first. -# - -TESTS = \ - test-gnc-glib-utils \ - test-resolve-file-path \ - test-userdata-dir - -if !PLATFORM_OSX_QUARTZ -if !PLATFORM_WIN32 -TESTS += test-userdata-dir-invalid-home -endif -endif - -GNC_TEST_DEPS = \ - --library-dir ${top_builddir}/libgnucash/core-utils - -TESTS_ENVIRONMENT = \ - SRCDIR=${srcdir} \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS}) - -check_PROGRAMS = ${TESTS} - -test_gnc_glib_utils_SOURCES = \ - $(top_srcdir)/$(MODULEPATH)/gnc-glib-utils.c \ - test-gnc-glib-utils.c - -test_gnc_glib_utils_LDADD = \ - ${top_builddir}/common/test-core/libtest-core.la \ - $(GLIB_LIBS) - -test_gnc_glib_utils_CFLAGS = \ - ${DEFAULT_INCLUDES} \ - -I${top_srcdir}/${MODULEPATH} \ - ${GLIB_CFLAGS} - -EXTRA_DIST += \ - CMakeLists.txt - -clean-local: - rm -f translog.* - -distclean-local: clean-local diff --git a/libgnucash/doc/CMakeLists.txt b/libgnucash/doc/CMakeLists.txt index a54a7a2cc0..55a812299f 100644 --- a/libgnucash/doc/CMakeLists.txt +++ b/libgnucash/doc/CMakeLists.txt @@ -35,6 +35,6 @@ SET(doc_FILES user-prefs-howto.txt ) -SET_LOCAL_DIST(doc_DIST_local CMakeLists.txt Makefile.am ${doc_FILES}) +SET_LOCAL_DIST(doc_DIST_local CMakeLists.txt ${doc_FILES}) SET(doc_DIST ${doc_DIST_local} ${doc_design_DIST} ${doc_xml_DIST} PARENT_SCOPE) diff --git a/libgnucash/doc/Makefile.am b/libgnucash/doc/Makefile.am deleted file mode 100644 index 2827224943..0000000000 --- a/libgnucash/doc/Makefile.am +++ /dev/null @@ -1,58 +0,0 @@ - -SUBDIRS = \ - xml -DIST_SUBDIRS = $(SUBDIRS) design - -EXTRA_DIST = \ - README \ - TODO-schedxactions \ - TODO-sixtp \ - backup.txt \ - books.txt \ - budget.txt \ - callgrind.txt \ - constderv.html \ - currencies.txt \ - doxygen.cfg.in \ - doxygen_main_page.c \ - finderv.html \ - finutil.html \ - generic-druid-framework.txt \ - guid.txt \ - loans.txt \ - lots.txt \ - multicurrency-discussion.txt \ - qif.txt \ - tax.txt \ - user-prefs-howto.txt \ - python-bindings-doxygen.py \ - CMakeLists.txt - - -all: - -doc: doxygen.cfg - @echo "doc: " $$(pwd) && echo "distdir: " $$(echo $(distdir)) - rm -rf html refman.pdf - $(DOXYGEN) doxygen.cfg -# $(MAKE) -C latex/ -# mv latex/refman.pdf ./refman.pdf - -distclean-local: - echo "distclean-local: " && pwd - rm -f doxygen.cfg doxygen.log - -maintainer-clean-local: - echo "maintainer-clean-local: " && pwd - rm -rf html latex - rm -f refman.pdf - -uninstall-hook: - rm -rf ${docdir}/html - -doxygen.cfg: doxygen.cfg.in Makefile - rm -f $@.tmp - sed < $< > $@.tmp \ - -e 's:[@]top_srcdir[@]:${top_srcdir}:g; s:[@]VERSION[@]:${VERSION}:g' - mv $@.tmp $@ - diff --git a/libgnucash/doc/design/CMakeLists.txt b/libgnucash/doc/design/CMakeLists.txt index b47fbb01a3..bc5e5e5a3a 100644 --- a/libgnucash/doc/design/CMakeLists.txt +++ b/libgnucash/doc/design/CMakeLists.txt @@ -46,4 +46,4 @@ ELSE() ) ENDIF() -SET_DIST_LIST(doc_design_DIST CMakeLists.txt Makefile.am gnucash-design.texi ${gnucash_design_TEXINFOS}) +SET_DIST_LIST(doc_design_DIST CMakeLists.txt gnucash-design.texi ${gnucash_design_TEXINFOS}) diff --git a/libgnucash/doc/design/Makefile.am b/libgnucash/doc/design/Makefile.am deleted file mode 100644 index 401fccb61b..0000000000 --- a/libgnucash/doc/design/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ - -info_TEXINFOS = gnucash-design.texi -gnucash_design_TEXINFOS = \ - component-manager.texi \ - concept-index.texi \ - engine.texi \ - fdl.texi \ - function-index.texi \ - intro.texi \ - register.texi \ - reports.texi \ - top-level.texi \ - type-index.texi \ - user-preferences.texi - -# These should included as part of the automake rule set. Perhaps I -# have a version skew between automake and texinfo. -DISTCLEANFILES = gnucash-design.cps gnucash-design.fns gnucash-design.tps -MAINTAINERCLEANFILES = gnucash-design.info gnucash-design.info-[0-9]* - -EXTRA_DIST = CMakeLists.txt diff --git a/libgnucash/doc/xml/CMakeLists.txt b/libgnucash/doc/xml/CMakeLists.txt index 0dca2d5cc1..08de6aec09 100644 --- a/libgnucash/doc/xml/CMakeLists.txt +++ b/libgnucash/doc/xml/CMakeLists.txt @@ -12,4 +12,4 @@ SET(doc_xml_FILES types.dtd ) -SET_DIST_LIST(doc_xml_DIST CMakeLists.txt Makefile.am ${doc_xml_FILES}) \ No newline at end of file +SET_DIST_LIST(doc_xml_DIST CMakeLists.txt ${doc_xml_FILES}) \ No newline at end of file diff --git a/libgnucash/doc/xml/Makefile.am b/libgnucash/doc/xml/Makefile.am deleted file mode 100644 index 25205e2469..0000000000 --- a/libgnucash/doc/xml/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ - -EXTRA_DIST = \ - README \ - account-v2.dtd \ - commodity-v2.dtd \ - defaults-v1.dtd \ - io-gncxml-version1.dtd \ - io-gncxml-version2.dtd \ - preferences-v1.dtd \ - prices-v1.dtd \ - transactions-v2.dtd \ - types.dtd \ - CMakeLists.txt diff --git a/libgnucash/engine/CMakeLists.txt b/libgnucash/engine/CMakeLists.txt index 23f228c881..f5301ded91 100644 --- a/libgnucash/engine/CMakeLists.txt +++ b/libgnucash/engine/CMakeLists.txt @@ -315,6 +315,6 @@ SET(engine_EXTRA_DIST IF (NOT WIN32) LIST(APPEND engine_EXTRA_DIST qof-win32.cpp) ENDIF (NOT WIN32) -SET_LOCAL_DIST(engine_DIST_local CMakeLists.txt Makefile.am ${engine_SOURCES} ${engine_HEADERS} +SET_LOCAL_DIST(engine_DIST_local CMakeLists.txt ${engine_SOURCES} ${engine_HEADERS} ${engine_noinst_HEADERS} ${engine_SCHEME_0} ${engine_SCHEME_1} ${engine_EXTRA_DIST}) SET(engine_DIST ${engine_DIST_local} ${engine_test_core_DIST} ${test_engine_DIST} PARENT_SCOPE) diff --git a/libgnucash/engine/Makefile.am b/libgnucash/engine/Makefile.am deleted file mode 100644 index 088b9b4f8e..0000000000 --- a/libgnucash/engine/Makefile.am +++ /dev/null @@ -1,324 +0,0 @@ -# Note the test subdirectory is added in src/Makefile.am rather -# than here. This is because we need it to build after src/test-core -# but that directory requires src/engine to be built already... -SUBDIRS = . test-core - -pkglib_LTLIBRARIES = libgncmod-engine.la - -AM_CPPFLAGS = \ - -I${top_srcdir}/borrowed/libc \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_builddir}/libgnucash/core-utils \ - -I${top_srcdir}/common \ - -I${top_builddir}/common \ - -I${top_srcdir}/libgnucash/gnc-module \ - ${GLIB_CFLAGS} \ - ${GUILE_CFLAGS} \ - $(BOOST_CPPFLAGS) - - -libgncmod_engine_la_SOURCES = \ - Account.cpp \ - Recurrence.c \ - Query.c \ - SchedXaction.c \ - SX-book.c \ - SX-ttinfo.c \ - Scrub.c \ - Scrub2.c \ - Scrub3.c \ - ScrubBusiness.c \ - Split.c \ - TransLog.c \ - Transaction.c \ - cap-gains.c \ - cashobjects.c \ - gnc-aqbanking-templates.cpp \ - gnc-budget.c \ - gnc-commodity.c \ - gnc-date.cpp \ - gnc-datetime.cpp \ - gnc-engine.c \ - gnc-event.c \ - gnc-features.c \ - gnc-hooks.c \ - gnc-int128.cpp \ - gnc-lot.c \ - gnc-numeric.cpp \ - gnc-pricedb.c \ - gnc-rational.cpp \ - gnc-session.c \ - gnc-timezone.cpp \ - gnc-uri-utils.c \ - gncmod-engine.c \ - guid.cpp \ - swig-engine.c \ - kvp-frame.cpp \ - kvp-scm.cpp \ - kvp-value.cpp \ - engine-helpers.c \ - glib-helpers.c \ - policy.c \ - gncBusGuile.c \ - gncBusiness.c \ - gncAddress.c \ - gncBillTerm.c \ - gncCustomer.c \ - gncEmployee.c \ - gncEntry.c \ - gncInvoice.c \ - gncJob.c \ - gncOrder.c \ - gncOwner.c \ - gncTaxTable.c \ - gncIDSearch.c \ - gncVendor.c \ - qof-backend.cpp \ - qofbook.cpp \ - qofchoice.cpp \ - qofclass.cpp \ - qofevent.cpp \ - qofid.cpp \ - qofinstance.cpp \ - qoflog.cpp \ - qofobject.cpp \ - qofquery.cpp \ - qofquerycore.cpp \ - qofsession.cpp \ - qof-string-cache.cpp \ - qofutil.cpp - -if OS_WIN32 -libgncmod_engine_la_SOURCES += qof-win32.cpp -else -WIN32_EXTRA_DIST = qof-win32.cpp -endif - -EXTRA_libgncmod_engine_la_SOURCES = iso-4217-currencies.c - -gncincludedir = ${GNC_INCLUDE_DIR} -gncinclude_HEADERS = \ - Account.h \ - FreqSpec.h \ - Recurrence.h \ - SchedXaction.h \ - SX-book.h \ - SX-ttinfo.h \ - Query.h \ - Scrub.h \ - Scrub2.h \ - Scrub3.h \ - ScrubBusiness.h \ - Split.h \ - TransLog.h \ - Transaction.h \ - cap-gains.h \ - cashobjects.h \ - engine-helpers.h \ - engine-helpers-guile.h \ - glib-helpers.h \ - gnc-aqbanking-templates.h \ - gnc-budget.h \ - gnc-commodity.h \ - gnc-date.h \ - gnc-datetime.hpp \ - gnc-engine.h \ - gnc-event.h \ - gnc-features.h \ - gnc-hooks.h \ - gnc-numeric.h \ - gnc-numeric.hpp \ - gnc-pricedb.h \ - gnc-rational.hpp \ - gnc-rational-rounding.hpp \ - gnc-session.h \ - gnc-timezone.hpp \ - gnc-uri-utils.h \ - gncAddress.h \ - gncAddressP.h \ - gncBillTerm.h \ - gncBillTermP.h \ - gncBusiness.h \ - gncBusGuile.h \ - gncCustomer.h \ - gncCustomerP.h \ - gncEmployee.h \ - gncEmployeeP.h \ - gncEntry.h \ - gncEntryP.h \ - gncInvoice.h \ - gncInvoiceP.h \ - gncJob.h \ - gncJobP.h \ - gncOrder.h \ - gncOrderP.h \ - gncOwner.h \ - gncOwnerP.h \ - gncTaxTable.h \ - gncTaxTableP.h \ - gncIDSearch.h \ - gncVendor.h \ - gncVendorP.h \ - guid.h \ - guid.hpp \ - kvp-frame.hpp \ - kvp-scm.h \ - kvp-value.hpp \ - policy.h \ - qof.h \ - qof-backend.hpp \ - qofbackend.h \ - qofbook.h \ - qofbookslots.h \ - qofchoice.h \ - qofclass.h \ - qofevent.h \ - qofid-p.h \ - qofid.h \ - qofinstance-p.h \ - qofinstance.h \ - qoflog.h \ - qofobject.h \ - qofquery.h \ - qofquerycore.h \ - qofsession.h \ - qofsession.hpp \ - qofutil.h \ - qof-gobject.h \ - qof-string-cache.h - -noinst_HEADERS = \ - AccountP.h \ - ScrubP.h \ - SplitP.h \ - SX-book.h \ - SX-ttinfo.h \ - TransactionP.h \ - gnc-backend-prov.hpp \ - gnc-date-p.h \ - gnc-hooks-scm.h \ - gnc-int128.hpp \ - gnc-lot.h \ - gnc-lot-p.h \ - gnc-pricedb-p.h \ - policy-p.h \ - qofbook-p.h \ - qofclass-p.h \ - qofevent-p.h \ - qofobject-p.h \ - qofquery-p.h \ - qofquerycore-p.h - -libgncmod_engine_la_LDFLAGS = -avoid-version -if PLATFORM_WIN32 -libgncmod_engine_la_LDFLAGS += -Wl,-export-all-symbols -endif -if CLANG -libgncmod_engine_la_CFLAGS = ${AM_CFLAGS} -Wno-invalid-source-encoding -else -libgncmod_engine_la_CFLAGS = ${AM_CFLAGS} -endif -libgncmod_engine_la_LIBADD = \ - ../gnc-module/libgnc-module.la \ - ../core-utils/libgnc-core-utils.la \ - ${GUILE_LIBS} \ - ${REGEX_LIBS} \ - ${GLIB_LIBS} \ - ${BOOST_LDFLAGS} -lboost_regex \ - ${top_builddir}/borrowed/libc/libc-missing.la - -gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash -gncscmmod_DATA = engine.scm \ - business-core.scm - -gncscmdir = ${GNC_SCM_INSTALL_DIR} -gncscm_DATA = \ - commodity-table.scm \ - engine-interface.scm \ - engine-utilities.scm \ - gnc-numeric.scm - -EXTRA_DIST = \ - README.query-api \ - design.txt \ - extensions.txt \ - iso-4217-currencies.xml \ - iso-currencies-to-c.xsl \ - kvp_doc.txt \ - SX-book-p.h \ - engine.i \ - engine-common.i \ - business-core.i \ - ${gncscmmod_DATA} \ - ${gncscm_DATA} \ - CMakeLists.txt \ - ${WIN32_EXTRA_DIST} - -if GNUCASH_SEPARATE_BUILDDIR -#For executing test cases -SCM_FILE_LINKS = \ - ${gncscmmod_DATA} \ - ${gncscm_DATA} -endif - -.scm-links: - $(RM) -rf gnucash - mkdir -p gnucash -if GNUCASH_SEPARATE_BUILDDIR - for X in ${SCM_FILE_LINKS} ; do \ - $(LN_S) -f ${srcdir}/$$X . ; \ - done -endif - ( cd gnucash; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../$$A . ; done ) -if ! OS_WIN32 -# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567). - touch .scm-links -endif - -GUILE_COMPILE_ENV = \ - --guile-load-dir ${top_builddir}/libgnucash/gnc-module \ - --library-dir ${top_builddir}/libgnucash/engine \ - --library-dir ${top_builddir}/libgnucash/gnc-module \ - --library-dir ${top_builddir}/libgnucash/core-utils - -%.go : %.scm .scm-links $(pkglib_LTLIBRARIES) - GNC_UNINSTALLED=yes \ - GNC_BUILDDIR=${top_builddir} \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \ - $(GUILD) compile -o $@ $< - -gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash -gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) - -gncscmcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@ -gncscmcache_DATA = $(gncscm_DATA:.scm=.go) - -noinst_DATA = .scm-links - -if BUILDING_FROM_VCS - -swig-engine.c: engine.i $(top_srcdir)/common/base-typemaps.i \ - $(gncinclude_HEADERS) $(noinst_HEADERS) - $(SWIG) -guile -Linkage module \ - -I${top_srcdir}/common -o $@ $< -endif - - -iso-4217-currencies.c: iso-4217-currencies.xml iso-currencies-to-c.xsl - $(XSLTPROC) -o $@ $(srcdir)/iso-currencies-to-c.xsl $< - -BUILT_SOURCES = iso-4217-currencies.c - -CLEANFILES = \ - $(BUILT_SOURCES) \ - .scm-links \ - ${SCM_FILE_LINKS} \ - ${gncscmmodcache_DATA} \ - ${gncscmcache_DATA} - -MAINTAINERCLEANFILES = swig-engine.c - -clean-local: - rm -rf gnucash - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.engine\" diff --git a/libgnucash/engine/test-core/CMakeLists.txt b/libgnucash/engine/test-core/CMakeLists.txt index 56cfc9fb9f..d5572b5f7e 100644 --- a/libgnucash/engine/test-core/CMakeLists.txt +++ b/libgnucash/engine/test-core/CMakeLists.txt @@ -16,5 +16,5 @@ TARGET_INCLUDE_DIRECTORIES(gncmod-test-engine PRIVATE ${CMAKE_SOURCE_DIR}/common/test-core ) -SET_DIST_LIST(engine_test_core_DIST CMakeLists.txt Makefile.am ${libgncmod_test_engine_SOURCES} +SET_DIST_LIST(engine_test_core_DIST CMakeLists.txt ${libgncmod_test_engine_SOURCES} test-engine-stuff.h test-engine-strings.h) diff --git a/libgnucash/engine/test-core/Makefile.am b/libgnucash/engine/test-core/Makefile.am deleted file mode 100644 index 5e097abc44..0000000000 --- a/libgnucash/engine/test-core/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -noinst_LTLIBRARIES=libgncmod-test-engine.la - -LDADD = \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ../libgncmod-engine.la \ - ${GLIB_LIBS} - -libgncmod_test_engine_la_SOURCES = gncmod-test-engine.c test-engine-stuff.cpp -libgncmod_test_engine_la_LDFLAGS = -module -libgncmod_test_engine_la_LIBADD = \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ../libgncmod-engine.la \ - ${GLIB_LIBS} - -noinst_HEADERS=test-engine-stuff.h test-engine-strings.h - -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/common/test-core \ - -I${top_srcdir}/libgnucash/engine \ - ${GLIB_CFLAGS} \ - ${GUILE_CFLAGS} \ - ${BOOST_CPPFLAGS} - -EXTRA_DIST = CMakeLists.txt diff --git a/libgnucash/engine/test/CMakeLists.txt b/libgnucash/engine/test/CMakeLists.txt index 7d01288ba8..6cc96e320e 100644 --- a/libgnucash/engine/test/CMakeLists.txt +++ b/libgnucash/engine/test/CMakeLists.txt @@ -302,5 +302,5 @@ SET(test_engine_EXTRA_DIST README ) -SET_DIST_LIST(test_engine_DIST CMakeLists.txt Makefile.am +SET_DIST_LIST(test_engine_DIST CMakeLists.txt ${test_engine_SOURCES_DIST} ${test_engine_SCHEME_DIST} ${test_engine_EXTRA_DIST}) diff --git a/libgnucash/engine/test/Makefile.am b/libgnucash/engine/test/Makefile.am deleted file mode 100644 index 94a7a338e9..0000000000 --- a/libgnucash/engine/test/Makefile.am +++ /dev/null @@ -1,212 +0,0 @@ -include $(top_srcdir)/test-templates/Makefile.decl - -MODULEPATH = libgnucash/engine - -AM_CPPFLAGS = \ - -I${top_srcdir} \ - -I${top_srcdir}/common \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/common/test-core \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/engine/test-core \ - -I${top_srcdir}/libgnucash/core-utils \ - ${GUILE_CFLAGS} \ - ${GLIB_CFLAGS} \ - ${BOOST_CPPFLAGS} - -LDADD = \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${top_builddir}/common/test-core/libtest-core.la \ - ../libgncmod-engine.la \ - ../test-core/libgncmod-test-engine.la \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \ - ${GLIB_LIBS} - -test_guid_SOURCES = test-guid.cpp - -# these tests are ordered kind more or less in the order -# that they should be executed, with more basic tests coming first. -# -TEST_GROUP_1 = \ - test-link \ - test-load-engine \ - test-guid \ - test-date \ - test-object \ - test-commodities \ - test-qof \ - test-engine - -TEST_GROUP_2 = \ - test-account-object \ - test-group-vs-book \ - test-lots \ - test-querynew \ - test-query \ - test-split-vs-account \ - test-transaction-reversal \ - test-transaction-voiding \ - test-recurrence \ - test-scm-query \ - test-business \ - test-address \ - test-customer \ - test-employee \ - test-job \ - test-vendor - -SCM_TESTS = \ - test-create-account \ - test-test-extras \ - test-account \ - test-split -# test-scm-query-import \ Fails - -SCM_TEST_SRCS = $(SCM_TESTS:%=%.scm) - -GNC_TEST_DEPS = \ - --gnc-module-dir ${top_builddir}/libgnucash/engine \ - --gnc-module-dir ${top_builddir}/libgnucash/engine/test \ - --gnc-module-dir ${top_builddir}/libgnucash/app-utils \ - --guile-load-dir ${top_builddir}/libgnucash/gnc-module \ - --guile-load-dir ${top_builddir}/libgnucash/engine \ - --guile-load-dir ${top_builddir}/libgnucash/app-utils \ - --guile-load-dir ${top_builddir}/libgnucash/core-utils \ - --guile-load-dir ${top_builddir}/libgnucash/scm \ - --guile-load-dir ${top_builddir}/libgnucash/engine/test \ - --library-dir ${top_builddir}/libgnucash/core-utils \ - --library-dir ${top_builddir}/libgnucash/gnc-module \ - --library-dir ${top_builddir}/libgnucash/engine \ - --library-dir ${top_builddir}/libgnucash/app-utils \ - --library-dir ${top_builddir}/libgnucash/backend/xml \ - --library-dir ${top_builddir}/libgnucash/backend/sql \ - --library-dir ${top_builddir}/libgnucash/engine/test - -test_account_object_SOURCES = test-account-object.cpp -test_commodities_SOURCES = test-commodities.cpp -test_date_SOURCES = test-date.cpp -test_group_vs_book_SOURCES = test-group-vs-book.cpp -test_lots_SOURCES = test-lots.cpp - -test_query_SOURCES = test-query.cpp -test_scm_query_SOURCES = test-scm-query.cpp -test_split_vs_account_SOURCES = test-split-vs-account.cpp -test_transaction_reversal_SOURCES = test-transaction-reversal.cpp -test_transaction_voiding_SOURCES = test-transaction-voiding.cpp - -$(SCM_TESTS): %: $(srcdir)/%.scm Makefile .scm-links - echo 'export GNC_BUILDDIR="${abs_top_builddir}";' > $@ - echo 'export GNC_UNINSTALLED=yes;' >> $@ - echo '${GUILE} --debug -l $(srcdir)/$*.scm -c "(exit (run-test))"' >> $@ - chmod a+x $@ - -TESTS_ENVIRONMENT = \ - GUILE_WARN_DEPRECATED=no \ - GUILE="${GUILE}" \ - SRCDIR=${srcdir} \ - GNC_BUILDDIR="${abs_top_builddir}" \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS}) - -check_PROGRAMS = ${TEST_GROUP_1} ${TEST_GROUP_2} - -TESTS = ${TEST_GROUP_1} ${TEST_GROUP_2} ${SCM_TESTS} - -test_link_SOURCES = test-link.c -test_link_LDADD = ../libgncmod-engine.la \ - ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la - -if WITH_GOOGLE_PROFILER -LDADD += -lprofiler -endif - -SCM_TEST_HELPERS = test-extras.scm - -EXTRA_DIST += \ - $(SCM_TEST_HELPERS) \ - $(SCM_TEST_SRCS) \ - CMakeLists.txt - -TEST_PROGS += test-engine - -.scm-links: - $(RM) -rf gnucash - mkdir -p gnucash/engine/test - ( cd gnucash/engine/test; for A in $(SCM_TEST_HELPERS) ; do $(LN_S) -f $(abs_srcdir)/$$A . ; done ) -if ! OS_WIN32 -# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567). - touch .scm-links -endif - -noinst_PROGRAMS = ${TEST_PROGS} ${CHECK_PROGS} - -noinst_DATA: .scm-links - -test_qof_SOURCES = \ - test-gnc-date.c \ - test-qof.c \ - test-qofbook.c \ - test-qofinstance.cpp \ - test-qofobject.c \ - test-qof-string-cache.c - -test_qof_LDADD = \ - $(LDADD) -test_qof_CFLAGS = \ - ${DEFAULT_INCLUDES} \ - -I${top_srcdir}/${MODULEPATH}/ \ - -DTESTPROG=test_qof \ - ${GLIB_CFLAGS} \ - ${AM_CFLAGS} - -test_engine_SOURCES = \ - test-engine.c \ - test-gnc-uri-utils.c \ - utest-Account.cpp \ - utest-Budget.c \ - utest-Entry.c \ - utest-Invoice.c \ - test-engine-kvp-properties.c \ - utest-gnc-pricedb.c \ - utest-Transaction.cpp \ - dummy.cpp \ - utest-Split.cpp \ - ${top_srcdir}/${MODULEPATH}/gnc-numeric.cpp - -test_engine_LDADD = \ - $(LDADD) -test_engine_CFLAGS = \ - ${DEFAULT_INCLUDES} \ - -I${top_srcdir}/${MODULEPATH}/ \ - -DTESTPROG=test_engine \ - ${GLIB_CFLAGS} \ - ${AM_CFLAGS} -test_engine_CXXFLAGS = -Wno-write-strings $(AM_CXXFLAGS) - -test_import_map_SOURCES = \ - gtest-import-map.cpp -test_import_map_LDADD = \ - ${top_builddir}/libgnucash/engine/libgncmod-engine.la \ - ${GLIB_LIBS} \ - ${GTEST_LIBS} - -if !GOOGLE_TEST_LIBS -nodist_test_import_map_SOURCES = \ - ${GTEST_SRC}/src/gtest_main.cc -endif - -test_import_map_CPPFLAGS = \ - -I${GTEST_HEADERS} \ - -I${top_srcdir}/${MODULEPATH} \ - -I${top_srcdir}/libgnucash/core-utils \ - ${GLIB_CFLAGS} - -TEST_GROUP_1 += test-import-map - - -CLEANFILES = .scm-links -DISTCLEANFILES = $(SCM_TESTS) - -clean-local: - rm -f translog.* - -distclean-local: clean-local diff --git a/libgnucash/gnc-module/CMakeLists.txt b/libgnucash/gnc-module/CMakeLists.txt index c599e976ab..120a592559 100644 --- a/libgnucash/gnc-module/CMakeLists.txt +++ b/libgnucash/gnc-module/CMakeLists.txt @@ -59,6 +59,6 @@ GNC_ADD_SCHEME_TARGETS(scm-gnc-module FALSE ) -SET_LOCAL_DIST(gnc_module_DIST_local CMakeLists.txt Makefile.am ${gnc_module_SOURCES} ${gnc_module_HEADERS} +SET_LOCAL_DIST(gnc_module_DIST_local CMakeLists.txt ${gnc_module_SOURCES} ${gnc_module_HEADERS} gnc-module.i gnc-module.scm README) SET(gnc_module_DIST ${gnc_module_DIST_local} ${test_gnc_module_DIST} ${example_DIST} PARENT_SCOPE) diff --git a/libgnucash/gnc-module/Makefile.am b/libgnucash/gnc-module/Makefile.am deleted file mode 100644 index 1d99001346..0000000000 --- a/libgnucash/gnc-module/Makefile.am +++ /dev/null @@ -1,94 +0,0 @@ -# No SUBDIR variable here... -# The 'test' subdir is added via src/Makefile to handle -# it's dependency on src/engine - -AM_CPPFLAGS = \ - -I${top_srcdir}/borrowed/libc \ - -I${top_srcdir}/common \ - -I${top_srcdir}/libgnucash/core-utils \ - ${GLIB_CFLAGS} \ - ${GUILE_CFLAGS} - -lib_LTLIBRARIES = libgnc-module.la - -libgnc_module_la_SOURCES = gnc-module.c swig-gnc-module.c - -libgnc_module_la_LIBADD = \ - ../core-utils/libgnc-core-utils.la \ - ${top_builddir}/borrowed/libc/libc-missing.la \ - ${GLIB_LIBS} \ - ${GUILE_LIBS} - -gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash -gncscmmod_DATA = gnc-module.scm - -gncincludedir = ${GNC_INCLUDE_DIR} -gncinclude_HEADERS = \ - gnc-module-api.h \ - gnc-module.h - -noinst_DATA = .scm-links - -if BUILDING_FROM_VCS -swig-gnc-module.c: gnc-module.i ${top_srcdir}/common/base-typemaps.i - $(SWIG) -guile -Linkage module \ - -I${top_srcdir}/common -o $@ $< -endif - -EXAMPLE_EXTRA_DIST = \ - example/CMakeLists.txt \ - example/Makefile.am \ - example/gnc-plugin.example.c \ - example/gnc-plugin.example.h \ - example/gncmod-example.c \ - example/glade/CMakeLists.txt \ - example/glade/Makefile.am \ - example/ui/CMakeLists.txt \ - example/ui/Makefile.am \ - example/ui/gnc-plugin-example-ui.xml - -EXTRA_DIST = \ - ${gncscmmod_DATA} \ - gnc-module.i \ - CMakeLists.txt \ - ${EXAMPLE_EXTRA_DIST} - -if GNUCASH_SEPARATE_BUILDDIR -#For executing test cases -SCM_FILE_LINKS = ${gncscmmod_DATA} -endif - -.scm-links: - $(RM) -rf gnucash - mkdir -p gnucash -if GNUCASH_SEPARATE_BUILDDIR - for X in ${SCM_FILE_LINKS} ; do \ - $(LN_S) -f ${srcdir}/$$X . ; \ - done -endif - ( cd gnucash; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../$$A . ; done ) -if ! OS_WIN32 -# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567). - touch .scm-links -endif - -GUILE_COMPILE_ENV = \ - --library-dir ${top_builddir}/libgnucash/gnc-module \ - --library-dir ${top_builddir}/libgnucash/core-utils - -%.go : %.scm .scm-links $(lib_LTLIBRARIES) - GNC_UNINSTALLED=yes \ - GNC_BUILDDIR=${top_builddir} \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \ - $(GUILD) compile -o $@ $< - -gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash -gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) - -clean-local: - rm -rf gnucash - -CLEANFILES = .scm-links ${SCM_FILE_LINKS} ${gncscmmodcache_DATA} -MAINTAINERCLEANFILES = swig-gnc-module.c - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.module\" diff --git a/libgnucash/gnc-module/example/CMakeLists.txt b/libgnucash/gnc-module/example/CMakeLists.txt index 5df1ddb635..62830ea029 100644 --- a/libgnucash/gnc-module/example/CMakeLists.txt +++ b/libgnucash/gnc-module/example/CMakeLists.txt @@ -4,5 +4,5 @@ ADD_SUBDIRECTORY(ui) SET(example_SOURCES gnc-plugin.example.c gncmod-example.c) SET(example_noinst_HEADERS gnc-plugin.example.h) -SET_LOCAL_DIST(example_DIST_local CMakeLists.txt Makefile.am ${example_SOURCES} ${example_noinst_HEADERS}) +SET_LOCAL_DIST(example_DIST_local CMakeLists.txt ${example_SOURCES} ${example_noinst_HEADERS}) SET(example_DIST ${example_DIST_local} ${example_glade_DIST} ${example_ui_DIST} PARENT_SCOPE) \ No newline at end of file diff --git a/libgnucash/gnc-module/example/Makefile.am b/libgnucash/gnc-module/example/Makefile.am deleted file mode 100644 index d575ab64f4..0000000000 --- a/libgnucash/gnc-module/example/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -SUBDIRS = ui glade . - -pkglib_LTLIBRARIES = libgncmod-example.la - -libgncmod_example_la_SOURCES = \ - gnc-plugin-example.c \ - gncmod-example.c - -noinst_HEADERS = \ - gnc-plugin-example.h - -libgncmod_example_la_LDFLAGS = -avoid-version - -libgncmod_example_la_LIBADD = \ - ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \ - ${GNOME_LIBS} \ - ${GLADE_LIBS} \ - ${GLIB_LIBS} \ - ${AQBANKING_LIBS} - -AM_CFLAGS = \ - -I${top_srcdir}/common \ - -I${top_srcdir}/gnucash/gnome \ - -I${top_srcdir}/gnucash/register/ledger-core \ - -I${top_srcdir}/gnucash/register/register-gnome \ - -I${top_srcdir}/gnucash/register/register-core \ - -I${top_srcdir}/gnucash/gnome-utils \ - -I${top_srcdir}/libgnucash/app-utils \ - -I${top_srcdir}/libgnucash/engine \ - -I${top_srcdir}/libgnucash/core-utils \ - -I${top_srcdir}/libgnucash/gnc-module \ - ${GNOME_CFLAGS} \ - ${GLADE_CFLAGS} \ - ${GLIB_CFLAGS} \ - ${AQBANKING_CFLAGS} - -INCLUDES = -DG_LOG_DOMAIN=\"gnc.plugin.example\" diff --git a/libgnucash/gnc-module/example/glade/CMakeLists.txt b/libgnucash/gnc-module/example/glade/CMakeLists.txt index 9a85c377e0..e7f9b23c08 100644 --- a/libgnucash/gnc-module/example/glade/CMakeLists.txt +++ b/libgnucash/gnc-module/example/glade/CMakeLists.txt @@ -1 +1 @@ -SET_DIST_LIST(example_glade_DIST CMakeLists.txt Makefile.am) \ No newline at end of file +SET_DIST_LIST(example_glade_DIST CMakeLists.txt ) \ No newline at end of file diff --git a/libgnucash/gnc-module/example/glade/Makefile.am b/libgnucash/gnc-module/example/glade/Makefile.am deleted file mode 100644 index f6c5d6bfab..0000000000 --- a/libgnucash/gnc-module/example/glade/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -gladedir = $(GNC_GLADE_DIR) -glade_DATA = - -EXTRA_DIST = ${glade_DATA} CMakeLists.txt diff --git a/libgnucash/gnc-module/example/ui/CMakeLists.txt b/libgnucash/gnc-module/example/ui/CMakeLists.txt index 2e9d808ce7..ae3ea5b3d1 100644 --- a/libgnucash/gnc-module/example/ui/CMakeLists.txt +++ b/libgnucash/gnc-module/example/ui/CMakeLists.txt @@ -1 +1 @@ -SET_DIST_LIST(example_ui_DIST CMakeLists.txt Makefile.am gnc-plugin-example-ui.xml) +SET_DIST_LIST(example_ui_DIST CMakeLists.txt gnc-plugin-example-ui.xml) diff --git a/libgnucash/gnc-module/example/ui/Makefile.am b/libgnucash/gnc-module/example/ui/Makefile.am deleted file mode 100644 index f4d6c903ad..0000000000 --- a/libgnucash/gnc-module/example/ui/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -uidir = $(GNC_UI_DIR) -ui_DATA = \ - gnc-plugin-example-ui.xml - -EXTRA_DIST = $(ui_DATA) CMakeLists.txt diff --git a/libgnucash/gnc-module/test/CMakeLists.txt b/libgnucash/gnc-module/test/CMakeLists.txt index f66629990b..82f9ae856c 100644 --- a/libgnucash/gnc-module/test/CMakeLists.txt +++ b/libgnucash/gnc-module/test/CMakeLists.txt @@ -98,7 +98,7 @@ SET(test_gnc_module_EXTRA_DIST ${test_gnc_module_SCHEME} ) -SET_LOCAL_DIST(test_gnc_module_DIST_local CMakeLists.txt Makefile.am README ${test_gnc_module_SOURCE_DIST} ${test_gnc_module_EXTRA_DIST}) +SET_LOCAL_DIST(test_gnc_module_DIST_local CMakeLists.txt README ${test_gnc_module_SOURCE_DIST} ${test_gnc_module_EXTRA_DIST}) SET(test_gnc_module_DIST ${test_gnc_module_DIST_local} ${misc_mods_DIST} ${mod_bar_DIST} ${mod_baz_DIST} ${mod_foo_DIST} PARENT_SCOPE) diff --git a/libgnucash/gnc-module/test/Makefile.am b/libgnucash/gnc-module/test/Makefile.am deleted file mode 100644 index 05d31c355a..0000000000 --- a/libgnucash/gnc-module/test/Makefile.am +++ /dev/null @@ -1,77 +0,0 @@ -SUBDIRS = mod-foo mod-bar mod-baz misc-mods - -LDADD = \ - ${top_builddir}/common/test-core/libtest-core.la \ - ../libgnc-module.la ${GLIB_LIBS} ${GUILE_LIBS} - -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/common/test-core \ - -I${top_srcdir}/libgnucash/engine \ - ${GUILE_CFLAGS} \ - ${GLIB_CFLAGS} - -TESTS = \ - test-load-c \ - test-modsysver \ - test-incompatdep \ - test-agedver \ - test-dynload \ - ${SCM_TESTS} - -SCM_TESTS = \ - test-gnc-module-load-scm \ - test-gnc-module-swigged-c \ - test-gnc-module-scm-module \ - test-gnc-module-scm-multi \ - test-gnc-module-load-deps \ - test-gnc-module-scm-dynload \ - test-gnc-module-scm-init - -SCM_TEST_SRCS = $(SCM_TESTS:%=%.scm) - -GNC_TEST_DEPS = \ - --gnc-module-dir ${top_builddir}/libgnucash/gnc-module \ - --gnc-module-dir ${top_builddir}/libgnucash/gnc-module/test/mod-foo \ - --gnc-module-dir ${top_builddir}/libgnucash/gnc-module/test/mod-bar \ - --gnc-module-dir ${top_builddir}/libgnucash/gnc-module/test/mod-baz \ - --gnc-module-dir ${top_builddir}/libgnucash/gnc-module/test/misc-mods \ - --guile-load-dir ${top_builddir}/common/test-core \ - --guile-load-dir ${top_builddir}/libgnucash/gnc-module \ - --guile-load-dir ${top_srcdir}/libgnucash/gnc-module/test/mod-foo \ - --guile-load-dir ${top_srcdir}/libgnucash/gnc-module/test/mod-baz \ - --guile-load-dir ${top_srcdir}/libgnucash/gnc-module/test/mod-bar \ - --library-dir ${top_builddir}/libgnucash/core-utils \ - --library-dir ${top_builddir}/common/test-core \ - --library-dir ${top_builddir}/libgnucash/gnc-module \ - --library-dir ${top_builddir}/libgnucash/gnc-module/test/mod-foo \ - --library-dir ${top_builddir}/libgnucash/gnc-module/test/mod-bar \ - --library-dir ${top_builddir}/libgnucash/gnc-module/test/mod-baz - -TESTS_ENVIRONMENT = \ - GUILE_WARN_DEPRECATED=no \ - GUILE="${GUILE}" \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS}) - -check_PROGRAMS = \ - test-load-c \ - test-modsysver \ - test-incompatdep \ - test-agedver \ - test-dynload - -test_dynload_LDFLAGS = ${GUILE_LIBS} - -$(SCM_TESTS): %: $(srcdir)/%.scm Makefile - echo 'export GNC_BUILDDIR="${abs_top_builddir}";' > $@ - echo 'export GNC_UNINSTALLED=yes;' >> $@ - echo '${GUILE} --debug -l $(srcdir)/$*.scm -c "(exit (run-test))"' >> $@ - chmod a+x $@ - -EXTRA_DIST = \ - ${SCM_TEST_SRCS} \ - CMakeLists.txt - -foo: - ${TESTS_ENVIRONMENT} strace -f -o xxx ./test-load-c diff --git a/libgnucash/gnc-module/test/misc-mods/CMakeLists.txt b/libgnucash/gnc-module/test/misc-mods/CMakeLists.txt index e9a5b99ea8..820237e2b0 100644 --- a/libgnucash/gnc-module/test/misc-mods/CMakeLists.txt +++ b/libgnucash/gnc-module/test/misc-mods/CMakeLists.txt @@ -18,4 +18,4 @@ LIBRARY_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test ARCHIVE_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) -SET_DIST_LIST(misc_mods_DIST CMakeLists.txt Makefile.am agedver.c futuremodsys.c incompatdep.c) +SET_DIST_LIST(misc_mods_DIST CMakeLists.txt agedver.c futuremodsys.c incompatdep.c) diff --git a/libgnucash/gnc-module/test/misc-mods/Makefile.am b/libgnucash/gnc-module/test/misc-mods/Makefile.am deleted file mode 100644 index d83af0e929..0000000000 --- a/libgnucash/gnc-module/test/misc-mods/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_srcdir}/libgnucash/gnc-module \ - ${GLIB_CFLAGS} \ - ${GUILE_CFLAGS} - -LDADD = -L../.. -L../../.libs - -PWD := $(shell pwd) -check_LTLIBRARIES=libgncmod_futuremodsys.la libgncmod_incompatdep.la libgncmod_agedver.la - -libgncmod_futuremodsys_la_SOURCES=futuremodsys.c -libgncmod_futuremodsys_la_LDFLAGS=-rpath ${PWD} -avoid-version -module -libgncmod_futuremodsys_la_LIBADD = \ - $(GLIB_LIBS) - -libgncmod_incompatdep_la_SOURCES=incompatdep.c -libgncmod_incompatdep_la_LDFLAGS=--rpath ${PWD} -avoid-version -module -libgncmod_incompatdep_la_LIBADD = \ - ../../libgnc-module.la \ - $(GLIB_LIBS) - -libgncmod_agedver_la_SOURCES=agedver.c -libgncmod_agedver_la_LDFLAGS=-rpath ${PWD} -avoid-version -module -libgncmod_agedver_la_LIBADD = \ - $(GLIB_LIBS) - -CLEANFILES = *.so* *.a - -EXTRA_DIST = CMakeLists.txt diff --git a/libgnucash/gnc-module/test/mod-bar/CMakeLists.txt b/libgnucash/gnc-module/test/mod-bar/CMakeLists.txt index 56f9f2166c..06763b131b 100644 --- a/libgnucash/gnc-module/test/mod-bar/CMakeLists.txt +++ b/libgnucash/gnc-module/test/mod-bar/CMakeLists.txt @@ -26,4 +26,4 @@ LIBRARY_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test ARCHIVE_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) -SET_DIST_LIST(mod_bar_DIST CMakeLists.txt Makefile.am bar.c gnucash/bar.scm bar.h bar.i gnc-mod-bar.c) +SET_DIST_LIST(mod_bar_DIST CMakeLists.txt bar.c gnucash/bar.scm bar.h bar.i gnc-mod-bar.c) diff --git a/libgnucash/gnc-module/test/mod-bar/Makefile.am b/libgnucash/gnc-module/test/mod-bar/Makefile.am deleted file mode 100644 index 008d5438bd..0000000000 --- a/libgnucash/gnc-module/test/mod-bar/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_srcdir}/libgnucash/gnc-module \ - ${GUILE_CFLAGS} \ - ${GLIB_CFLAGS} - -PWD := $(shell pwd) -check_LTLIBRARIES = libbar.la libgncmodbar.la - -libbar_la_SOURCES = bar.c -libbar_la_LDFLAGS = -rpath ${PWD} - -# Make swig-bar.c for dist. It is an automatic dependency -# of gnc-mod-bar.c -noinst_HEADERS = \ - bar.h \ - swig-bar.c - -libgncmodbar_la_SOURCES=gnc-mod-bar.c -libgncmodbar_la_LDFLAGS=-rpath ${PWD} -avoid-version -libgncmodbar_la_LIBADD=libbar.la \ - $(GUILE_LIBS) \ - $(GLIB_LIBS) - -if BUILDING_FROM_VCS -swig-bar.c: bar.i - $(SWIG) -guile -Linkage module -o $@ $< -endif - -EXTRA_DIST = \ - bar.i \ - gnucash/bar.scm \ - CMakeLists.txt - -BUILT_SOURCES = swig-bar.c -MAINTAINERCLEANFILES = swig-bar.c diff --git a/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt b/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt index 6f18ed8203..1a60d90023 100644 --- a/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt +++ b/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt @@ -39,4 +39,4 @@ LIBRARY_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test ARCHIVE_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) -SET_DIST_LIST(mod_baz_DIST CMakeLists.txt Makefile.am baz.c gnucash/baz.scm baz.h baz.i gnc-mod-baz.c) +SET_DIST_LIST(mod_baz_DIST CMakeLists.txt baz.c gnucash/baz.scm baz.h baz.i gnc-mod-baz.c) diff --git a/libgnucash/gnc-module/test/mod-baz/Makefile.am b/libgnucash/gnc-module/test/mod-baz/Makefile.am deleted file mode 100644 index 5873a5e8e6..0000000000 --- a/libgnucash/gnc-module/test/mod-baz/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_srcdir}/libgnucash/gnc-module \ - -I${top_srcdir}/libgnucash/gnc-module/test/mod-foo \ - ${GLIB_CFLAGS} \ - ${GUILE_CFLAGS} - -PWD := $(shell pwd) -check_LTLIBRARIES = libbaz.la libgncmodbaz.la - -libbaz_la_SOURCES = baz.c -libbaz_la_LDFLAGS = -rpath ${PWD} -libbaz_la_LIBADD = ../mod-foo/libfoo.la - -# Make swig-baz.c for dist. It is an automatic dependency -# of gnc-mod-baz.c -noinst_HEADERS = \ - baz.h \ - swig-baz.c - -libgncmodbaz_la_SOURCES = gnc-mod-baz.c -libgncmodbaz_la_LDFLAGS = -rpath ${PWD} -avoid-version -libgncmodbaz_la_LIBADD = \ - libbaz.la \ - ../../libgnc-module.la \ - $(GUILE_LIBS) \ - $(GLIB_LIBS) - -if BUILDING_FROM_VCS -swig-baz.c: baz.i - $(SWIG) -guile -Linkage module -o $@ $< -endif - -EXTRA_DIST = \ - baz.i \ - gnucash/baz.scm \ - CMakeLists.txt - -BUILT_SOURCES = swig-baz.c -MAINTAINERCLEANFILES = swig-baz.c diff --git a/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt b/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt index ba8cb42205..5b6eb8c4af 100644 --- a/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt +++ b/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt @@ -33,4 +33,4 @@ LIBRARY_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test ARCHIVE_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) -SET_DIST_LIST(mod_foo_DIST CMakeLists.txt Makefile.am foo.i gnucash/foo.scm foo.c foo.h gnc-mod-foo.c) +SET_DIST_LIST(mod_foo_DIST CMakeLists.txt foo.i gnucash/foo.scm foo.c foo.h gnc-mod-foo.c) diff --git a/libgnucash/gnc-module/test/mod-foo/Makefile.am b/libgnucash/gnc-module/test/mod-foo/Makefile.am deleted file mode 100644 index 2e63b54bb2..0000000000 --- a/libgnucash/gnc-module/test/mod-foo/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -AM_CPPFLAGS=\ - -I${top_srcdir}/common \ - -I${top_srcdir}/libgnucash/gnc-module \ - ${GUILE_CFLAGS} \ - ${GLIB_CFLAGS} - -PWD := $(shell pwd) -check_LTLIBRARIES=libfoo.la libgncmodfoo.la - -libfoo_la_SOURCES = foo.c -libfoo_la_LDFLAGS = -rpath ${PWD} - -# Make swig-foo.c for dist. It is an automatic dependency -# of gnc-mod-foo.c -noinst_HEADERS = \ - foo.h \ - swig-foo.c - -libgncmodfoo_la_SOURCES = gnc-mod-foo.c -libgncmodfoo_la_LDFLAGS = -rpath ${PWD} -avoid-version -libgncmodfoo_la_LIBADD = \ - libfoo.la \ - $(GUILE_LIBS) \ - $(GLIB_LIBS) - -EXTRA_DIST = \ - foo.i \ - gnucash/foo.scm \ - CMakeLists.txt - -if BUILDING_FROM_VCS -swig-foo.c: foo.i - $(SWIG) -guile -Linkage module -o $@ $< -endif - -BUILT_SOURCES = swig-foo.c -MAINTAINERCLEANFILES = swig-foo.c diff --git a/libgnucash/quotes/CMakeLists.txt b/libgnucash/quotes/CMakeLists.txt index cd4236a92a..7b6ef13800 100644 --- a/libgnucash/quotes/CMakeLists.txt +++ b/libgnucash/quotes/CMakeLists.txt @@ -32,5 +32,4 @@ ADD_CUSTOM_TARGET(quotes-bin ALL DEPENDS ${_BIN_FILES}) INSTALL(FILES ${_MAN_FILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) INSTALL(PROGRAMS ${_BIN_FILES} DESTINATION ${CMAKE_INSTALL_BINDIR}) -SET_DIST_LIST(quotes_DIST CMakeLists.txt gnc-fq-check.in gnc-fq-dump gnc-fq-helper.in gnc-fq-update.in - Makefile.am Quote_example.pl README) +SET_DIST_LIST(quotes_DIST CMakeLists.txt gnc-fq-check.in gnc-fq-dump gnc-fq-helper.in gnc-fq-update.in Quote_example.pl README) diff --git a/libgnucash/quotes/Makefile.am b/libgnucash/quotes/Makefile.am deleted file mode 100644 index c24e98de37..0000000000 --- a/libgnucash/quotes/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -bin_SCRIPTS = gnc-fq-check gnc-fq-dump gnc-fq-helper gnc-fq-update - -man_MANS = \ - gnc-fq-dump.1 \ - gnc-fq-helper.1 - -EXTRA_DIST = \ - Quote_example.pl \ - gnc-fq-check.in \ - gnc-fq-dump \ - gnc-fq-helper.in \ - gnc-fq-update.in \ - CMakeLists.txt - -gnc-fq-helper: gnc-fq-helper.in Makefile - rm -f $@.tmp - sed < $< > $@.tmp \ - -e 's:[@]PERL[@]:${PERL}:g' \ - -e 's:[@]PERLINCL[@]:${PERLINCL}:g' - chmod +x $@.tmp - mv $@.tmp $@ - -gnc-fq-check: gnc-fq-check.in Makefile - rm -f $@.tmp - sed < $< > $@.tmp \ - -e 's:[@]PERL[@]:${PERL}:g' \ - -e 's:[@]PERLINCL[@]:${PERLINCL}:g' - chmod +x $@.tmp - mv $@.tmp $@ - -gnc-fq-update: gnc-fq-update.in Makefile - rm -f $@.tmp - sed < $< > $@.tmp \ - -e 's:[@]PERL[@]:${PERL}:g' \ - -e 's:[@]PERLINCL[@]:${PERLINCL}:g' - chmod +x $@.tmp - mv $@.tmp $@ - -gnc-fq-dump.1: gnc-fq-dump Makefile - pod2man $< > $@ - -gnc-fq-helper.1: gnc-fq-helper Makefile - pod2man $< > $@ - -CLEANFILES = gnc-fq-helper gnc-fq-check gnc-fq-update - -DISTCLEANFILES = gnc-fq-dump.1 gnc-fq-helper.1 diff --git a/libgnucash/scm/CMakeLists.txt b/libgnucash/scm/CMakeLists.txt index d79a6452ae..dc2124193a 100644 --- a/libgnucash/scm/CMakeLists.txt +++ b/libgnucash/scm/CMakeLists.txt @@ -41,7 +41,7 @@ ADD_CUSTOM_TARGET(scm-scm ALL DEPENDS scm-scm-3 scm-scm-2 scm-scm-1 scm-scm-0 sc INSTALL(FILES config DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/gnucash) -SET_LOCAL_DIST(scm_DIST_local config CMakeLists.txt Makefile.am fin.scm string.scm build-config.scm.in substring-search.scm +SET_LOCAL_DIST(scm_DIST_local config CMakeLists.txt fin.scm string.scm build-config.scm.in substring-search.scm xml-generator.scm main.scm price-quotes.scm printf.scm ${scm_SCHEME_4}) SET(scm_DIST ${scm_DIST_local} ${scm_gnumeric_DIST} PARENT_SCOPE) diff --git a/libgnucash/scm/Makefile.am b/libgnucash/scm/Makefile.am deleted file mode 100644 index 5148c1d37a..0000000000 --- a/libgnucash/scm/Makefile.am +++ /dev/null @@ -1,83 +0,0 @@ - -SUBDIRS = gnumeric - -gncscmdir = ${GNC_SCM_INSTALL_DIR} -gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash - -gncscmmod_DATA = main.scm price-quotes.scm printf.scm - -gnc_regular_scm_files = \ - string.scm \ - fin.scm \ - substring-search.scm \ - xml-generator.scm - -gncscm_DATA = \ - build-config.scm \ - ${gnc_regular_scm_files} - -noinst_DATA = .scm-links - -configdir = ${GNC_CONFIGDIR} -config_DATA = config - -if GNUCASH_SEPARATE_BUILDDIR -SCM_FILE_LINKS = \ - ${gncscmmod_DATA} \ - ${gnc_regular_scm_files} -endif - -.scm-links: - $(RM) -rf gnucash - mkdir -p gnucash -if GNUCASH_SEPARATE_BUILDDIR - for X in ${SCM_FILE_LINKS} ; do \ - $(LN_S) -f ${srcdir}/$$X . ; \ - done -endif - ( cd gnucash; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../$$A . ; done ) -if ! OS_WIN32 -# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567). - touch .scm-links -endif - -GUILE_COMPILE_ENV = \ - --guile-load-dir ${top_builddir}/libgnucash/core-utils \ - --guile-load-dir ${top_builddir}/libgnucash/gnc-module \ - --guile-load-dir ${top_builddir}/libgnucash/scm \ - --library-dir ${top_builddir}/libgnucash/core-utils \ - --library-dir ${top_builddir}/libgnucash/gnc-module \ - --library-dir ${top_builddir}/libgnucash/engine - -%.go : %.scm .scm-links - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \ - $(GUILD) compile -o $@ $< - -gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash -gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) - -gncscmcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@ -gncscmcache_DATA = $(gncscm_DATA:.scm=.go) - -clean-local: - $(RM) -rf gnucash - -SCM_FILES = ${gncscm_DATA} ${gncscmmod_DATA} - -EXTRA_DIST = \ - build-config.scm.in \ - config \ - ${SCM_FILES} \ - CMakeLists.txt - -build-config.scm: ${srcdir}/build-config.scm.in Makefile - rm -f $@.tmp - sed < $< > $@.tmp \ - -e 's#[@]VERSION[@]#${VERSION}#' \ - -e 's#[@]GNC_HELPDIR[@]#${GNC_HELPDIR}#' - mv $@.tmp $@ - -CLEANFILES = .scm-links ${gncscmmodcache_DATA} ${gncscmcache_DATA} - -DISTCLEANFILES = ${SCM_FILE_LINKS} -MAINTAINERCLEANFILES = build-config.scm diff --git a/libgnucash/scm/gnumeric/CMakeLists.txt b/libgnucash/scm/gnumeric/CMakeLists.txt index 549761a051..3ea75dd522 100644 --- a/libgnucash/scm/gnumeric/CMakeLists.txt +++ b/libgnucash/scm/gnumeric/CMakeLists.txt @@ -10,4 +10,4 @@ GNC_ADD_SCHEME_TARGETS(scm-gnumeric FALSE ) -SET_DIST_LIST(scm_gnumeric_DIST CMakeLists.txt Makefile.am ${gnumeric_SCHEME}) +SET_DIST_LIST(scm_gnumeric_DIST CMakeLists.txt ${gnumeric_SCHEME}) diff --git a/libgnucash/scm/gnumeric/Makefile.am b/libgnucash/scm/gnumeric/Makefile.am deleted file mode 100644 index 476557f4d2..0000000000 --- a/libgnucash/scm/gnumeric/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -gncscmdir = ${GNC_SCM_INSTALL_DIR}/gnumeric -gncscm_DATA = \ - gnumeric-utilities.scm \ - table-utils.scm - -if GNUCASH_SEPARATE_BUILDDIR -SCM_FILE_LINKS = \ - ${gncscm_DATA} -endif - -.scm-links: -if GNUCASH_SEPARATE_BUILDDIR - for X in ${SCM_FILE_LINKS} ; do \ - $(LN_S) -f ${srcdir}/$$X . ; \ - done -endif -if ! OS_WIN32 -# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567). - touch .scm-links -endif - -%.go : %.scm .scm-links - $(GUILD) compile \ - -o $@ $< - -gncscmcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnumeric -gncscmcache_DATA = $(gncscm_DATA:.scm=.go) - -noinst_DATA = .scm-links - -EXTRA_DIST = \ - ${gncscm_DATA} \ - CMakeLists.txt - -CLEANFILES = .scm-links ${gncscmcache_DATA} - -DISTCLEANFILES = ${SCM_FILE_LINKS} diff --git a/libgnucash/tax/CMakeLists.txt b/libgnucash/tax/CMakeLists.txt index 1622215922..b1a0c84b33 100644 --- a/libgnucash/tax/CMakeLists.txt +++ b/libgnucash/tax/CMakeLists.txt @@ -1,5 +1,5 @@ ADD_SUBDIRECTORY(us) -SET_LOCAL_DIST(tax_DIST_local CMakeLists.txt Makefile.am) +SET_LOCAL_DIST(tax_DIST_local CMakeLists.txt ) SET(tax_DIST ${tax_DIST_local} ${tax_us_DIST} PARENT_SCOPE) \ No newline at end of file diff --git a/libgnucash/tax/Makefile.am b/libgnucash/tax/Makefile.am deleted file mode 100644 index a40468e2dc..0000000000 --- a/libgnucash/tax/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = us - -EXTRA_DIST = CMakeLists.txt diff --git a/libgnucash/tax/us/CMakeLists.txt b/libgnucash/tax/us/CMakeLists.txt index 4ae566e5e3..abfd4b7454 100644 --- a/libgnucash/tax/us/CMakeLists.txt +++ b/libgnucash/tax/us/CMakeLists.txt @@ -41,6 +41,6 @@ GNC_ADD_SCHEME_TARGETS(scm-tax-us-2 FALSE ) -SET_LOCAL_DIST(tax_us_DIST_local CMakeLists.txt Makefile.am ${tax_us_SOURCES} ${gncmod_tax_us_SCHEME_1} ${gncmod_tax_us_SCHEME_2}) +SET_LOCAL_DIST(tax_us_DIST_local CMakeLists.txt ${tax_us_SOURCES} ${gncmod_tax_us_SCHEME_1} ${gncmod_tax_us_SCHEME_2}) SET(tax_us_DIST ${tax_us_DIST_local} ${test_tax_us_DIST} PARENT_SCOPE) diff --git a/libgnucash/tax/us/Makefile.am b/libgnucash/tax/us/Makefile.am deleted file mode 100644 index 136f760eaf..0000000000 --- a/libgnucash/tax/us/Makefile.am +++ /dev/null @@ -1,83 +0,0 @@ -SUBDIRS = . test - -pkglib_LTLIBRARIES = libgncmod-tax-us.la - -libgncmod_tax_us_la_SOURCES = \ - gncmod-tax-us.c - -libgncmod_tax_us_la_LDFLAGS = -avoid-version - -libgncmod_tax_us_la_LIBADD = \ - ${GUILE_LIBS} \ - ${GLIB_LIBS} - -AM_CPPFLAGS = \ - -I${top_srcdir}/common \ - -I${top_srcdir}/libgnucash/gnc-module \ - ${GLIB_CFLAGS} ${GUILE_CFLAGS} - -gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/tax -gncscmmod_DATA = us.scm de_DE.scm - -gncscmdir = ${GNC_SCM_INSTALL_DIR} -gncscm_DATA = txf.scm txf-help.scm txf-de_DE.scm txf-help-de_DE.scm - -if GNUCASH_SEPARATE_BUILDDIR -#For executing test cases -SCM_FILE_LINKS = \ - ${gncscmmod_DATA} \ - ${gncscm_DATA} -endif - -.scm-links: - $(RM) -rf gnucash - mkdir -p gnucash - mkdir -p gnucash/tax -if GNUCASH_SEPARATE_BUILDDIR - for X in ${SCM_FILE_LINKS} ; do \ - $(LN_S) -f ${srcdir}/$$X . ; \ - done -endif - ( cd gnucash/tax; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../../$$A . ; done ) -if ! OS_WIN32 -# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567). - touch .scm-links -endif - -GUILE_COMPILE_ENV = \ - --gnc-module-dir ${top_builddir}/libgnucash/engine \ - --guile-load-dir ${top_builddir}/libgnucash/app-utils \ - --guile-load-dir ${top_builddir}/libgnucash/core-utils \ - --guile-load-dir ${top_builddir}/libgnucash/engine \ - --guile-load-dir ${top_builddir}/libgnucash/gnc-module \ - --guile-load-dir ${top_builddir}/libgnucash/scm \ - --library-dir ${top_builddir}/libgnucash/engine \ - --library-dir ${top_builddir}/libgnucash/app-utils \ - --library-dir ${top_builddir}/libgnucash/core-utils \ - --library-dir ${top_builddir}/libgnucash/gnc-module - -%.go : %.scm .scm-links $(pkglib_LTLIBRARIES) - GNC_UNINSTALLED=yes \ - GNC_BUILDDIR=${top_builddir} \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \ - $(GUILD) compile -o $@ $< - -gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/tax -gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) - -gncscmcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@ -gncscmcache_DATA = $(gncscm_DATA:.scm=.go) - -clean-local: - $(RM) -rf gnucash - -noinst_DATA = .scm-links - -EXTRA_DIST = \ - ${gncscmmod_DATA} \ - ${gncscm_DATA} \ - CMakeLists.txt - -CLEANFILES = .scm-links ${gncscmmodcache_DATA} ${gncscmcache_DATA} - -DISTCLEANFILES = ${SCM_FILE_LINKS} diff --git a/libgnucash/tax/us/test/CMakeLists.txt b/libgnucash/tax/us/test/CMakeLists.txt index acb8a5ddba..bb91e0094b 100644 --- a/libgnucash/tax/us/test/CMakeLists.txt +++ b/libgnucash/tax/us/test/CMakeLists.txt @@ -19,4 +19,4 @@ GNC_ADD_TEST(test-link-module-tax-us test-link-module.c #) #GNC_ADD_SCHEME_TEST(test-load-tax-us-module.scm) -SET_DIST_LIST(test_tax_us_DIST CMakeLists.txt Makefile.am test-link-module.c test-load-tax-us-module.scm) +SET_DIST_LIST(test_tax_us_DIST CMakeLists.txt test-link-module.c test-load-tax-us-module.scm) diff --git a/libgnucash/tax/us/test/Makefile.am b/libgnucash/tax/us/test/Makefile.am deleted file mode 100644 index 70f98af125..0000000000 --- a/libgnucash/tax/us/test/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -TESTS = test-link-module - -# Some of these dirs may not be needed anymore. -GNC_TEST_DEPS = \ - --gnc-module-dir ${top_builddir}/libgnucash/tax/us \ - --guile-load-dir ${top_builddir}/libgnucash/gnc-module \ - --guile-load-dir ${top_builddir}/libgnucash/tax/us \ - --library-dir ${top_builddir}/libgnucash/core-utils \ - --library-dir ${top_builddir}/libgnucash/gnc-module - -TESTS_ENVIRONMENT = \ - GUILE="${GUILE}" \ - $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS}) - -check_PROGRAMS=test-link-module -test_link_module_SOURCES=test-link-module.c -test_link_module_LDADD=../libgncmod-tax-us.la ${GUILE_LIBS} ${GLIB_LIBS} - -EXTRA_DIST = CMakeLists.txt diff --git a/macros/CMakeLists.txt b/macros/CMakeLists.txt deleted file mode 100644 index 5986f55002..0000000000 --- a/macros/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ - -SET_DIST_LIST(macros_DIST ax_append_flag.m4 ax_check_compile_flag.m4 - ax_cxx_compile_stdcxx_11.m4 ax_pkg_swig.m4 ax_python_devel.m4 - ax_swig_python.m4 binreloc.m4 compiler-flags.m4 CMakeLists.txt - legacy_macros.m4 m4_ax_boost_base.m4 m4_ax_check_compile_flag.m4 - m4_ax_pthread.m4 pkg.m4) diff --git a/macros/ax_append_flag.m4 b/macros/ax_append_flag.m4 deleted file mode 100644 index e8c5312af6..0000000000 --- a/macros/ax_append_flag.m4 +++ /dev/null @@ -1,71 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_append_flag.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_APPEND_FLAG(FLAG, [FLAGS-VARIABLE]) -# -# DESCRIPTION -# -# FLAG is appended to the FLAGS-VARIABLE shell variable, with a space -# added in between. -# -# If FLAGS-VARIABLE is not specified, the current language's flags (e.g. -# CFLAGS) is used. FLAGS-VARIABLE is not changed if it already contains -# FLAG. If FLAGS-VARIABLE is unset in the shell, it is set to exactly -# FLAG. -# -# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. -# -# LICENSE -# -# Copyright (c) 2008 Guido U. Draheim -# Copyright (c) 2011 Maarten Bosmans -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 7 - -AC_DEFUN([AX_APPEND_FLAG], -[dnl -AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_SET_IF -AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])]) -AS_VAR_SET_IF(FLAGS,[ - AS_CASE([" AS_VAR_GET(FLAGS) "], - [*" $1 "*], [AC_RUN_LOG([: FLAGS already contains $1])], - [ - AS_VAR_APPEND(FLAGS,[" $1"]) - AC_RUN_LOG([: FLAGS="$FLAGS"]) - ]) - ], - [ - AS_VAR_SET(FLAGS,[$1]) - AC_RUN_LOG([: FLAGS="$FLAGS"]) - ]) -AS_VAR_POPDEF([FLAGS])dnl -])dnl AX_APPEND_FLAG diff --git a/macros/ax_check_compile_flag.m4 b/macros/ax_check_compile_flag.m4 deleted file mode 100644 index dcabb92a14..0000000000 --- a/macros/ax_check_compile_flag.m4 +++ /dev/null @@ -1,74 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) -# -# DESCRIPTION -# -# Check whether the given FLAG works with the current language's compiler -# or gives an error. (Warnings, however, are ignored) -# -# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on -# success/failure. -# -# If EXTRA-FLAGS is defined, it is added to the current language's default -# flags (e.g. CFLAGS) when the check is done. The check is thus made with -# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to -# force the compiler to issue an error when a bad flag is given. -# -# INPUT gives an alternative input source to AC_COMPILE_IFELSE. -# -# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this -# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. -# -# LICENSE -# -# Copyright (c) 2008 Guido U. Draheim -# Copyright (c) 2011 Maarten Bosmans -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 5 - -AC_DEFUN([AX_CHECK_COMPILE_FLAG], -[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF -AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl -AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ - ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS - _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" - AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], - [AS_VAR_SET(CACHEVAR,[yes])], - [AS_VAR_SET(CACHEVAR,[no])]) - _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) -AS_VAR_IF(CACHEVAR,yes, - [m4_default([$2], :)], - [m4_default([$3], :)]) -AS_VAR_POPDEF([CACHEVAR])dnl -])dnl AX_CHECK_COMPILE_FLAGS diff --git a/macros/ax_cxx_compile_stdcxx_11.m4 b/macros/ax_cxx_compile_stdcxx_11.m4 deleted file mode 100644 index 163a4c646f..0000000000 --- a/macros/ax_cxx_compile_stdcxx_11.m4 +++ /dev/null @@ -1,142 +0,0 @@ -# ============================================================================ -# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html -# ============================================================================ -# -# SYNOPSIS -# -# AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional]) -# -# DESCRIPTION -# -# Check for baseline language coverage in the compiler for the C++11 -# standard; if necessary, add switches to CXXFLAGS to enable support. -# -# The first argument, if specified, indicates whether you insist on an -# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. -# -std=c++11). If neither is specified, you get whatever works, with -# preference for an extended mode. -# -# The second argument, if specified 'mandatory' or if left unspecified, -# indicates that baseline C++11 support is required and that the macro -# should error out if no mode with that support is found. If specified -# 'optional', then configuration proceeds regardless, after defining -# HAVE_CXX11 if and only if a supporting mode is found. -# -# LICENSE -# -# Copyright (c) 2008 Benjamin Kosnik -# Copyright (c) 2012 Zack Weinberg -# Copyright (c) 2013 Roy Stogner -# Copyright (c) 2014 Alexey Sokolov -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 4 - -m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [[ - template - struct check - { - static_assert(sizeof(int) <= sizeof(T), "not big enough"); - }; - - struct Base { - virtual void f() {} - }; - struct Child : public Base { - virtual void f() override {} - }; - - typedef check> right_angle_brackets; - - int a; - decltype(a) b; - - typedef check check_type; - check_type c; - check_type&& cr = static_cast(c); - - auto d = a; - auto l = [](){}; -]]) - -AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl - m4_if([$1], [], [], - [$1], [ext], [], - [$1], [noext], [], - [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])dnl - m4_if([$2], [], [ax_cxx_compile_cxx11_required=true], - [$2], [mandatory], [ax_cxx_compile_cxx11_required=true], - [$2], [optional], [ax_cxx_compile_cxx11_required=false], - [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])]) - AC_LANG_PUSH([C++])dnl - ac_success=no - AC_CACHE_CHECK(whether $CXX supports C++11 features by default, - ax_cv_cxx_compile_cxx11, - [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], - [ax_cv_cxx_compile_cxx11=yes], - [ax_cv_cxx_compile_cxx11=no])]) - if test x$ax_cv_cxx_compile_cxx11 = xyes; then - ac_success=yes - fi - - m4_if([$1], [noext], [], [dnl - if test x$ac_success = xno; then - for switch in -std=gnu++11 -std=gnu++0x; do - cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch]) - AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch, - $cachevar, - [ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS $switch" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], - [eval $cachevar=yes], - [eval $cachevar=no]) - CXXFLAGS="$ac_save_CXXFLAGS"]) - if eval test x\$$cachevar = xyes; then - CXXFLAGS="$CXXFLAGS $switch" - ac_success=yes - break - fi - done - fi]) - - m4_if([$1], [ext], [], [dnl - if test x$ac_success = xno; then - for switch in -std=c++11 -std=c++0x; do - cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch]) - AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch, - $cachevar, - [ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS $switch" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], - [eval $cachevar=yes], - [eval $cachevar=no]) - CXXFLAGS="$ac_save_CXXFLAGS"]) - if eval test x\$$cachevar = xyes; then - CXXFLAGS="$CXXFLAGS $switch" - ac_success=yes - break - fi - done - fi]) - AC_LANG_POP([C++]) - if test x$ax_cxx_compile_cxx11_required = xtrue; then - if test x$ac_success = xno; then - AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.]) - fi - else - if test x$ac_success = xno; then - HAVE_CXX11=0 - AC_MSG_NOTICE([No compiler with C++11 support was found]) - else - HAVE_CXX11=1 - AC_DEFINE(HAVE_CXX11,1, - [define if the compiler supports basic C++11 syntax]) - fi - - AC_SUBST(HAVE_CXX11) - fi -]) diff --git a/macros/ax_pkg_swig.m4 b/macros/ax_pkg_swig.m4 deleted file mode 100644 index d836eec8fc..0000000000 --- a/macros/ax_pkg_swig.m4 +++ /dev/null @@ -1,135 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_pkg_swig.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_PKG_SWIG([major.minor.micro], [action-if-found], [action-if-not-found]) -# -# DESCRIPTION -# -# This macro searches for a SWIG installation on your system. If found, -# then SWIG is AC_SUBST'd; if not found, then $SWIG is empty. If SWIG is -# found, then SWIG_LIB is set to the SWIG library path, and AC_SUBST'd. -# -# You can use the optional first argument to check if the version of the -# available SWIG is greater than or equal to the value of the argument. It -# should have the format: N[.N[.N]] (N is a number between 0 and 999. Only -# the first N is mandatory.) If the version argument is given (e.g. -# 1.3.17), AX_PKG_SWIG checks that the swig package is this version number -# or higher. -# -# As usual, action-if-found is executed if SWIG is found, otherwise -# action-if-not-found is executed. -# -# In configure.in, use as: -# -# AX_PKG_SWIG(1.3.17, [], [ AC_MSG_ERROR([SWIG is required to build..]) ]) -# AX_SWIG_ENABLE_CXX -# AX_SWIG_MULTI_MODULE_SUPPORT -# AX_SWIG_PYTHON -# -# LICENSE -# -# Copyright (c) 2008 Sebastian Huber -# Copyright (c) 2008 Alan W. Irwin -# Copyright (c) 2008 Rafael Laboissiere -# Copyright (c) 2008 Andrew Collier -# Copyright (c) 2011 Murray Cumming -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 11 - -AC_DEFUN([AX_PKG_SWIG],[ - # Ubuntu has swig 2.0 as /usr/bin/swig2.0 - AC_PATH_PROGS([SWIG],[swig swig2.0]) - if test -z "$SWIG" ; then - m4_ifval([$3],[$3],[:]) - elif test -n "$1" ; then - AC_MSG_CHECKING([SWIG version]) - [swig_version=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`] - AC_MSG_RESULT([$swig_version]) - if test -n "$swig_version" ; then - # Calculate the required version number components - [required=$1] - [required_major=`echo $required | sed 's/[^0-9].*//'`] - if test -z "$required_major" ; then - [required_major=0] - fi - [required=`echo $required | sed 's/[0-9]*[^0-9]//'`] - [required_minor=`echo $required | sed 's/[^0-9].*//'`] - if test -z "$required_minor" ; then - [required_minor=0] - fi - [required=`echo $required | sed 's/[0-9]*[^0-9]//'`] - [required_patch=`echo $required | sed 's/[^0-9].*//'`] - if test -z "$required_patch" ; then - [required_patch=0] - fi - # Calculate the available version number components - [available=$swig_version] - [available_major=`echo $available | sed 's/[^0-9].*//'`] - if test -z "$available_major" ; then - [available_major=0] - fi - [available=`echo $available | sed 's/[0-9]*[^0-9]//'`] - [available_minor=`echo $available | sed 's/[^0-9].*//'`] - if test -z "$available_minor" ; then - [available_minor=0] - fi - [available=`echo $available | sed 's/[0-9]*[^0-9]//'`] - [available_patch=`echo $available | sed 's/[^0-9].*//'`] - if test -z "$available_patch" ; then - [available_patch=0] - fi - # Convert the version tuple into a single number for easier comparison. - # Using base 100 should be safe since SWIG internally uses BCD values - # to encode its version number. - required_swig_vernum=`expr $required_major \* 10000 \ - \+ $required_minor \* 100 \+ $required_patch` - available_swig_vernum=`expr $available_major \* 10000 \ - \+ $available_minor \* 100 \+ $available_patch` - - if test $available_swig_vernum -lt $required_swig_vernum; then - AC_MSG_WARN([SWIG version >= $1 is required. You have $swig_version.]) - SWIG='' - m4_ifval([$3],[$3],[]) - else - AC_MSG_CHECKING([for SWIG library]) - SWIG_LIB=`$SWIG -swiglib` - AC_MSG_RESULT([$SWIG_LIB]) - m4_ifval([$2],[$2],[]) - fi - else - AC_MSG_WARN([cannot determine SWIG version]) - SWIG='' - m4_ifval([$3],[$3],[]) - fi - fi - AC_SUBST([SWIG_LIB]) -]) diff --git a/macros/ax_python_devel.m4 b/macros/ax_python_devel.m4 deleted file mode 100644 index cf2163c9b5..0000000000 --- a/macros/ax_python_devel.m4 +++ /dev/null @@ -1,324 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_python_devel.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_PYTHON_DEVEL([version]) -# -# DESCRIPTION -# -# Note: Defines as a precious variable "PYTHON_VERSION". Don't override it -# in your configure.ac. -# -# This macro checks for Python and tries to get the include path to -# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS) -# output variables. It also exports $(PYTHON_EXTRA_LIBS) and -# $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code. -# -# You can search for some particular version of Python by passing a -# parameter to this macro, for example ">= '2.3.1'", or "== '2.4'". Please -# note that you *have* to pass also an operator along with the version to -# match, and pay special attention to the single quotes surrounding the -# version number. Don't use "PYTHON_VERSION" for this: that environment -# variable is declared as precious and thus reserved for the end-user. -# -# This macro should work for all versions of Python >= 2.1.0. As an end -# user, you can disable the check for the python version by setting the -# PYTHON_NOVERSIONCHECK environment variable to something else than the -# empty string. -# -# If you need to use this macro for an older Python version, please -# contact the authors. We're always open for feedback. -# -# LICENSE -# -# Copyright (c) 2009 Sebastian Huber -# Copyright (c) 2009 Alan W. Irwin -# Copyright (c) 2009 Rafael Laboissiere -# Copyright (c) 2009 Andrew Collier -# Copyright (c) 2009 Matteo Settenvini -# Copyright (c) 2009 Horst Knorr -# Copyright (c) 2013 Daniel Mullner -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 16 - -AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL]) -AC_DEFUN([AX_PYTHON_DEVEL],[ - # - # Allow the use of a (user set) custom python version - # - AC_ARG_VAR([PYTHON_VERSION],[The installed Python - version to use, for example '2.3'. This string - will be appended to the Python interpreter - canonical name.]) - - AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]]) - if test -z "$PYTHON"; then - AC_MSG_ERROR([Cannot find python$PYTHON_VERSION in your system path]) - PYTHON_VERSION="" - fi - - # - # Check for a version of Python >= 2.1.0 - # - AC_MSG_CHECKING([for a version of Python >= '2.1.0']) - ac_supports_python_ver=`$PYTHON -c "import sys; \ - ver = sys.version.split ()[[0]]; \ - print (ver >= '2.1.0')"` - if test "$ac_supports_python_ver" != "True"; then - if test -z "$PYTHON_NOVERSIONCHECK"; then - AC_MSG_RESULT([no]) - AC_MSG_FAILURE([ -This version of the AC@&t@_PYTHON_DEVEL macro -doesn't work properly with versions of Python before -2.1.0. You may need to re-run configure, setting the -variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG, -PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. -Moreover, to disable this check, set PYTHON_NOVERSIONCHECK -to something else than an empty string. -]) - else - AC_MSG_RESULT([skip at user request]) - fi - else - AC_MSG_RESULT([yes]) - fi - - # - # if the macro parameter ``version'' is set, honour it - # - if test -n "$1"; then - AC_MSG_CHECKING([for a version of Python $1]) - ac_supports_python_ver=`$PYTHON -c "import sys; \ - ver = sys.version.split ()[[0]]; \ - print (ver $1)"` - if test "$ac_supports_python_ver" = "True"; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - AC_MSG_ERROR([this package requires Python $1. -If you have it installed, but it isn't the default Python -interpreter in your system path, please pass the PYTHON_VERSION -variable to configure. See ``configure --help'' for reference. -]) - PYTHON_VERSION="" - fi - fi - - # - # Check if you have distutils, else fail - # - AC_MSG_CHECKING([for the distutils Python package]) - ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` - if test -z "$ac_distutils_result"; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - AC_MSG_ERROR([cannot import Python module "distutils". -Please check your Python installation. The error was: -$ac_distutils_result]) - PYTHON_VERSION="" - fi - - # - # Check for Python include path - # - AC_MSG_CHECKING([for Python include path]) - if test -z "$PYTHON_CPPFLAGS"; then - python_path=`$PYTHON -c "import distutils.sysconfig; \ - print (distutils.sysconfig.get_python_inc ());"` - plat_python_path=`$PYTHON -c "import distutils.sysconfig; \ - print (distutils.sysconfig.get_python_inc (plat_specific=1));"` - if test -n "${python_path}"; then - if test "${plat_python_path}" != "${python_path}"; then - python_path="-I$python_path -I$plat_python_path" - else - python_path="-I$python_path" - fi - fi - PYTHON_CPPFLAGS=$python_path - fi - AC_MSG_RESULT([$PYTHON_CPPFLAGS]) - AC_SUBST([PYTHON_CPPFLAGS]) - - # - # Check for Python library path - # - AC_MSG_CHECKING([for Python library path]) - if test -z "$PYTHON_LDFLAGS"; then - # (makes two attempts to ensure we've got a version number - # from the interpreter) - ac_python_version=`cat<]], - [[Py_Initialize();]]) - ],[pythonexists=yes],[pythonexists=no]) - AC_LANG_POP([C]) - # turn back to default flags - CPPFLAGS="$ac_save_CPPFLAGS" - LIBS="$ac_save_LIBS" - - AC_MSG_RESULT([$pythonexists]) - - if test ! "x$pythonexists" = "xyes"; then - AC_MSG_FAILURE([ - Could not link test program to Python. Maybe the main Python library has been - installed in some non-standard library path. If so, pass it to configure, - via the LDFLAGS environment variable. - Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib" - ============================================================================ - ERROR! - You probably have to install the development version of the Python package - for your distribution. The exact name of this package varies among them. - ============================================================================ - ]) - PYTHON_VERSION="" - fi - - # - # all done! - # -]) diff --git a/macros/ax_swig_python.m4 b/macros/ax_swig_python.m4 deleted file mode 100644 index bf22558f0d..0000000000 --- a/macros/ax_swig_python.m4 +++ /dev/null @@ -1,64 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_swig_python.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_SWIG_PYTHON([use-shadow-classes = {no, yes}]) -# -# DESCRIPTION -# -# Checks for Python and provides the $(AX_SWIG_PYTHON_CPPFLAGS), and -# $(AX_SWIG_PYTHON_OPT) output variables. -# -# $(AX_SWIG_PYTHON_OPT) contains all necessary SWIG options to generate -# code for Python. Shadow classes are enabled unless the value of the -# optional first argument is exactly 'no'. If you need multi module -# support (provided by the AX_SWIG_MULTI_MODULE_SUPPORT macro) use -# $(AX_SWIG_PYTHON_LIBS) to link against the appropriate library. It -# contains the SWIG Python runtime library that is needed by the type -# check system for example. -# -# LICENSE -# -# Copyright (c) 2008 Sebastian Huber -# Copyright (c) 2008 Alan W. Irwin -# Copyright (c) 2008 Rafael Laboissiere -# Copyright (c) 2008 Andrew Collier -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 10 - -AU_ALIAS([SWIG_PYTHON], [AX_SWIG_PYTHON]) -AC_DEFUN([AX_SWIG_PYTHON],[ - AC_REQUIRE([AX_PKG_SWIG]) - AC_REQUIRE([AX_PYTHON_DEVEL]) - test "x$1" != "xno" || swig_shadow=" -noproxy" - AC_SUBST([AX_SWIG_PYTHON_OPT],[-python$swig_shadow]) - AC_SUBST([AX_SWIG_PYTHON_CPPFLAGS],[$PYTHON_CPPFLAGS]) -]) diff --git a/macros/binreloc.m4 b/macros/binreloc.m4 deleted file mode 100644 index 61e241025c..0000000000 --- a/macros/binreloc.m4 +++ /dev/null @@ -1,79 +0,0 @@ -# Check for binary relocation support. -# Written by Hongli Lai -# http://autopackage.org/ - -AC_DEFUN([AM_BINRELOC], -[ - AC_ARG_ENABLE(binreloc, - [ --enable-binreloc compile with binary relocation support - (default=enable when available)], - enable_binreloc=$enableval,enable_binreloc=auto) - - AC_ARG_ENABLE(binreloc-threads, - [ --enable-binreloc-threads compile binary relocation with threads support - (default=yes)], - enable_binreloc_threads=$enableval,enable_binreloc_threads=yes) - - BINRELOC_CFLAGS= - BINRELOC_LIBS= - if test "x$enable_binreloc" = "xauto"; then - AC_CHECK_FILE([/proc/self/maps]) - AC_CACHE_CHECK([whether everything is installed to the same prefix], - [br_cv_valid_prefixes], [ - # datarootdir variables was introduced with autoconf-2.60 - if test "$bindir" = '${exec_prefix}/bin' -a "$sbindir" = '${exec_prefix}/sbin' -a \ - \( "$datadir" = '${prefix}/share' -o \( "$datadir" = '${datarootdir}' -a "$datarootdir" = '${prefix}/share' \) \) -a \ - "$libdir" = '${exec_prefix}/lib' -a \ - "$libexecdir" = '${exec_prefix}/libexec' -a "$sysconfdir" = '${prefix}/etc' - then - br_cv_valid_prefixes=yes - else - br_cv_valid_prefixes=no - fi - ]) - fi - AC_CACHE_CHECK([whether binary relocation support should be enabled], - [br_cv_binreloc], - [if test "x$enable_binreloc" = "xyes"; then - br_cv_binreloc=yes - elif test "x$enable_binreloc" = "xauto"; then - if test "x$br_cv_valid_prefixes" = "xyes" -a \ - "x$ac_cv_file__proc_self_maps" = "xyes"; then - br_cv_binreloc=yes - else - br_cv_binreloc=no - fi - else - br_cv_binreloc=no - fi]) - - if test "x$br_cv_binreloc" = "xyes"; then - BINRELOC_CFLAGS="-DENABLE_BINRELOC" - AC_DEFINE(ENABLE_BINRELOC,,[Use binary relocation?]) - if test "x$enable_binreloc_threads" = "xyes"; then - AC_CHECK_LIB([pthread], [pthread_getspecific]) - fi - - AC_CACHE_CHECK([whether binary relocation should use threads], - [br_cv_binreloc_threads], - [if test "x$enable_binreloc_threads" = "xyes"; then - if test "x$ac_cv_lib_pthread_pthread_getspecific" = "xyes"; then - br_cv_binreloc_threads=yes - else - br_cv_binreloc_threads=no - fi - else - br_cv_binreloc_threads=no - fi]) - - if test "x$br_cv_binreloc_threads" = "xyes"; then - BINRELOC_LIBS="-lpthread" - AC_DEFINE(BR_PTHREAD,1,[Include pthread support for binary relocation?]) - else - BINRELOC_CFLAGS="$BINRELOC_CFLAGS -DBR_PTHREADS=0" - AC_DEFINE(BR_PTHREAD,0,[Include pthread support for binary relocation?]) - fi - fi - AC_SUBST(BINRELOC_CFLAGS) - AC_SUBST(BINRELOC_LIBS) -]) diff --git a/macros/compiler-flags.m4 b/macros/compiler-flags.m4 deleted file mode 100644 index ca44c8f410..0000000000 --- a/macros/compiler-flags.m4 +++ /dev/null @@ -1,109 +0,0 @@ -dnl COMPILE_WARNINGS -dnl Turn on many useful compiler warnings -dnl For now, only works on GCC -AC_DEFUN([COMPILE_WARNINGS],[ - AC_ARG_ENABLE(compile-warnings, - [ --enable-compile-warnings=[no/minimum/yes] Turn on compiler warnings.],,enable_compile_warnings=minimum) - - AC_MSG_CHECKING(what warning flags to pass to the C compiler) - warnCFLAGS= - if test "x$GCC" != xyes; then - enable_compile_warnings=no - fi - - if test "x$enable_compile_warnings" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CFLAGS " in - *[\ \ ]-Wall[\ \ ]*) ;; - *) warnCFLAGS="-Wall -Wunused" ;; - esac - - ## -W is not all that useful. And it cannot be controlled - ## with individual -Wno-xxx flags, unlike -Wall - if test "x$enable_compile_warnings" = "xyes"; then - warnCFLAGS="$warnCFLAGS -Wmissing-prototypes -Wmissing-declarations" - fi - fi - fi - AC_MSG_RESULT($warnCFLAGS) - - AC_ARG_ENABLE(iso-c, - [ --enable-iso-c Try to warn if code is not ISO C ],, - enable_iso_c=no) - - AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) - complCFLAGS= - if test "x$enable_iso_c" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -ansi" ;; - esac - - case " $CFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCFLAGS) - if test "x$cflags_set" != "xyes"; then - CFLAGS="$CFLAGS $warnCFLAGS $complCFLAGS" - cflags_set=yes - AC_SUBST(cflags_set) - fi -]) - -dnl For C++, do basically the same thing. - -AC_DEFUN([CXX_WARNINGS],[ - AC_ARG_ENABLE(cxx-warnings, - [ --enable-cxx-warnings=[no/minimum/yes] Turn on compiler warnings.],,enable_cxx_warnings=minimum) - - AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) - warnCXXFLAGS= - if test "x$GCC" != xyes; then - enable_compile_warnings=no - fi - if test "x$enable_cxx_warnings" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-Wall[\ \ ]*) ;; - *) warnCXXFLAGS="-Wall -Wno-unused" ;; - esac - - ## -W is not all that useful. And it cannot be controlled - ## with individual -Wno-xxx flags, unlike -Wall - if test "x$enable_cxx_warnings" = "xyes"; then - warnCXXFLAGS="$warnCXXFLAGS -Wmissing-prototypes -Wmissing-declarations -Wshadow -Woverloaded-virtual" - fi - fi - fi - AC_MSG_RESULT($warnCXXFLAGS) - - AC_ARG_ENABLE(iso-cxx, - [ --enable-iso-cxx Try to warn if code is not ISO C++ ],, - enable_iso_cxx=no) - - AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) - complCXXFLAGS= - if test "x$enable_iso_cxx" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; - esac - - case " $CXXFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCXXFLAGS) - if test "x$cxxflags_set" != "xyes"; then - CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" - cxxflags_set=yes - AC_SUBST(cxxflags_set) - fi -]) diff --git a/macros/legacy_macros.m4 b/macros/legacy_macros.m4 deleted file mode 100644 index 2ca4e773e4..0000000000 --- a/macros/legacy_macros.m4 +++ /dev/null @@ -1,236 +0,0 @@ -## -*-m4-*- - -dnl AM_GUILE_VERSION_CHECK ([MINIMUM-VERSION, MAXIMUM-VERSION, [ACTION-IF-FOUND. -dnl [ACTION-IF-NOT-FOUND]]]) - -dnl tests for minimum and maximum versions of guile. - -AC_DEFUN([AM_GUILE_VERSION_CHECK], -[ -dnl -dnl - -if test x${GUILE} = x ; then - AC_PATH_PROG(GUILE, guile, no) -fi - -dnl We expect the following variables: -dnl - BUILD_GUILE="yes" if guile-config is available in PATH -dnl - name_build_guile="guile-config" i.e. the name of guile-config -dnl - GUILE="/usr/bin/guile" as detected above. - -version_ok= -min_guile_version=ifelse([$1], , 1.3,$1) -max_guile_version=ifelse([$2], , 99.99.99,$2) - -AC_MSG_CHECKING(for guile - ${min_guile_version} <= version < ${max_guile_version}) - -if test "x${BUILD_GUILE}" != x -a "x${BUILD_GUILE}" != xno ; then - guile_version=`${name_build_guile} --version 2>&1` - guile_version="$guile_version.0" - guile_major_version=`echo $guile_version | \ - sed 's/.*Guile version \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'` - guile_minor_version=`echo $guile_version | \ - sed 's/.*Guile version \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'` - guile_micro_version=`echo $guile_version | \ - sed 's/.*Guile version \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'` - guile_vers_string="$guile_major_version.$guile_minor_version.$guile_micro_version" - - major_required=`echo ${min_guile_version} |\ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - minor_required=`echo ${min_guile_version} |\ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - micro_required=`echo ${min_guile_version} |\ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - - major_prohibited=`echo ${max_guile_version} |\ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - minor_prohibited=`echo ${max_guile_version} |\ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - micro_prohibited=`echo ${max_guile_version} |\ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - - - if ${GUILE} -c "(cond ((> ${guile_major_version} ${major_required}) (exit 0))\ - ((< ${guile_major_version} ${major_required}) (exit 1))\ - ((> ${guile_minor_version} ${minor_required}) (exit 0))\ - ((< ${guile_minor_version} ${minor_required}) (exit 1))\ - ((< ${guile_micro_version} ${micro_required}) (exit 1))\ - (else (exit 0)))" ; then - if ${GUILE} -c "(cond ((> ${guile_major_version} ${major_prohibited}) (exit 1))\ - ((< ${guile_major_version} ${major_prohibited}) (exit 0))\ - ((> ${guile_minor_version} ${minor_prohibited}) (exit 1))\ - ((< ${guile_minor_version} ${minor_prohibited}) (exit 0))\ - ((< ${guile_micro_version} ${micro_prohibited}) (exit 0))\ - (else (exit 1)))" ; then - version_ok=yes - fi - fi -fi - -if test -n "$version_ok"; then - AC_MSG_RESULT(yes: $guile_vers_string) - ifelse([$3], , true, [$3]) - -else - AC_MSG_RESULT(no: $guile_vers_string) - ifelse([$4], , true , [AC_MSG_WARN(guile version check failed) - $4]) -fi]) - -AC_DEFUN([STRUCT_TM_GMTOFF_CHECK], -[ - AC_CACHE_CHECK([for the tm_gmtoff member of struct tm], - am_cv_struct_tm_gmtoff, - [AC_TRY_LINK([ - #include - #define _GNU_SOURCE - #define __EXTENSIONS__ -], - [struct tm tm; - tm.tm_gmtoff = 0;], - am_cv_struct_tm_gmtoff=yes, - am_cv_struct_tm_gmtoff=no) - ]) - if test $am_cv_struct_tm_gmtoff = yes; then - AC_DEFINE(HAVE_STRUCT_TM_GMTOFF, 1, - [Define if you have the tm_gmtoff member of struct tm.]) - fi -]) - -AC_DEFUN([SCANF_LLD_CHECK], -[ - AC_CACHE_CHECK([if scanf supports %lld conversions], - am_cv_scanf_lld, - AC_TRY_RUN([ -#include -#include - -int main () -{ - long long int d; - long long int e; - - d = 0; - e = 100000; - e *= 100000; - if ((sscanf ("10000000000", "%lld", &d) != 1) || (d != e)) - exit (1); - - exit (0); -} -], - am_cv_scanf_lld=yes, - am_cv_scanf_lld=no,[[ - # When cross-compiling, simply insert known values here - case $host in - *-*-mingw*) - # For mingw we know the result - am_cv_scanf_lld=no - ;; - *) - AC_MSG_ERROR([scanf support unknown.]) - ;; - esac -]])) - if test $am_cv_scanf_lld = yes; then - AC_DEFINE(HAVE_SCANF_LLD, 1, - [Define if scanf supports %lld conversions.]) - fi -]) - -AC_DEFUN([SCANF_QD_CHECK], -[ - AC_CACHE_CHECK([if scanf supports %qd conversions], - am_cv_scanf_qd, - AC_TRY_RUN([ -#include -#include - -int main () -{ - long long int d; - long long int e; - - d = 0; - e = 100000; - e *= 100000; - if ((sscanf ("10000000000", "%qd", &d) != 1) || (d != e)) - exit (1); - - exit (0); -} -], - am_cv_scanf_qd=yes, - am_cv_scanf_qd=no,[[ - # When cross-compiling, simply insert known values here - case $host in - *-*-mingw*) - # For mingw we know the result - am_cv_scanf_qd=no - ;; - *) - AC_MSG_ERROR([scanf support unknown.]) - ;; - esac -]])) - if test $am_cv_scanf_qd = yes; then - AC_DEFINE(HAVE_SCANF_QD, 1, - [Define if scanf supports %qd conversions.]) - fi -]) - -AC_DEFUN([SCANF_I64D_CHECK], -[ - AC_CACHE_CHECK([if scanf supports %I64d conversions], - am_cv_scanf_i64d, - AC_TRY_RUN([ -#include -#include - -int main () -{ - long long int d; - long long int e; - - d = 0; - e = 100000; - e *= 100000; - if ((sscanf ("10000000000", "%I64d", &d) != 1) || (d != e)) - exit (1); - - exit (0); -} -], - am_cv_scanf_i64d=yes, - am_cv_scanf_i64d=no,[[ - # When cross-compiling, simply insert known values here - case $host in - *-*-mingw*) - # For mingw we know the result - am_cv_scanf_i64d=yes - ;; - *) - AC_MSG_ERROR([scanf support unknown.]) - ;; - esac -]])) - if test $am_cv_scanf_i64d = yes; then - AC_DEFINE(HAVE_SCANF_I64D, 1, - [Define if scanf supports %I64d conversions.]) - fi -]) - -AC_DEFUN([LANGINFO_D_FMT_CHECK], -[ - AC_CACHE_CHECK([for nl_langinfo and D_FMT], am_cv_langinfo_dfmt, - [AC_TRY_LINK([#include ], - [char* cs = nl_langinfo(D_FMT);], - am_cv_langinfo_dfmt=yes, - am_cv_langinfo_dfmt=no) - ]) - if test $am_cv_langinfo_dfmt = yes; then - AC_DEFINE(HAVE_LANGINFO_D_FMT, 1, - [Define if you have and nl_langinfo(D_FMT).]) - fi -]) diff --git a/macros/m4_ax_boost_base.m4 b/macros/m4_ax_boost_base.m4 deleted file mode 100644 index 777e7c14f6..0000000000 --- a/macros/m4_ax_boost_base.m4 +++ /dev/null @@ -1,272 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_boost_base.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_BOOST_BASE([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# DESCRIPTION -# -# Test for the Boost C++ libraries of a particular version (or newer) -# -# If no path to the installed boost library is given the macro searches -# under /usr, /usr/local, /opt and /opt/local and evaluates the -# $BOOST_ROOT environment variable. Further documentation is available at -# . -# -# This macro calls: -# -# AC_SUBST(BOOST_CPPFLAGS) / AC_SUBST(BOOST_LDFLAGS) -# -# And sets: -# -# HAVE_BOOST -# -# LICENSE -# -# Copyright (c) 2008 Thomas Porschberg -# Copyright (c) 2009 Peter Adolphs -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 23 - -AC_DEFUN([AX_BOOST_BASE], -[ -AC_ARG_WITH([boost], - [AS_HELP_STRING([--with-boost@<:@=ARG@:>@], - [use Boost library from a standard location (ARG=yes), - from the specified location (ARG=), - or disable it (ARG=no) - @<:@ARG=yes@:>@ ])], - [ - if test "$withval" = "no"; then - want_boost="no" - elif test "$withval" = "yes"; then - want_boost="yes" - ac_boost_path="" - else - want_boost="yes" - ac_boost_path="$withval" - fi - ], - [want_boost="yes"]) - - -AC_ARG_WITH([boost-libdir], - AS_HELP_STRING([--with-boost-libdir=LIB_DIR], - [Force given directory for boost libraries. Note that this will override library path detection, so use this parameter only if default library detection fails and you know exactly where your boost libraries are located.]), - [ - if test -d "$withval" - then - ac_boost_lib_path="$withval" - else - AC_MSG_ERROR(--with-boost-libdir expected directory name) - fi - ], - [ac_boost_lib_path=""] -) - -if test "x$want_boost" = "xyes"; then - boost_lib_version_req=ifelse([$1], ,1.20.0,$1) - boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([[0-9]]*\.[[0-9]]*\)'` - boost_lib_version_req_major=`expr $boost_lib_version_req : '\([[0-9]]*\)'` - boost_lib_version_req_minor=`expr $boost_lib_version_req : '[[0-9]]*\.\([[0-9]]*\)'` - boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` - if test "x$boost_lib_version_req_sub_minor" = "x" ; then - boost_lib_version_req_sub_minor="0" - fi - WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+ $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor` - AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req) - succeeded=no - - dnl On 64-bit systems check for system libraries in both lib64 and lib. - dnl The former is specified by FHS, but e.g. Debian does not adhere to - dnl this (as it rises problems for generic multi-arch support). - dnl The last entry in the list is chosen by default when no libraries - dnl are found, e.g. when only header-only libraries are installed! - libsubdirs="lib" - ax_arch=`uname -m` - case $ax_arch in - x86_64|ppc64|s390x|sparc64|aarch64) - libsubdirs="lib64 lib lib64" - ;; - esac - - dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give - dnl them priority over the other paths since, if libs are found there, they - dnl are almost assuredly the ones desired. - AC_REQUIRE([AC_CANONICAL_HOST]) - libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs" - - case ${host_cpu} in - i?86) - libsubdirs="lib/i386-${host_os} $libsubdirs" - ;; - esac - - dnl first we check the system location for boost libraries - dnl this location ist chosen if boost libraries are installed with the --layout=system option - dnl or if you install boost with RPM - if test "$ac_boost_path" != ""; then - BOOST_CPPFLAGS="-I$ac_boost_path/include" - for ac_boost_path_tmp in $libsubdirs; do - if test -d "$ac_boost_path"/"$ac_boost_path_tmp" ; then - BOOST_LDFLAGS="-L$ac_boost_path/$ac_boost_path_tmp" - break - fi - done - elif test "$cross_compiling" != yes; then - for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do - if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then - for libsubdir in $libsubdirs ; do - if ls "$ac_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi - done - BOOST_LDFLAGS="-L$ac_boost_path_tmp/$libsubdir" - BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include" - break; - fi - done - fi - - dnl overwrite ld flags if we have required special directory with - dnl --with-boost-libdir parameter - if test "$ac_boost_lib_path" != ""; then - BOOST_LDFLAGS="-L$ac_boost_lib_path" - fi - - CPPFLAGS_SAVED="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" - export CPPFLAGS - - LDFLAGS_SAVED="$LDFLAGS" - LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" - export LDFLAGS - - AC_REQUIRE([AC_PROG_CXX]) - AC_LANG_PUSH(C++) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - @%:@include - ]], [[ - #if BOOST_VERSION >= $WANT_BOOST_VERSION - // Everything is okay - #else - # error Boost version is too old - #endif - ]])],[ - AC_MSG_RESULT(yes) - succeeded=yes - found_system=yes - ],[ - ]) - AC_LANG_POP([C++]) - - - - dnl if we found no boost with system layout we search for boost libraries - dnl built and installed without the --layout=system option or for a staged(not installed) version - if test "x$succeeded" != "xyes"; then - _version=0 - if test "$ac_boost_path" != ""; then - if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then - for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do - _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` - V_CHECK=`expr $_version_tmp \> $_version` - if test "$V_CHECK" = "1" ; then - _version=$_version_tmp - fi - VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` - BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE" - done - fi - else - if test "$cross_compiling" != yes; then - for ac_boost_path in /usr /usr/local /opt /opt/local ; do - if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then - for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do - _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` - V_CHECK=`expr $_version_tmp \> $_version` - if test "$V_CHECK" = "1" ; then - _version=$_version_tmp - best_path=$ac_boost_path - fi - done - fi - done - - VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` - BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE" - if test "$ac_boost_lib_path" = ""; then - for libsubdir in $libsubdirs ; do - if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi - done - BOOST_LDFLAGS="-L$best_path/$libsubdir" - fi - fi - - if test "x$BOOST_ROOT" != "x"; then - for libsubdir in $libsubdirs ; do - if ls "$BOOST_ROOT/stage/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi - done - if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/$libsubdir" && test -r "$BOOST_ROOT/stage/$libsubdir"; then - version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'` - stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'` - stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'` - V_CHECK=`expr $stage_version_shorten \>\= $_version` - if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then - AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT) - BOOST_CPPFLAGS="-I$BOOST_ROOT" - BOOST_LDFLAGS="-L$BOOST_ROOT/stage/$libsubdir" - fi - fi - fi - fi - - CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" - export CPPFLAGS - LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" - export LDFLAGS - - AC_LANG_PUSH(C++) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - @%:@include - ]], [[ - #if BOOST_VERSION >= $WANT_BOOST_VERSION - // Everything is okay - #else - # error Boost version is too old - #endif - ]])],[ - AC_MSG_RESULT(yes) - succeeded=yes - found_system=yes - ],[ - ]) - AC_LANG_POP([C++]) - fi - - if test "$succeeded" != "yes" ; then - if test "$_version" = "0" ; then - AC_MSG_NOTICE([[We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in . See http://randspringer.de/boost for more documentation.]]) - else - AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).]) - fi - # execute ACTION-IF-NOT-FOUND (if present): - ifelse([$3], , :, [$3]) - else - AC_SUBST(BOOST_CPPFLAGS) - AC_SUBST(BOOST_LDFLAGS) - AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available]) - # execute ACTION-IF-FOUND (if present): - ifelse([$2], , :, [$2]) - fi - - CPPFLAGS="$CPPFLAGS_SAVED" - LDFLAGS="$LDFLAGS_SAVED" -fi - -]) diff --git a/macros/m4_ax_check_compile_flag.m4 b/macros/m4_ax_check_compile_flag.m4 deleted file mode 100644 index 51df0c09a7..0000000000 --- a/macros/m4_ax_check_compile_flag.m4 +++ /dev/null @@ -1,74 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) -# -# DESCRIPTION -# -# Check whether the given FLAG works with the current language's compiler -# or gives an error. (Warnings, however, are ignored) -# -# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on -# success/failure. -# -# If EXTRA-FLAGS is defined, it is added to the current language's default -# flags (e.g. CFLAGS) when the check is done. The check is thus made with -# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to -# force the compiler to issue an error when a bad flag is given. -# -# INPUT gives an alternative input source to AC_COMPILE_IFELSE. -# -# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this -# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. -# -# LICENSE -# -# Copyright (c) 2008 Guido U. Draheim -# Copyright (c) 2011 Maarten Bosmans -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 3 - -AC_DEFUN([AX_CHECK_COMPILE_FLAG], -[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX -AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl -AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ - ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS - _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" - AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], - [AS_VAR_SET(CACHEVAR,[yes])], - [AS_VAR_SET(CACHEVAR,[no])]) - _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) -AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes], - [m4_default([$2], :)], - [m4_default([$3], :)]) -AS_VAR_POPDEF([CACHEVAR])dnl -])dnl AX_CHECK_COMPILE_FLAGS diff --git a/macros/m4_ax_pthread.m4 b/macros/m4_ax_pthread.m4 deleted file mode 100644 index 68a403a54e..0000000000 --- a/macros/m4_ax_pthread.m4 +++ /dev/null @@ -1,332 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_pthread.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) -# -# DESCRIPTION -# -# This macro figures out how to build C programs using POSIX threads. It -# sets the PTHREAD_LIBS output variable to the threads library and linker -# flags, and the PTHREAD_CFLAGS output variable to any special C compiler -# flags that are needed. (The user can also force certain compiler -# flags/libs to be tested by setting these environment variables.) -# -# Also sets PTHREAD_CC to any special C compiler that is needed for -# multi-threaded programs (defaults to the value of CC otherwise). (This -# is necessary on AIX to use the special cc_r compiler alias.) -# -# NOTE: You are assumed to not only compile your program with these flags, -# but also link it with them as well. e.g. you should link with -# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS -# -# If you are only building threads programs, you may wish to use these -# variables in your default LIBS, CFLAGS, and CC: -# -# LIBS="$PTHREAD_LIBS $LIBS" -# CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -# CC="$PTHREAD_CC" -# -# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant -# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name -# (e.g. PTHREAD_CREATE_UNDETACHED on AIX). -# -# Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the -# PTHREAD_PRIO_INHERIT symbol is defined when compiling with -# PTHREAD_CFLAGS. -# -# ACTION-IF-FOUND is a list of shell commands to run if a threads library -# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it -# is not found. If ACTION-IF-FOUND is not specified, the default action -# will define HAVE_PTHREAD. -# -# Please let the authors know if this macro fails on any platform, or if -# you have any other suggestions or comments. This macro was based on work -# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help -# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by -# Alejandro Forero Cuervo to the autoconf macro repository. We are also -# grateful for the helpful feedback of numerous users. -# -# Updated for Autoconf 2.68 by Daniel Richard G. -# -# LICENSE -# -# Copyright (c) 2008 Steven G. Johnson -# Copyright (c) 2011 Daniel Richard G. -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 21 - -AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD]) -AC_DEFUN([AX_PTHREAD], [ -AC_REQUIRE([AC_CANONICAL_HOST]) -AC_LANG_PUSH([C]) -ax_pthread_ok=no - -# We used to check for pthread.h first, but this fails if pthread.h -# requires special compiler flags (e.g. on True64 or Sequent). -# It gets checked for in the link test anyway. - -# First of all, check if the user has set any of the PTHREAD_LIBS, -# etcetera environment variables, and if threads linking works using -# them: -if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) - AC_TRY_LINK_FUNC([pthread_join], [ax_pthread_ok=yes]) - AC_MSG_RESULT([$ax_pthread_ok]) - if test x"$ax_pthread_ok" = xno; then - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" - fi - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" -fi - -# We must check for the threads library under a number of different -# names; the ordering is very important because some systems -# (e.g. DEC) have both -lpthread and -lpthreads, where one of the -# libraries is broken (non-POSIX). - -# Create a list of thread flags to try. Items starting with a "-" are -# C compiler flags, and other items are library names, except for "none" -# which indicates that we try without any flags at all, and "pthread-config" -# which is a program returning the flags for the Pth emulation library. - -ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" - -# The ordering *is* (sometimes) important. Some notes on the -# individual items follow: - -# pthreads: AIX (must check this before -lpthread) -# none: in case threads are in libc; should be tried before -Kthread and -# other compiler flags to prevent continual compiler warnings -# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) -# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) -# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) -# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) -# -pthreads: Solaris/gcc -# -mthreads: Mingw32/gcc, Lynx/gcc -# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it -# doesn't hurt to check since this sometimes defines pthreads too; -# also defines -D_REENTRANT) -# ... -mt is also the pthreads flag for HP/aCC -# pthread: Linux, etcetera -# --thread-safe: KAI C++ -# pthread-config: use pthread-config program (for GNU Pth library) - -case ${host_os} in - solaris*) - - # On Solaris (at least, for some versions), libc contains stubbed - # (non-functional) versions of the pthreads routines, so link-based - # tests will erroneously succeed. (We need to link with -pthreads/-mt/ - # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather - # a function called by this macro, so we could check for that, but - # who knows whether they'll stub that too in a future libc.) So, - # we'll just look for -pthreads and -lpthread first: - - ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags" - ;; - - darwin*) - ax_pthread_flags="none -pthread $ax_pthread_flags" - ;; -esac - -# Clang doesn't consider unrecognized options an error unless we specify -# -Werror. We throw in some extra Clang-specific options to ensure that -# this doesn't happen for GCC, which also accepts -Werror. - -AC_MSG_CHECKING([if compiler needs -Werror to reject unknown flags]) -save_CFLAGS="$CFLAGS" -ax_pthread_extra_flags="-Werror" -CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument" -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int foo(void);],[foo()])], - [AC_MSG_RESULT([yes])], - [ax_pthread_extra_flags= - AC_MSG_RESULT([no])]) -CFLAGS="$save_CFLAGS" - -if test x"$ax_pthread_ok" = xno; then -for flag in $ax_pthread_flags; do - - case $flag in - none) - AC_MSG_CHECKING([whether pthreads work without any flags]) - ;; - - -*) - AC_MSG_CHECKING([whether pthreads work with $flag]) - PTHREAD_CFLAGS="$flag" - ;; - - pthread-config) - AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no]) - if test x"$ax_pthread_config" = xno; then continue; fi - PTHREAD_CFLAGS="`pthread-config --cflags`" - PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" - ;; - - *) - AC_MSG_CHECKING([for the pthreads library -l$flag]) - PTHREAD_LIBS="-l$flag" - ;; - esac - - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags" - - # Check for various functions. We must include pthread.h, - # since some functions may be macros. (On the Sequent, we - # need a special flag -Kthread to make this header compile.) - # We check for pthread_join because it is in -lpthread on IRIX - # while pthread_create is in libc. We check for pthread_attr_init - # due to DEC craziness with -lpthreads. We check for - # pthread_cleanup_push because it is one of the few pthread - # functions on Solaris that doesn't have a non-functional libc stub. - # We try pthread_create on general principles. - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include - static void routine(void *a) { a = 0; } - static void *start_routine(void *a) { return a; }], - [pthread_t th; pthread_attr_t attr; - pthread_create(&th, 0, start_routine, 0); - pthread_join(th, 0); - pthread_attr_init(&attr); - pthread_cleanup_push(routine, 0); - pthread_cleanup_pop(0) /* ; */])], - [ax_pthread_ok=yes], - []) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - AC_MSG_RESULT([$ax_pthread_ok]) - if test "x$ax_pthread_ok" = xyes; then - break; - fi - - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" -done -fi - -# Various other checks: -if test "x$ax_pthread_ok" = xyes; then - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. - AC_MSG_CHECKING([for joinable pthread attribute]) - attr_name=unknown - for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], - [int attr = $attr; return attr /* ; */])], - [attr_name=$attr; break], - []) - done - AC_MSG_RESULT([$attr_name]) - if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then - AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], [$attr_name], - [Define to necessary symbol if this constant - uses a non-standard name on your system.]) - fi - - AC_MSG_CHECKING([if more special flags are required for pthreads]) - flag=no - case ${host_os} in - aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";; - osf* | hpux*) flag="-D_REENTRANT";; - solaris*) - if test "$GCC" = "yes"; then - flag="-D_REENTRANT" - else - # TODO: What about Clang on Solaris? - flag="-mt -D_REENTRANT" - fi - ;; - esac - AC_MSG_RESULT([$flag]) - if test "x$flag" != xno; then - PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" - fi - - AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT], - [ax_cv_PTHREAD_PRIO_INHERIT], [ - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], - [[int i = PTHREAD_PRIO_INHERIT;]])], - [ax_cv_PTHREAD_PRIO_INHERIT=yes], - [ax_cv_PTHREAD_PRIO_INHERIT=no]) - ]) - AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"], - [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])]) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - # More AIX lossage: compile with *_r variant - if test "x$GCC" != xyes; then - case $host_os in - aix*) - AS_CASE(["x/$CC"], - [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6], - [#handle absolute path differently from PATH based program lookup - AS_CASE(["x$CC"], - [x/*], - [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])], - [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])]) - ;; - esac - fi -fi - -test -n "$PTHREAD_CC" || PTHREAD_CC="$CC" - -AC_SUBST([PTHREAD_LIBS]) -AC_SUBST([PTHREAD_CFLAGS]) -AC_SUBST([PTHREAD_CC]) - -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: -if test x"$ax_pthread_ok" = xyes; then - ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1]) - : -else - ax_pthread_ok=no - $2 -fi -AC_LANG_POP -])dnl AX_PTHREAD diff --git a/macros/pkg.m4 b/macros/pkg.m4 deleted file mode 100644 index 4a8d0554d5..0000000000 --- a/macros/pkg.m4 +++ /dev/null @@ -1,63 +0,0 @@ -dnl This was originally from pkgconfig -dnl modified for GnuCash to make it more quiet -dnl in the face of missing config files. -dnl also, pkg-config --errors-to-stdout does not work as advertized on FC3 -dnl so we need to redirect stderr to stdout. - -dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) -dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page -dnl also defines GSTUFF_PKG_ERRORS on error -AC_DEFUN([PKG_CHECK_MODULES], [ - succeeded=no - - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi - - if test "$PKG_CONFIG" = "no" ; then - echo "*** The pkg-config script could not be found. Make sure it is" - echo "*** in your path, or set the PKG_CONFIG environment variable" - echo "*** to the full path to pkg-config." - echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." - else - pkg_config_min_version=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then - AC_MSG_CHECKING(for $2) - - if $PKG_CONFIG --silence-errors --exists "$2" ; then - AC_MSG_RESULT(yes) - succeeded=yes - - AC_MSG_CHECKING($1_CFLAGS) - $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` - AC_MSG_RESULT($$1_CFLAGS) - - AC_MSG_CHECKING($1_LIBS) - $1_LIBS=`$PKG_CONFIG --libs "$2"` - AC_MSG_RESULT($$1_LIBS) - else - AC_MSG_RESULT(no) - $1_CFLAGS="" - $1_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2" 2>&1` - ifelse([$4], ,echo $$1_PKG_ERRORS,) - fi - - AC_SUBST($1_CFLAGS) - AC_SUBST($1_LIBS) - else - echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi - fi - - if test $succeeded = yes; then - ifelse([$3], , :, [$3]) - else - ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) - fi -]) - - diff --git a/macros/svn2cl.xsl b/macros/svn2cl.xsl deleted file mode 100644 index 76045f31d9..0000000000 --- a/macros/svn2cl.xsl +++ /dev/null @@ -1,361 +0,0 @@ - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - gnucash/branches/aqbanking3 - - - gnucash/branches/csv-import - - - gnucash/branches/reshuffle-modules - - - gnucash/branches/deprecated-cleanup - - - gnucash/branches/gobject-engine-dev-warlord - - - gnucash/branches/remove-group2 - - - gnucash/branches/sx-cleanup - - - - - gnucash/ - - - - - - - - - - - - - - - - - - - - &newl;&newl; - - - - &newl; - - &newl;&newl; - - - - - - - - - - - - - - - - - -
- - - - &space;&space; - - -
- - - - - [r - - ]&space; - - - - &tab;*&space; - - - - - - - - - - - - - - - - - - &space; - - - - - - - - - - - - - - - - - ,&space; - - - - - - :&space; - - - - - DONTPRINT - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DONTPRINT - - - - - - - - - - - - - - - - - . - - - - - - - - - - - - - - - - - - &newl; - - - - - - - - - - - - - - - - - - - &newl;&tab;&space;&space; - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test-templates/CMakeLists.txt b/test-templates/CMakeLists.txt index 40558a1112..b31c503f0d 100644 --- a/test-templates/CMakeLists.txt +++ b/test-templates/CMakeLists.txt @@ -1,2 +1,2 @@ -SET_DIST_LIST(test_templates_DIST CMakeLists.txt Makefile.am Makefile.decl) \ No newline at end of file +SET_DIST_LIST(test_templates_DIST CMakeLists.txt Makefile.decl) \ No newline at end of file diff --git a/test-templates/Makefile.am b/test-templates/Makefile.am deleted file mode 100644 index f0f1d380c8..0000000000 --- a/test-templates/Makefile.am +++ /dev/null @@ -1,54 +0,0 @@ -# A template Makefile.am for GLib g_test-based test directories. -# Copyright 2011 John Ralls - -include $(top_srcdir)/test-templates/Makefile.decl - - -#You will only need one of these: It points to the module directory -#after $(top_srcdir) or ${top_builddir}: -MODULEPATH = path/to/foo - -#The libtool convenience library to assemble the common test code -#(fixture code, setup and teardown routines, mocks, etc.). Use it only -#if there are a lot of test programs and support programs. For most -#cases it will make more sense to just include test_module_support.h -#and test_module_support.c in the test program sources & headers -#check_LTLIBRARIES = libgncmod_test_foo.la -# -#libgnc_test_foo_la_SOURCES = \ -# test_foo_support.c - -#The test program. You'll need to add to this if you have more than one module above. -TEST_PROGS += test-foo - -noinst_PROGRAMS = ${TEST_PROGS} - -test_foodir = ${top_srcdir}/${MODULEPATH}/test - -#Program files for tests go here. It's probably best to have one for -#each file in the parent directory. Include -#test_foo_support.c if you have one and aren't building the -#support library. -test_foo_SOURCES = \ - test-foo.c \ - test-suite-module1.c \ - test-suite-module2.c \ - #etc. - -test_foo_HEADERSS = \ - $(top_srcdir)/${MODULEPATH}/module1.h \ - $(top_srcdir)/${MODULEPATH}/module2.h \ - #etc. - - -#The tests might require more libraries, but try to keep them -#as independent as possible. -test_foo_LDADD = ${top_buildir}/${MODULEPATH}/libgnc_foo.la - -test_foo_CFLAGS = \ - -DTESTPROG=test_foo \ - ${DEFAULT_INCLUDES} \ - -I$(top_srcdir)/${MODULEPATH}/ \ - ${GLIB_CFLAGS} - -EXTRA_DIST = CMakeLists.txt diff --git a/util/ci/arch-docker b/util/ci/arch-docker index a5d3120eac..dc5c947a89 100644 --- a/util/ci/arch-docker +++ b/util/ci/arch-docker @@ -1,5 +1,5 @@ from base/archlinux -run pacman -Syu --quiet --noconfirm gcc cmake make autoconf automake boost python2 pkg-config guile2.0 guile git ninja gtest gmock sqlite3 webkit2gtk swig gwenhywfar aqbanking intltool libxslt postgresql-libs libmariadbclient libdbi libdbi-drivers > /dev/null +run pacman -Syu --quiet --noconfirm gcc cmake make boost python2 pkg-config guile2.0 guile git ninja gtest gmock sqlite3 webkit2gtk swig gwenhywfar aqbanking intltool libxslt postgresql-libs libmariadbclient libdbi libdbi-drivers > /dev/null run echo en_US.UTF-8 UTF-8 >> /etc/locale.gen run echo en_GB.UTF-8 UTF-8 >> /etc/locale.gen run echo fr_FR.UTF-8 UTF-8 >> /etc/locale.gen diff --git a/util/ci/commonbuild b/util/ci/commonbuild index f314611efc..8fb3f00ebd 100644 --- a/util/ci/commonbuild +++ b/util/ci/commonbuild @@ -14,11 +14,6 @@ elif [[ "$BUILDTYPE" == "cmake-ninja" ]]; then cmake ../gnucash -DWITH_PYTHON=ON -DCMAKE_BUILD_TYPE=debug -G Ninja ninja ninja check || ../afterfailure; -elif [[ "$BUILDTYPE" == "autotools" ]]; then - ../gnucash/autogen.sh; - ../gnucash/configure --enable-python - make; - make check || ../afterfailure else echo "Unknown buildtype: \"$BUILDTYPE\". Not building." fi