Merge branch 'maint'

2025-02-25 18:55:30 -06:00 · 2017-07-10 20:22:35 +02:00 · 2017-07-10 20:22:35 +02:00 · b430744fb5
commit b430744fb5
parent eb55b5f98c b1f9f80110
160 changed files with 335 additions and 117 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -54,6 +54,10 @@ dist_doc_DATA = \

 EXTRA_DIST = \
  $(SWIG_DIST_FAIL) \
+  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 \
@ -61,6 +65,9 @@ EXTRA_DIST = \
  macros/ax_python_devel.m4 \
  macros/ax_swig_python.m4 \
  macros/legacy_macros.m4 \
+  macros/CMakeLists.txt \
+  po/CMakeLists.txt \
+  po/glossary/CMakeLists.txt \
  po/gnucash.pot \
  po/POTFILES.in \
  po/POTFILES.skip \
@ -94,7 +101,10 @@ EXTRA_DIST = \
  intltool-extract.in \
  intltool-merge.in \
  intltool-update.in \
-  util/gnc-vcs-info
+  test-templates/CMakeLists.txt \
+  test-templates/Makefile.am \
+  util/gnc-vcs-info \
+  util/CMakeLists.txt

 ## We borrow guile's convention and use @-...-@ as the substitution
 ## brackets here, instead of the usual @...@.  This prevents autoconf
--- a/accounts/C/Makefile.am
+++ b/accounts/C/Makefile.am
@ -21,4 +21,5 @@ account_DATA = \

 EXTRA_DIST = \
  ${account_DATA} \
-  acctchrt_full.gnucash-xea 
+  acctchrt_full.gnucash-xea \
+  CMakeLists.txt
--- a/accounts/Makefile.am
+++ b/accounts/Makefile.am
@ -35,3 +35,4 @@ SUBDIRS = \
 	zh_HK \
 	zh_TW

+EXTRA_DIST = CMakeLists.txt
--- a/accounts/cs/Makefile.am
+++ b/accounts/cs/Makefile.am
@ -19,4 +19,5 @@ account_DATA = \
  acctchrt_spouseretire.gnucash-xea

 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
--- a/accounts/da/Makefile.am
+++ b/accounts/da/Makefile.am
@ -8,4 +8,5 @@ account_DATA = \
  acctchrt_homeown.gnucash-xea

 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
--- a/accounts/de_AT/Makefile.am
+++ b/accounts/de_AT/Makefile.am
@ -10,3 +10,5 @@ dist_account_DATA = \
 acctchrt_houseown.gnucash-xea \
 acctchrt_investment.gnucash-xea \
 acctchrt_kids.gnucash-xea
+
+EXTRA_DIST = CMakeLists.txt
--- a/accounts/de_CH/Makefile.am
+++ b/accounts/de_CH/Makefile.am
@ -10,4 +10,5 @@ account_DATA = \
  acctchrt_chkmu.gnucash-xea 

 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
--- a/accounts/de_DE/Makefile.am
+++ b/accounts/de_DE/Makefile.am
@ -20,4 +20,5 @@ account_DATA = \

 EXTRA_DIST = \
  ${account_DATA} \
-  acctchrt_full.gnucash-xea 
+  acctchrt_full.gnucash-xea  \
+  CMakeLists.txt
--- a/accounts/el_GR/Makefile.am
+++ b/accounts/el_GR/Makefile.am
@ -7,4 +7,5 @@ account_DATA = \
  acctchrt_brokerage.gnucash-xea

 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
--- a/accounts/en_GB/Makefile.am
+++ b/accounts/en_GB/Makefile.am
@ -22,4 +22,5 @@ account_DATA = \

 EXTRA_DIST = \
  ${account_DATA} \
-  acctchrt_full.gnucash-xea 
+  acctchrt_full.gnucash-xea \
+  CMakeLists.txt
--- a/accounts/es_ES/Makefile.am
+++ b/accounts/es_ES/Makefile.am
@ -19,5 +19,6 @@ account_DATA = \
  acctchrt_spouseretire.gnucash-xea

 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt

--- a/accounts/es_MX/Makefile.am
+++ b/accounts/es_MX/Makefile.am
@ -19,5 +19,6 @@ account_DATA = \
  acctchrt_spouseretire.gnucash-xea

 EXTRA_DIST = \
