Skip to content

Commit

Permalink
Add CMakeLists.txt files to dist tarball generated by autotools
Browse files Browse the repository at this point in the history
This is half of the work to align the cmake and autotools generated dist tarballs.
What's missing in the cmake dist tarball on my system are all the files generated
or installed by running autogen.sh. I can't test this because cmake can't run
my version of automake (1.15), or at least our CMake configuration prevents this from happening.
  • Loading branch information
gjanssens committed Jul 10, 2017
1 parent e67f450 commit b1f9f80
Show file tree
Hide file tree
Showing 161 changed files with 335 additions and 119 deletions.
12 changes: 11 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,20 @@ 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 \
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/glossary/CMakeLists.txt \
po/gnucash.pot \
po/POTFILES.in \
po/POTFILES.skip \
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion accounts/C/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ account_DATA = \

EXTRA_DIST = \
${account_DATA} \
acctchrt_full.gnucash-xea
acctchrt_full.gnucash-xea \
CMakeLists.txt
1 change: 1 addition & 0 deletions accounts/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,4 @@ SUBDIRS = \
zh_HK \
zh_TW

EXTRA_DIST = CMakeLists.txt
3 changes: 2 additions & 1 deletion accounts/cs/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ account_DATA = \
acctchrt_spouseretire.gnucash-xea

EXTRA_DIST = \
${account_DATA}
${account_DATA} \
CMakeLists.txt
3 changes: 2 additions & 1 deletion accounts/da/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ account_DATA = \
acctchrt_homeown.gnucash-xea

EXTRA_DIST = \
${account_DATA}
${account_DATA} \
CMakeLists.txt
2 changes: 2 additions & 0 deletions accounts/de_AT/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ dist_account_DATA = \
acctchrt_houseown.gnucash-xea \
acctchrt_investment.gnucash-xea \
acctchrt_kids.gnucash-xea

EXTRA_DIST = CMakeLists.txt
3 changes: 2 additions & 1 deletion accounts/de_CH/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ account_DATA = \
acctchrt_chkmu.gnucash-xea

EXTRA_DIST = \
${account_DATA}
${account_DATA} \
CMakeLists.txt
3 changes: 2 additions & 1 deletion accounts/de_DE/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@ account_DATA = \

EXTRA_DIST = \
${account_DATA} \
acctchrt_full.gnucash-xea
acctchrt_full.gnucash-xea \
CMakeLists.txt
3 changes: 2 additions & 1 deletion accounts/el_GR/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ account_DATA = \
acctchrt_brokerage.gnucash-xea

EXTRA_DIST = \
${account_DATA}
${account_DATA} \
CMakeLists.txt
3 changes: 2 additions & 1 deletion accounts/en_GB/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ account_DATA = \

EXTRA_DIST = \
${account_DATA} \
acctchrt_full.gnucash-xea
acctchrt_full.gnucash-xea \
CMakeLists.txt
3 changes: 2 additions & 1 deletion accounts/es_ES/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@ account_DATA = \
acctchrt_spouseretire.gnucash-xea

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

3 changes: 2 additions & 1 deletion accounts/es_MX/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@ account_DATA = \
acctchrt_spouseretire.gnucash-xea

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

3 changes: 2 additions & 1 deletion accounts/fi_FI/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ account_DATA = \
acctchrt_ry.gnucash-xea

EXTRA_DIST = \
${account_DATA}
${account_DATA} \
CMakeLists.txt
3 changes: 2 additions & 1 deletion accounts/fr_CA/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ account_DATA = \
acctchrt_revenus.gnucash-xea

EXTRA_DIST = \
${account_DATA}
${account_DATA} \
CMakeLists.txt
3 changes: 2 additions & 1 deletion accounts/fr_CH/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@ account_DATA = \
acctchrt_spouseretire.gnucash-xea

EXTRA_DIST = \
${account_DATA}
${account_DATA} \
CMakeLists.txt
3 changes: 2 additions & 1 deletion accounts/fr_FR/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@ account_DATA = \
acctchrt_spouseretire.gnucash-xea

EXTRA_DIST = \
${account_DATA}
${account_DATA} \
CMakeLists.txt
3 changes: 2 additions & 1 deletion accounts/hu_HU/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@ account_DATA = \
acctchrt_spouseretire.gnucash-xea

EXTRA_DIST = \
${account_DATA}
${account_DATA} \
CMakeLists.txt
3 changes: 2 additions & 1 deletion accounts/it/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ account_DATA = \


EXTRA_DIST = \
${account_DATA}
${account_DATA} \
CMakeLists.txt
3 changes: 2 additions & 1 deletion accounts/ja/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ account_DATA = \
acctchrt_spouseretire.gnucash-xea

EXTRA_DIST = \
${account_DATA}
${account_DATA} \
CMakeLists.txt
3 changes: 2 additions & 1 deletion accounts/ko/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@ account_DATA = \
acctchrt_spouseretire.gnucash-xea

EXTRA_DIST = \
${account_DATA}
${account_DATA} \
CMakeLists.txt
3 changes: 2 additions & 1 deletion accounts/lt/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ account_DATA = \
acctchrt_business.gnucash-xea

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

3 changes: 2 additions & 1 deletion accounts/lv/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ account_DATA = \

EXTRA_DIST = \
${account_DATA} \
acctchrt_full.gnucash-xea
acctchrt_full.gnucash-xea \
CMakeLists.txt
3 changes: 2 additions & 1 deletion accounts/nb/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ account_DATA = \

EXTRA_DIST = \
${account_DATA} \
acctchrt_full.gnucash-xea
acctchrt_full.gnucash-xea \
CMakeLists.txt
3 changes: 2 additions & 1 deletion accounts/nl/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ account_DATA = \
acctchrt_rgs_1.1.gnucash-xea

