From 34a24f14894756b1db7879f9936e179b2a96c757 Mon Sep 17 00:00:00 2001
From: Markus Blatt <mblatt@dune-project.org>
Date: Wed, 13 Feb 2013 15:35:07 +0000
Subject: [PATCH] distribute CMakeLists.txt with autotools tarballs
[[Imported from SVN: r7124]]
---
Makefile.am | 2 +-
am/Makefile.am | 2 +-
bin/Makefile.am | 2 +-
cmake/modules/Makefile.am | 1 +
cmake/scripts/Makefile.am | 1 +
doc/Makefile.am | 2 +-
doc/buildsystem/Makefile.am | 2 +-
doc/comm/Makefile.am | 2 +-
doc/doxygen/Makefile.am | 2 +-
dune/Makefile.am | 2 ++
dune/common/Makefile.am | 2 ++
dune/common/parallel/Makefile.am | 2 ++
dune/common/parallel/test/Makefile.am | 2 ++
dune/common/test/Makefile.am | 2 ++
lib/Makefile.am | 2 +-
m4/Makefile.am | 2 +-
16 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index bb83b9e56..a9357eb93 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
# $Id$
# we need the module file to be able to build via dunecontrol
-EXTRA_DIST=dune.module
+EXTRA_DIST= CMakeLists.txtdune.module
# don't follow the full GNU-standard
# we need automake 1.9 or newer
diff --git a/am/Makefile.am b/am/Makefile.am
index d4df39c4a..4b80086c7 100644
--- a/am/Makefile.am
+++ b/am/Makefile.am
@@ -1,6 +1,6 @@
# $Id$
-EXTRA_DIST = inkscape.am webstuff global-rules sourcescheck \
+EXTRA_DIST = CMakeLists.txt inkscape.am webstuff global-rules sourcescheck \
no-check-without-lib latex checklog doxygen top-rules \
headercheck documentation
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 89779dfd6..d67bf16e1 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,7 +1,7 @@
# $Id$
# put scripts into dist-tarball
-EXTRA_DIST = duneproject dunecontrol \
+EXTRA_DIST = CMakeLists.txt duneproject dunecontrol \
dunedoxynize \
mpi-config dune-autogen \
xfail-compile-tests
diff --git a/cmake/modules/Makefile.am b/cmake/modules/Makefile.am
index 18f9f328a..98f6b190d 100644
--- a/cmake/modules/Makefile.am
+++ b/cmake/modules/Makefile.am
@@ -23,3 +23,4 @@ modulesdir = $(datadir)/cmake/modules
modules_DATA = ${MODULES}
include $(top_srcdir)/am/global-rules
+EXTRA_DIST = CMakeLists.txt
diff --git a/cmake/scripts/Makefile.am b/cmake/scripts/Makefile.am
index a7dd2734d..8cfe9661a 100644
--- a/cmake/scripts/Makefile.am
+++ b/cmake/scripts/Makefile.am
@@ -8,3 +8,4 @@ modulesdir = $(datadir)/cmake/scripts
modules_DATA = ${MODULES}
include $(top_srcdir)/am/global-rules
+EXTRA_DIST = CMakeLists.txt
diff --git a/doc/Makefile.am b/doc/Makefile.am
index caa75253a..494b9fd65 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -15,7 +15,7 @@ docdir=$(datadir)/doc/dune-common
DOCFILES = $(PAGES)
DOCFILES_EXTRA = example.opts
-EXTRA_DIST = $(PAGES) example.opts
+EXTRA_DIST = CMakeLists.txt $(PAGES) example.opts
# include rules for wml -> html transformation
include $(top_srcdir)/am/webstuff
diff --git a/doc/buildsystem/Makefile.am b/doc/buildsystem/Makefile.am
index 1cb4f2d55..1f34a5eea 100644
--- a/doc/buildsystem/Makefile.am
+++ b/doc/buildsystem/Makefile.am
@@ -8,7 +8,7 @@ BASEDIR=../..
docdir=$(datadir)/doc/dune-common/buildsystem
if BUILD_DOCS
DOCFILES=buildsystem.pdf
- EXTRA_DIST=$(DOCFILES)
+ EXTRA_DIST= CMakeLists.txt$(DOCFILES)
EXTRAINSTALL=$(DOCFILES)
endif
diff --git a/doc/comm/Makefile.am b/doc/comm/Makefile.am
index 722b61b35..ce4e9a1b9 100644
--- a/doc/comm/Makefile.am
+++ b/doc/comm/Makefile.am
@@ -11,7 +11,7 @@ TESTS = $(MPIPROGRAMS)
if BUILD_DOCS
DOCFILES = communication.pdf
- EXTRA_DIST = $(DOCFILES)
+ EXTRA_DIST = CMakeLists.txt $(DOCFILES)
EXTRAINSTALL = $(DOCFILES)
endif
diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
index da6c9745d..f91a812bc 100644
--- a/doc/doxygen/Makefile.am
+++ b/doc/doxygen/Makefile.am
@@ -12,7 +12,7 @@ PAGES =
# add some more stuff to install and tarball
DOCFILES = $(PAGES)
-EXTRA_DIST = $(PAGES) Doxystyle
+EXTRA_DIST = CMakeLists.txt $(PAGES) Doxystyle
include $(top_srcdir)/am/doxygen
include $(top_srcdir)/am/global-rules
diff --git a/dune/Makefile.am b/dune/Makefile.am
index d0b3a1009..1a1e52628 100644
--- a/dune/Makefile.am
+++ b/dune/Makefile.am
@@ -3,3 +3,5 @@
SUBDIRS = common
include $(top_srcdir)/am/global-rules
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/dune/common/Makefile.am b/dune/common/Makefile.am
index 76af91d86..8f4f1f4b0 100644
--- a/dune/common/Makefile.am
+++ b/dune/common/Makefile.am
@@ -90,3 +90,5 @@ commoninclude_HEADERS = \
version.hh
include $(top_srcdir)/am/global-rules
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/dune/common/parallel/Makefile.am b/dune/common/parallel/Makefile.am
index 96bec851a..461560291 100644
--- a/dune/common/parallel/Makefile.am
+++ b/dune/common/parallel/Makefile.am
@@ -19,3 +19,5 @@ parallelinclude_HEADERS = \
selection.hh
include $(top_srcdir)/am/global-rules
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/dune/common/parallel/test/Makefile.am b/dune/common/parallel/test/Makefile.am
index f864a8b38..23b658707 100644
--- a/dune/common/parallel/test/Makefile.am
+++ b/dune/common/parallel/test/Makefile.am
@@ -45,3 +45,5 @@ syncertest_LDADD = \
$(LDADD)
include $(top_srcdir)/am/global-rules
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/dune/common/test/Makefile.am b/dune/common/test/Makefile.am
index 2b622e429..91774c818 100644
--- a/dune/common/test/Makefile.am
+++ b/dune/common/test/Makefile.am
@@ -275,3 +275,5 @@ testfloatcmp_SOURCES = testfloatcmp.cc
genericiterator_compile_fail_SOURCES = genericiterator_compile_fail.cc
include $(top_srcdir)/am/global-rules
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0d16e20ff..2f42b259d 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,7 +1,7 @@
# $Id: $
dunemodulelibdir=$(libdir)
-EXTRA_DIST = dunemodules.lib
+EXTRA_DIST = CMakeLists.txt dunemodules.lib
dunemodulelib_DATA = dunemodules.lib
#the dune-common library
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 59cf4dbea..68a0b3f51 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -50,6 +50,6 @@ ALLM4S = \
aclocaldir = $(datadir)/aclocal
aclocal_DATA = $(ALLM4S)
-EXTRA_DIST = $(ALLM4S)
+EXTRA_DIST = CMakeLists.txt $(ALLM4S)
include $(top_srcdir)/am/global-rules
--
GitLab