-  ${account_DATA}
+${account_DATA} \
+CMakeLists.txt

--- a/accounts/fi_FI/Makefile.am
+++ b/accounts/fi_FI/Makefile.am
@ -7,4 +7,5 @@ account_DATA = \
  acctchrt_ry.gnucash-xea

 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
--- a/accounts/fr_CA/Makefile.am
+++ b/accounts/fr_CA/Makefile.am
@ -17,4 +17,5 @@ account_DATA = \
 acctchrt_revenus.gnucash-xea

 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
--- a/accounts/fr_CH/Makefile.am
+++ b/accounts/fr_CH/Makefile.am
@ -20,4 +20,5 @@ account_DATA = \
  acctchrt_spouseretire.gnucash-xea

 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
--- a/accounts/fr_FR/Makefile.am
+++ b/accounts/fr_FR/Makefile.am
@ -20,4 +20,5 @@ account_DATA = \
  acctchrt_spouseretire.gnucash-xea

 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
--- a/accounts/hu_HU/Makefile.am
+++ b/accounts/hu_HU/Makefile.am
@ -20,4 +20,5 @@ account_DATA = \
  acctchrt_spouseretire.gnucash-xea

 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
--- a/accounts/it/Makefile.am
+++ b/accounts/it/Makefile.am
@ -18,4 +18,5 @@ account_DATA = \


 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
--- a/accounts/ja/Makefile.am
+++ b/accounts/ja/Makefile.am
@ -21,4 +21,5 @@ account_DATA = \
  acctchrt_spouseretire.gnucash-xea

 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
--- a/accounts/ko/Makefile.am
+++ b/accounts/ko/Makefile.am
@ -20,4 +20,5 @@ account_DATA = \
  acctchrt_spouseretire.gnucash-xea

 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
--- a/accounts/lt/Makefile.am
+++ b/accounts/lt/Makefile.am
@ -5,5 +5,6 @@ account_DATA = \
  acctchrt_business.gnucash-xea

 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt

--- a/accounts/lv/Makefile.am
+++ b/accounts/lv/Makefile.am
@ -21,4 +21,5 @@ account_DATA = \

 EXTRA_DIST = \
  ${account_DATA} \
-  acctchrt_full.gnucash-xea 
+  acctchrt_full.gnucash-xea \
+  CMakeLists.txt
--- a/accounts/nb/Makefile.am
+++ b/accounts/nb/Makefile.am
@ -22,4 +22,5 @@ account_DATA = \

 EXTRA_DIST = \
  ${account_DATA} \
-  acctchrt_full.gnucash-xea 
+  acctchrt_full.gnucash-xea \
+  CMakeLists.txt
--- a/accounts/nl/Makefile.am
+++ b/accounts/nl/Makefile.am
@ -6,4 +6,5 @@ account_DATA = \
  acctchrt_rgs_1.1.gnucash-xea

 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
--- a/accounts/pl/Makefile.am
+++ b/accounts/pl/Makefile.am
@ -21,4 +21,5 @@ account_DATA = \

 EXTRA_DIST = \
  ${account_DATA} \
-  acctchrt_full.gnucash-xea 
+  acctchrt_full.gnucash-xea \
+  CMakeLists.txt
--- a/accounts/pt_BR/Makefile.am
+++ b/accounts/pt_BR/Makefile.am
@ -19,4 +19,5 @@ account_DATA = \
  acctchrt_spouseretire.gnucash-xea

 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
--- a/accounts/pt_PT/Makefile.am
+++ b/accounts/pt_PT/Makefile.am
@ -18,4 +18,5 @@ account_DATA = \
  acctchrt_spouseretire.gnucash-xea

 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
--- a/accounts/ru/Makefile.am
+++ b/accounts/ru/Makefile.am
@ -8,4 +8,5 @@ account_DATA = \
  acctchrt_renter.gnucash-xea

 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
--- a/accounts/sk/Makefile.am
+++ b/accounts/sk/Makefile.am
@ -19,4 +19,5 @@ account_DATA = \
  acctchrt_spouseretire.gnucash-xea

 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
--- a/accounts/sv_AX/Makefile.am
+++ b/accounts/sv_AX/Makefile.am
@ -7,4 +7,5 @@ account_DATA = \
    acctchrt_rf.gnucash-xea

 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
