From c4f6db235746949668b05af16cb26c3ff2378669 Mon Sep 17 00:00:00 2001 From: Markus Blatt <mblatt@dune-project.org> Date: Wed, 13 Feb 2013 15:36:15 +0000 Subject: [PATCH] distribute CMakeLists.txt with autotools tarballs [[Imported from SVN: r1787]] --- Makefile.am | 2 +- cmake/modules/Makefile.am | 2 ++ doc/Makefile.am | 2 +- doc/doxygen/Makefile.am | 2 ++ dune/Makefile.am | 2 ++ dune/istl/Makefile.am | 2 ++ dune/istl/paamg/Makefile.am | 2 ++ dune/istl/paamg/test/Makefile.am | 2 ++ dune/istl/test/Makefile.am | 2 ++ dune/istl/tutorial/Makefile.am | 2 ++ m4/Makefile.am | 2 +- 11 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4898650f..0127296f 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/cmake/modules/Makefile.am b/cmake/modules/Makefile.am index 9b57cdfb..35318134 100644 --- a/cmake/modules/Makefile.am +++ b/cmake/modules/Makefile.am @@ -5,3 +5,5 @@ modulesdir= $(datadir)/cmake/modules modules_DATA = ${MODULES} include $(top_srcdir)/am/global-rules + +EXTRA_DIST = CMakeLists.txt diff --git a/doc/Makefile.am b/doc/Makefile.am index 79f89c17..07dc256b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -6,7 +6,7 @@ TEXSOURCES = istl.tex istl.bib EPSFILES = blockstructure.eps if BUILD_DOCS DOCFILES = istl.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 91e8b3c8..153d2bff 100644 --- a/doc/doxygen/Makefile.am +++ b/doc/doxygen/Makefile.am @@ -6,3 +6,5 @@ CURDIR=doc/doxygen include $(top_srcdir)/am/doxygen include $(top_srcdir)/am/global-rules + +EXTRA_DIST = CMakeLists.txt diff --git a/dune/Makefile.am b/dune/Makefile.am index ff5e1718..6a519847 100644 --- a/dune/Makefile.am +++ b/dune/Makefile.am @@ -3,3 +3,5 @@ SUBDIRS = istl include $(top_srcdir)/am/global-rules + +EXTRA_DIST = CMakeLists.txt diff --git a/dune/istl/Makefile.am b/dune/istl/Makefile.am index 827a7fbf..8c2474f8 100644 --- a/dune/istl/Makefile.am +++ b/dune/istl/Makefile.am @@ -41,3 +41,5 @@ istl_HEADERS = basearray.hh \ include $(top_srcdir)/am/global-rules + +EXTRA_DIST = CMakeLists.txt diff --git a/dune/istl/paamg/Makefile.am b/dune/istl/paamg/Makefile.am index dc08c43c..7e3592bd 100644 --- a/dune/istl/paamg/Makefile.am +++ b/dune/istl/paamg/Makefile.am @@ -8,3 +8,5 @@ paamg_HEADERS = aggregates.hh dependency.hh galerkin.hh graph.hh \ graphcreator.hh parameters.hh renumberer.hh pinfo.hh include $(top_srcdir)/am/global-rules + +EXTRA_DIST = CMakeLists.txt diff --git a/dune/istl/paamg/test/Makefile.am b/dune/istl/paamg/test/Makefile.am index 1aa54d91..0e3f009e 100644 --- a/dune/istl/paamg/test/Makefile.am +++ b/dune/istl/paamg/test/Makefile.am @@ -88,3 +88,5 @@ pamg_comm_repart_test_LDADD = \ include $(top_srcdir)/am/global-rules + +EXTRA_DIST = CMakeLists.txt diff --git a/dune/istl/test/Makefile.am b/dune/istl/test/Makefile.am index bad932b3..f6d05b07 100644 --- a/dune/istl/test/Makefile.am +++ b/dune/istl/test/Makefile.am @@ -140,3 +140,5 @@ if MPI $(LDADD) endif include $(top_srcdir)/am/global-rules + +EXTRA_DIST = CMakeLists.txt diff --git a/dune/istl/tutorial/Makefile.am b/dune/istl/tutorial/Makefile.am index f9e3b195..aad2b566 100644 --- a/dune/istl/tutorial/Makefile.am +++ b/dune/istl/tutorial/Makefile.am @@ -7,3 +7,5 @@ example_SOURCES = example.cc example_CPPFLAGS = $(AM_CPPFLAGS) $(BOOST_CPPFLAGS) $(DUNE_CPPFLAGS) include $(top_srcdir)/am/global-rules + +EXTRA_DIST = CMakeLists.txt diff --git a/m4/Makefile.am b/m4/Makefile.am index 98540837..cf8d324a 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -9,6 +9,6 @@ ALLM4S = \ aclocaldir = $(datadir)/aclocal aclocal_DATA = $(ALLM4S) -EXTRA_DIST = $(ALLM4S) +EXTRA_DIST = CMakeLists.txt $(ALLM4S) include $(top_srcdir)/am/global-rules -- GitLab