EXTRA_DIST = \
${account_DATA}
${account_DATA} \
CMakeLists.txt
3 changes: 2 additions & 1 deletion accounts/pl/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ account_DATA = \

EXTRA_DIST = \
${account_DATA} \
acctchrt_full.gnucash-xea
acctchrt_full.gnucash-xea \
CMakeLists.txt
3 changes: 2 additions & 1 deletion accounts/pt_BR/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ account_DATA = \
acctchrt_spouseretire.gnucash-xea

EXTRA_DIST = \
${account_DATA}
${account_DATA} \
CMakeLists.txt
3 changes: 2 additions & 1 deletion accounts/pt_PT/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ account_DATA = \
acctchrt_spouseretire.gnucash-xea

EXTRA_DIST = \
${account_DATA}
${account_DATA} \
CMakeLists.txt
3 changes: 2 additions & 1 deletion accounts/ru/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ account_DATA = \
acctchrt_renter.gnucash-xea

EXTRA_DIST = \
${account_DATA}
${account_DATA} \
CMakeLists.txt
3 changes: 2 additions & 1 deletion accounts/sk/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ account_DATA = \
acctchrt_spouseretire.gnucash-xea

EXTRA_DIST = \
${account_DATA}
${account_DATA} \
CMakeLists.txt
3 changes: 2 additions & 1 deletion accounts/sv_AX/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ account_DATA = \
acctchrt_rf.gnucash-xea

EXTRA_DIST = \
${account_DATA}
${account_DATA} \
CMakeLists.txt
3 changes: 2 additions & 1 deletion accounts/sv_FI/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ account_DATA = \
acctchrt_rf.gnucash-xea

EXTRA_DIST = \
${account_DATA}
${account_DATA} \
CMakeLists.txt
3 changes: 2 additions & 1 deletion accounts/sv_SE/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ account_DATA = \
acctchrt_common.gnucash-xea
EXTRA_DIST = \
README.bas_2012 \
${account_DATA}
${account_DATA} \
CMakeLists.txt
3 changes: 2 additions & 1 deletion accounts/tr_TR/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ account_DATA = \
acctchrt_TEKDUZ.gnucash-xea

EXTRA_DIST = \
${account_DATA}
${account_DATA} \
CMakeLists.txt
3 changes: 2 additions & 1 deletion accounts/zh_CN/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ account_DATA = \

EXTRA_DIST = \
${account_DATA} \
acctchrt_full.gnucash-xea
acctchrt_full.gnucash-xea \
CMakeLists.txt
3 changes: 2 additions & 1 deletion accounts/zh_HK/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ account_DATA = \
acctchrt_business.gnucash-xea

EXTRA_DIST = \
${account_DATA}
${account_DATA} \
CMakeLists.txt
3 changes: 2 additions & 1 deletion accounts/zh_TW/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ account_DATA = \
acctchrt_business.gnucash-xea

EXTRA_DIST = \
${account_DATA}
${account_DATA} \
CMakeLists.txt
2 changes: 1 addition & 1 deletion checks/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ checks_DATA = \
quicken_check_21.chk \
quicken_3part.chk

EXTRA_DIST = ${checks_DATA}
EXTRA_DIST = ${checks_DATA} CMakeLists.txt
3 changes: 2 additions & 1 deletion doc/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion doc/examples/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@ doc_DATA = \
web.qif

EXTRA_DIST = \
${doc_DATA}
${doc_DATA} \
CMakeLists.txt
2 changes: 1 addition & 1 deletion lib/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ else
SUBDIRS = libc
endif

EXTRA_DIST = README
EXTRA_DIST = README CMakeLists.txt

3 changes: 2 additions & 1 deletion lib/libc/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ EXTRA_libc_missing_la_SOURCES = \
localtime_r.c \
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.
Expand Down
2 changes: 1 addition & 1 deletion lib/stf/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ libgnc_stf_la_LIBADD = $(GOFFICE_LIBS)

AM_CPPFLAGS = $(GOFFICE_CFLAGS)

EXTRA_DIST = $(REALSRCS) $(REALHDRS)
EXTRA_DIST = $(REALSRCS) $(REALHDRS) CMakeLists.txt
3 changes: 2 additions & 1 deletion packaging/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
EXTRA_DIST = \
gnucash.spec.in \
gnucash.spec
gnucash.spec \
CMakeLists.txt

all-local: gnucash.spec

Expand Down
17 changes: 16 additions & 1 deletion src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion src/app-utils/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion src/app-utils/test/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ check_PROGRAMS = \
test-sx

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

AM_CPPFLAGS = \
-I${top_srcdir}/src \
Expand Down
1 change: 1 addition & 0 deletions src/backend/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ if WITH_DBI
endif
SUBDIRS = xml sql ${DBI_DIR}

EXTRA_DIST = CMakeLists.txt
2 changes: 2 additions & 0 deletions src/backend/dbi/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,5 @@ libgncmod_backend_dbi_la_LIBADD = \
${LIBDBI_LIBS}

AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.dbi\"

EXTRA_DIST = CMakeLists.txt
3 changes: 2 additions & 1 deletion src/backend/dbi/test/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ TESTS_ENVIRONMENT = \
EXTRA_DIST += \
test-dbi-stuff.h \
test-dbi-business-stuff.h \
test-dbi.xml
test-dbi.xml \
CMakeLists.txt

TEST_PROGS += \
test-backend-dbi
Expand Down
Loading

0 comments on commit b1f9f80

Please sign in to comment.