--- a/accounts/sv_FI/Makefile.am
+++ b/accounts/sv_FI/Makefile.am
@ -7,4 +7,5 @@ account_DATA = \
    acctchrt_rf.gnucash-xea

 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
--- a/accounts/sv_SE/Makefile.am
+++ b/accounts/sv_SE/Makefile.am
@ -6,4 +6,5 @@ account_DATA = \
 	acctchrt_common.gnucash-xea 
 EXTRA_DIST = \
  README.bas_2012 \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
--- a/accounts/tr_TR/Makefile.am
+++ b/accounts/tr_TR/Makefile.am
@ -12,4 +12,5 @@ account_DATA = \
 acctchrt_TEKDUZ.gnucash-xea

 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
--- a/accounts/zh_CN/Makefile.am
+++ b/accounts/zh_CN/Makefile.am
@ -21,4 +21,5 @@ account_DATA = \

 EXTRA_DIST = \
  ${account_DATA} \
-  acctchrt_full.gnucash-xea 
+  acctchrt_full.gnucash-xea \
+  CMakeLists.txt
--- a/accounts/zh_HK/Makefile.am
+++ b/accounts/zh_HK/Makefile.am
@ -5,4 +5,5 @@ account_DATA = \
  acctchrt_business.gnucash-xea

 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
--- a/accounts/zh_TW/Makefile.am
+++ b/accounts/zh_TW/Makefile.am
@ -5,4 +5,5 @@ account_DATA = \
  acctchrt_business.gnucash-xea

 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
--- a/checks/Makefile.am
+++ b/checks/Makefile.am
@ -10,4 +10,4 @@ checks_DATA = \
 	quicken_check_21.chk \
 	quicken_3part.chk

-EXTRA_DIST = ${checks_DATA}
+EXTRA_DIST = ${checks_DATA} CMakeLists.txt
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@ -34,7 +34,8 @@ EXTRA_DIST = \
  gnucash.1.in \
  gtkrc-2.0.gnucash \
  misc-notes.txt \
-  tip_of_the_day.list.in
+  tip_of_the_day.list.in \
+  CMakeLists.txt

 ## We borrow guile's convention and use @-...-@ as the substitution
 ## brackets here, instead of the usual @...@.  This prevents autoconf
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@ -20,4 +20,5 @@ doc_DATA = \
  web.qif

 EXTRA_DIST = \
-  ${doc_DATA}
+  ${doc_DATA} \
+  CMakeLists.txt
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@ -4,5 +4,5 @@ else
 SUBDIRS = libc
 endif

-EXTRA_DIST = README
+EXTRA_DIST = README CMakeLists.txt

--- a/lib/libc/Makefile.am
+++ b/lib/libc/Makefile.am
@ -13,7 +13,8 @@ libc_missing_la_SOURCES = libc-missing-noop.c
 EXTRA_libc_missing_la_SOURCES = \
  setenv.c \
  strfmon.c \
-  strptime.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.
--- a/packaging/Makefile.am
+++ b/packaging/Makefile.am
@ -1,6 +1,7 @@
 EXTRA_DIST = \
  gnucash.spec.in \
-  gnucash.spec
+  gnucash.spec \
+  CMakeLists.txt

 all-local: gnucash.spec

--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -59,7 +59,22 @@ 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/GncConfigure.cmake \
+  cmake_modules/GncAddSchemeTargets.cmake \
+  cmake_modules/GncAddGSchemaTargets.cmake \
+  cmake_modules/GncFindPkgConfig.cmake \
+  cmake_modules/CMakeLists.txt \
+  config.h.cmake.in \
  README.modules \
  gnc-test-env.pl \
  guile-mappings.h \
-  platform.h
+  platform.h \
+  CMakeLists.txt
--- a/src/app-utils/Makefile.am
+++ b/src/app-utils/Makefile.am
@ -172,7 +172,8 @@ EXTRA_DIST = \
  app-utils.i \
  ${gncscmmod_DATA} \
  ${gncscm_DATA} \
-  ${prefsmigration_DATA}
+  ${prefsmigration_DATA} \
+  CMakeLists.txt

 if OS_WIN32
 libgncmod_app_utils_la_SOURCES += gnc-help-utils.c
--- a/src/app-utils/test/Makefile.am
+++ b/src/app-utils/test/Makefile.am
@ -49,7 +49,8 @@ LDADD = \
   ${GUILE_LIBS}

 EXTRA_DIST += \
-  test-load-module
+  test-load-module \
+  CMakeLists.txt

 AM_CPPFLAGS = \
  -I${top_srcdir}/src \
--- a/src/backend/Makefile.am
+++ b/src/backend/Makefile.am
@ -3,3 +3,4 @@ if WITH_DBI
 endif
 SUBDIRS = xml sql ${DBI_DIR}

+EXTRA_DIST = CMakeLists.txt
--- a/src/backend/dbi/Makefile.am
+++ b/src/backend/dbi/Makefile.am
@ -44,3 +44,5 @@ libgncmod_backend_dbi_la_LIBADD = \
   ${LIBDBI_LIBS}

 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.dbi\"
+
+EXTRA_DIST = CMakeLists.txt
--- a/src/backend/dbi/test/Makefile.am
+++ b/src/backend/dbi/test/Makefile.am
@ -46,7 +46,8 @@ TESTS_ENVIRONMENT = \
 EXTRA_DIST += \
    test-dbi-stuff.h \
    test-dbi-business-stuff.h \
-    test-dbi.xml
+    test-dbi.xml \
+    CMakeLists.txt

 check_PROGRAMS = test-backend-dbi

--- a/src/backend/sql/Makefile.am
+++ b/src/backend/sql/Makefile.am
@ -82,3 +82,5 @@ libgnc_backend_sql_la_LIBADD = \
   ${top_builddir}/src/libqof/qof/libgnc-qof.la

 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.sql\"
+
+EXTRA_DIST = CMakeLists.txt
--- a/src/backend/sql/test/Makefile.am
+++ b/src/backend/sql/test/Makefile.am
@ -71,3 +71,5 @@ test_sqlbe_CFLAGS = \
 	-I$(top_srcdir)/src/libqof/qof/ \
 	-I$(top_srcdir)/src/test-core/ \
 	$(GLIB_CFLAGS)
+
+EXTRA_DIST = CMakeLists.txt
--- a/src/backend/xml/Makefile.am
+++ b/src/backend/xml/Makefile.am
@ -106,3 +106,5 @@ libgncmod_backend_xml_la_LIBADD = \
   ${top_builddir}/src/libqof/qof/libgnc-qof.la

 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.xml\"
+
+EXTRA_DIST = CMakeLists.txt
--- a/src/backend/xml/test/Makefile.am
+++ b/src/backend/xml/test/Makefile.am
@ -281,6 +281,7 @@ EXTRA_DIST = \
  grab-types.pl \
  test-dom-parser1.cpp \
  test-real-data.sh \
-  test-xml2-is-file.cpp
+  test-xml2-is-file.cpp \
+  CMakeLists.txt

 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.xml\"
--- a/src/backend/xml/test/test-files/Makefile.am
+++ b/src/backend/xml/test/test-files/Makefile.am
@ -1 +1,3 @@
 SUBDIRS = xml2
+
+EXTRA_DIST = CMakeLists.txt
--- a/src/backend/xml/test/test-files/xml2/Makefile.am
+++ b/src/backend/xml/test/test-files/xml2/Makefile.am
@ -14,7 +14,9 @@ ACCT_TST_FILES = \
 	ms-money.gml2 \
 	pricedb1.gml2 

-EXTRA_DIST = $(ACCT_TST_FILES)
+EXTRA_DIST = \
+	$(ACCT_TST_FILES) \
+	CMakeLists.txt

 check:
 	for file in $(ACCT_TST_FILES); do			\
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@ -142,8 +142,9 @@ CLEANFILES += ${gnc_common_scripts}
 endif

 EXTRA_DIST = \
-    generate-gnc-script \
+	generate-gnc-script \
 	gnucash-valgrind.in \
-	environment.in
+	environment.in \
+	CMakeLists.txt

 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.bin\"
--- a/src/bin/overrides/Makefile.am
+++ b/src/bin/overrides/Makefile.am
@ -8,7 +8,8 @@ EXTRA_DIST = \
  gnucash-env.in \
  gnucash-build-env.in \
  gnucash-make-guids \
-  guile.in 
+  guile.in \
+  CMakeLists.txt

 noinst_DATA = gnucash-build-env guile

--- a/src/bin/test/Makefile.am
+++ b/src/bin/test/Makefile.am
@ -4,4 +4,6 @@ TESTS = test-version
 TESTS_ENVIRONMENT = \
 	PATH="..:${PATH}"

-EXTRA_DIST = test-version
+EXTRA_DIST = \
+	test-version \
+	CMakeLists.txt
--- a/src/business/Makefile.am
+++ b/src/business/Makefile.am
@ -1,3 +1,5 @@
 SUBDIRS = \
  business-ledger \
  business-gnome
+
+EXTRA_DIST = CMakeLists.txt
--- a/src/business/business-gnome/Makefile.am
+++ b/src/business/business-gnome/Makefile.am
@ -87,7 +87,8 @@ gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
 gncscmmod_DATA = business-gnome.scm

 EXTRA_DIST = \
-  ${gncscmmod_DATA}
+  ${gncscmmod_DATA} \
+  CMakeLists.txt

 if GNUCASH_SEPARATE_BUILDDIR
 #Only needed when srcdir and builddir are different
--- a/src/business/business-gnome/gschemas/Makefile.am
+++ b/src/business/business-gnome/gschemas/Makefile.am
@ -8,3 +8,5 @@ gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml)
@GSETTINGS_RULES@

 CLEANFILES = $(gsettings_SCHEMAS)
+
+EXTRA_DIST = CMakeLists.txt
--- a/src/business/business-gnome/gtkbuilder/Makefile.am
+++ b/src/business/business-gnome/gtkbuilder/Makefile.am
@ -14,4 +14,5 @@ gtkbuilder_DATA = \
  dialog-vendor.glade

 EXTRA_DIST = \
-  ${gtkbuilder_DATA}
+  ${gtkbuilder_DATA} \
+  CMakeLists.txt
--- a/src/business/business-gnome/ui/Makefile.am
+++ b/src/business/business-gnome/ui/Makefile.am
@ -4,4 +4,4 @@ ui_DATA = \
 	gnc-plugin-page-invoice-ui.xml \
 	gnc-plugin-page-owner-tree-ui.xml

-EXTRA_DIST = $(ui_DATA)
+EXTRA_DIST = $(ui_DATA) CMakeLists.txt
--- a/src/business/business-ledger/Makefile.am
+++ b/src/business/business-ledger/Makefile.am
@ -42,3 +42,5 @@ AM_CPPFLAGS = \
  ${GLIB_CFLAGS}

 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.business.ledger\"
+
+EXTRA_DIST = CMakeLists.txt
--- a/src/core-utils/Makefile.am
+++ b/src/core-utils/Makefile.am
@ -129,7 +129,13 @@ endif

 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
+EXTRA_DIST = \
+  $(gncscmmod_DATA) \
+  core-utils.i \
+  gncla-dir.h.in \
+  gnc-vcs-info.h \
+  CMakeLists.txt
+
 clean-local:
 	rm -rf gnucash

--- a/src/core-utils/test/Makefile.am
+++ b/src/core-utils/test/Makefile.am
@ -49,7 +49,8 @@ test_gnc_glib_utils_CFLAGS = \
        -I${top_srcdir}/${MODULEPATH} \
        ${GLIB_CFLAGS}

-EXTRA_DIST +=
+EXTRA_DIST += \
+	CMakeLists.txt

 clean-local:
 	rm -f translog.*
--- a/src/debug/Makefile.am
+++ b/src/debug/Makefile.am
@ -1,3 +1,4 @@
-
 SUBDIRS = \
  valgrind
+
+EXTRA_DIST = CMakeLists.txt
--- a/src/debug/valgrind/Makefile.am
+++ b/src/debug/valgrind/Makefile.am
@ -6,4 +6,5 @@ EXTRA_DIST = \
  valgrind-libfontconfig.supp \
  valgrind-libgda.supp \
  valgrind-libguile.supp \
-  valgrind-x11.supp
+  valgrind-x11.supp \
+  CMakeLists.txt
--- a/src/doc/Makefile.am
+++ b/src/doc/Makefile.am
@ -25,7 +25,8 @@ EXTRA_DIST = \
  qif.txt \
  tax.txt \
  user-prefs-howto.txt \
-  python-bindings-doxygen.py
+  python-bindings-doxygen.py \
+  CMakeLists.txt


 all:
--- a/src/doc/design/Makefile.am
+++ b/src/doc/design/Makefile.am
@ -17,3 +17,5 @@ gnucash_design_TEXINFOS = \
 # 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
--- a/src/doc/xml/Makefile.am
+++ b/src/doc/xml/Makefile.am
@ -9,4 +9,5 @@ EXTRA_DIST = \
  preferences-v1.dtd \
  prices-v1.dtd \
  transactions-v2.dtd \
-  types.dtd
+  types.dtd \
+  CMakeLists.txt
--- a/src/engine/Makefile.am
+++ b/src/engine/Makefile.am
@ -171,7 +171,8 @@ EXTRA_DIST = \
  engine-common.i \
  business-core.i \
  ${gncscmmod_DATA} \
-  ${gncscm_DATA}
+  ${gncscm_DATA} \
+  CMakeLists.txt

 if GNUCASH_SEPARATE_BUILDDIR
 #For executing test cases
--- a/src/engine/test-core/Makefile.am
+++ b/src/engine/test-core/Makefile.am
@ -25,3 +25,5 @@ AM_CPPFLAGS = \
  ${GLIB_CFLAGS} \
  ${GUILE_CFLAGS} \
  ${BOOST_CPPFLAGS}
+
+EXTRA_DIST = CMakeLists.txt
--- a/src/engine/test/Makefile.am
+++ b/src/engine/test/Makefile.am
@ -128,7 +128,8 @@ EXTRA_DIST += \
  test-scm-query-import \
  test-scm-query-import.scm \
  $(SCM_TEST_HELPERS) \
-  $(SCM_TEST_SRCS)
+  $(SCM_TEST_SRCS) \
+  CMakeLists.txt

 TEST_PROGS += test-engine

--- a/src/gnc-module/Makefile.am
+++ b/src/gnc-module/Makefile.am
@ -44,7 +44,8 @@ endif

 EXTRA_DIST = \
  ${gncscmmod_DATA} \
-  gnc-module.i
+  gnc-module.i \
+  CMakeLists.txt

 if GNUCASH_SEPARATE_BUILDDIR
 #For executing test cases
--- a/src/gnc-module/test/Makefile.am
+++ b/src/gnc-module/test/Makefile.am
@ -67,7 +67,8 @@ EXTRA_DIST = \
  test-scm-dynload \
  test-scm-init \
  test-scm-module \
-  test-scm-multi
+  test-scm-multi \
+  CMakeLists.txt

 foo:
 	${TESTS_ENVIRONMENT} strace -f -o xxx ./test-load-c
--- a/src/gnc-module/test/misc-mods/Makefile.am
+++ b/src/gnc-module/test/misc-mods/Makefile.am
@ -26,3 +26,5 @@ libgncmod_agedver_la_LIBADD = \
  $(GLIB_LIBS)

 CLEANFILES = *.so* *.a
+
+EXTRA_DIST = CMakeLists.txt
--- a/src/gnc-module/test/mod-bar/Makefile.am
+++ b/src/gnc-module/test/mod-bar/Makefile.am
@ -36,7 +36,8 @@ endif

 EXTRA_DIST = \
  bar.i \
-  gnucash/bar.scm
+  gnucash/bar.scm \
+  CMakeLists.txt

 BUILT_SOURCES = swig-bar.c
 MAINTAINERCLEANFILES = swig-bar.c
--- a/src/gnc-module/test/mod-baz/Makefile.am
+++ b/src/gnc-module/test/mod-baz/Makefile.am
@ -40,7 +40,8 @@ endif

 EXTRA_DIST = \
  baz.i \
-  gnucash/baz.scm
+  gnucash/baz.scm \
+  CMakeLists.txt

 BUILT_SOURCES = swig-baz.c
 MAINTAINERCLEANFILES = swig-baz.c
--- a/src/gnc-module/test/mod-foo/Makefile.am
+++ b/src/gnc-module/test/mod-foo/Makefile.am
@ -25,7 +25,8 @@ libgncmodfoo_la_LIBADD = \

 EXTRA_DIST = \
  foo.i \
-  gnucash/foo.scm
+  gnucash/foo.scm \
+  CMakeLists.txt

 if BUILDING_FROM_VCS
 swig-foo.c: foo.i
--- a/src/gnome-search/Makefile.am
+++ b/src/gnome-search/Makefile.am
@ -61,6 +61,7 @@ gtkbuilder_DATA = \
  dialog-search.glade

 EXTRA_DIST = \
-  ${gtkbuilder_DATA}
+  ${gtkbuilder_DATA} \
+  CMakeLists.txt

 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.gui.search\"
--- a/src/gnome-utils/Makefile.am
+++ b/src/gnome-utils/Makefile.am
@ -249,7 +249,8 @@ EXTRA_DIST = \
  make-gnc-warnings-c.xsl \
  make-gnc-warnings-h.xsl \
  ${gncscmmod_DATA} \
-  ${gncscm_DATA}
+  ${gncscm_DATA} \
+  CMakeLists.txt


 if GNUCASH_SEPARATE_BUILDDIR
--- a/src/gnome-utils/gschemas/Makefile.am
+++ b/src/gnome-utils/gschemas/Makefile.am
@ -9,3 +9,5 @@ gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml)
@GSETTINGS_RULES@

 CLEANFILES = $(gsettings_SCHEMAS)
+
+EXTRA_DIST = CMakeLists.txt
--- a/src/gnome-utils/gtkbuilder/Makefile.am
+++ b/src/gnome-utils/gtkbuilder/Makefile.am
@ -19,4 +19,4 @@ gtkbuilder_DATA = \
  gnc-recurrence.glade \
  gnc-tree-view-owner.glade 

-EXTRA_DIST = $(gtkbuilder_DATA)
+EXTRA_DIST = $(gtkbuilder_DATA) CMakeLists.txt
--- a/src/gnome-utils/test/Makefile.am
+++ b/src/gnome-utils/test/Makefile.am
@ -70,7 +70,8 @@ test_link_module_LDADD = \
  ${top_builddir}/src/gnc-module/libgnc-module.la

 EXTRA_DIST = \
-  test-load-module
+  test-load-module \
+  CMakeLists.txt

 testit:
 	libtool --mode execute gdb test-link-module
--- a/src/gnome-utils/ui/Makefile.am
+++ b/src/gnome-utils/ui/Makefile.am
@ -5,4 +5,4 @@ ui_DATA = \
 	gnc-windows-menu-ui-quartz.xml \
 	osx_accel_map

-EXTRA_DIST = $(ui_DATA)
+EXTRA_DIST = $(ui_DATA) CMakeLists.txt
--- a/src/gnome/Makefile.am
+++ b/src/gnome/Makefile.am
@ -132,7 +132,8 @@ endif
 EXTRA_DIST = \
  gnome.i \
  $(gnomeapp_in_files) \
-  $(appdata_in_files)
+  $(appdata_in_files) \
+  CMakeLists.txt

 AM_CPPFLAGS = \
  -I${top_srcdir}/src \
--- a/src/gnome/gschemas/Makefile.am
+++ b/src/gnome/gschemas/Makefile.am
@ -16,3 +16,5 @@ gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml)
@GSETTINGS_RULES@

 CLEANFILES = $(gsettings_SCHEMAS)
+
+EXTRA_DIST = CMakeLists.txt
--- a/src/gnome/gtkbuilder/Makefile.am
+++ b/src/gnome/gtkbuilder/Makefile.am
@ -22,4 +22,4 @@ gtkbuilder_DATA = \
 	window-autoclear.glade \
 	window-reconcile.glade

-EXTRA_DIST = $(gtkbuilder_DATA)
+EXTRA_DIST = $(gtkbuilder_DATA) CMakeLists.txt
--- a/src/gnome/ui/Makefile.am
+++ b/src/gnome/ui/Makefile.am
@ -20,4 +20,4 @@ ui_DATA = \
 	gnc-sxed-window-ui.xml \
 	gnc-sxed-window-ui-full.xml

-EXTRA_DIST = $(ui_DATA)
+EXTRA_DIST = $(ui_DATA) CMakeLists.txt
--- a/src/html/Makefile.am
+++ b/src/html/Makefile.am
@ -69,7 +69,8 @@ endif
 endif

 EXTRA_DIST = \
-  gnc-html.i
+  gnc-html.i \
+  CMakeLists.txt

 CLEANFILES = $(BUILT_SOURCES) gnucash
 MAINTAINERCLEANFILES = swig-gnc-html.c
--- a/src/import-export/Makefile.am
+++ b/src/import-export/Makefile.am
@ -65,6 +65,7 @@ AM_CPPFLAGS = \

 EXTRA_DIST = \
  $(gtkbuilder_DATA) \
-  generic-import-design.txt
+  generic-import-design.txt \
+  CMakeLists.txt

 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.i-e\"
--- a/src/import-export/aqb/Makefile.am
+++ b/src/import-export/aqb/Makefile.am
@ -74,6 +74,10 @@ gtkbuilder_DATA = \
  dialog-ab.glade \
  dialog-ab-pref.glade

-EXTRA_DIST = ${ui_DATA} ${gtkbuilder_DATA} migratable-prefs-aqbanking.xml
+EXTRA_DIST = \
+    ${ui_DATA} \
+    ${gtkbuilder_DATA} \
+    migratable-prefs-aqbanking.xml \
+    CMakeLists.txt

 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.aqbanking\"
--- a/src/import-export/aqb/gschemas/Makefile.am
+++ b/src/import-export/aqb/gschemas/Makefile.am
@ -8,3 +8,5 @@ gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml)
@GSETTINGS_RULES@

 CLEANFILES = $(gsettings_SCHEMAS)
+
+EXTRA_DIST = CMakeLists.txt
--- a/src/import-export/csv-exp/Makefile.am
+++ b/src/import-export/csv-exp/Makefile.am
@ -57,6 +57,6 @@ gtkbuilderdir = ${GNC_GTKBUILDER_DIR}
 gtkbuilder_DATA = \
 	assistant-csv-export.glade

-EXTRA_DIST = $(ui_DATA) $(gtkbuilder_DATA)
+EXTRA_DIST = $(ui_DATA) $(gtkbuilder_DATA) CMakeLists.txt

 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.export.csv\"
--- a/src/import-export/csv-exp/gschemas/Makefile.am
+++ b/src/import-export/csv-exp/gschemas/Makefile.am
@ -8,3 +8,5 @@ gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml)
@GSETTINGS_RULES@

 CLEANFILES = $(gsettings_SCHEMAS)
+
+EXTRA_DIST = CMakeLists.txt
--- a/src/import-export/csv-imp/Makefile.am
+++ b/src/import-export/csv-imp/Makefile.am
@ -80,6 +80,6 @@ gtkbuilder_DATA = \
 	assistant-csv-account-import.glade \
 	assistant-csv-trans-import.glade

-EXTRA_DIST = $(ui_DATA) $(gtkbuilder_DATA)
+EXTRA_DIST = $(ui_DATA) $(gtkbuilder_DATA) CMakeLists.txt

 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.csv\"
--- a/src/import-export/csv-imp/gschemas/Makefile.am
+++ b/src/import-export/csv-imp/gschemas/Makefile.am
@ -8,3 +8,5 @@ gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml)
@GSETTINGS_RULES@

 CLEANFILES = $(gsettings_SCHEMAS)
+
+EXTRA_DIST = CMakeLists.txt
--- a/src/import-export/csv-imp/test/Makefile.am
+++ b/src/import-export/csv-imp/test/Makefile.am
@ -114,7 +114,8 @@ TESTS_ENVIRONMENT = \
  $(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})

 EXTRA_DIST += \
-  sample1.csv
+  sample1.csv \
+  CMakeLists.txt


 AM_CPPFLAGS = -DG_LOG_DOMAIN=\"gnc.import.csv\"
--- a/src/import-export/gschemas/Makefile.am
+++ b/src/import-export/gschemas/Makefile.am
@ -8,3 +8,5 @@ gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml)
@GSETTINGS_RULES@

 CLEANFILES = $(gsettings_SCHEMAS)
+
+EXTRA_DIST = CMakeLists.txt
--- a/src/import-export/log-replay/Makefile.am
+++ b/src/import-export/log-replay/Makefile.am
@ -42,3 +42,5 @@ dist_ui_DATA = \
 	gnc-plugin-log-replay-ui.xml

 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.log-replay\"
+
+EXTRA_DIST = CMakeLists.txt
--- a/Show More
+++ b/Show More