From 1c48a836502ea30ac223bdc70accbe1d9740fd4a Mon Sep 17 00:00:00 2001
From: Markus Blatt <mblatt@dune-project.org>
Date: Mon, 18 Feb 2013 09:42:54 +0000
Subject: [PATCH] distribute files needed by cmake with autotools-generated
tarballs
[[Imported from SVN: r7128]]
---
Makefile.am | 6 +++++-
cmake/modules/Makefile.am | 2 +-
cmake/pkg/Makefile.am | 1 +
cmake/scripts/Makefile.am | 2 +-
dune/common/test/Makefile.am | 2 +-
5 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index cac571396..3281582d2 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= CMakeLists.txt dune.module
+EXTRA_DIST= CMakeLists.txt dune.module dune-common-config.cmake.in dune-common-version.cmake.in
# don't follow the full GNU-standard
# we need automake 1.9 or newer
@@ -14,3 +14,7 @@ DISTCHECK_CONFIGURE_FLAGS = CXX="$(CXX)" CC="$(CC)" --enable-parallel=@ENABLE_PA
include $(top_srcdir)/am/global-rules
include $(top_srcdir)/am/top-rules
+
+# Distribute and install config.h.cmake
+configdir = $(datadir)/dune-common
+dist_config_DATA = config.h.cmake
diff --git a/cmake/modules/Makefile.am b/cmake/modules/Makefile.am
index 98f6b190d..278aaa895 100644
--- a/cmake/modules/Makefile.am
+++ b/cmake/modules/Makefile.am
@@ -20,7 +20,7 @@ MODULES = DuneBoost.cmake \
UseLATEX.cmake
modulesdir = $(datadir)/cmake/modules
-modules_DATA = ${MODULES}
+dist_modules_DATA = ${MODULES}
include $(top_srcdir)/am/global-rules
EXTRA_DIST = CMakeLists.txt
diff --git a/cmake/pkg/Makefile.am b/cmake/pkg/Makefile.am
index e69de29bb..1d7d2c8a2 100644
--- a/cmake/pkg/Makefile.am
+++ b/cmake/pkg/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = dune-common-config.cmake.in
diff --git a/cmake/scripts/Makefile.am b/cmake/scripts/Makefile.am
index 8cfe9661a..1d2f0c9be 100644
--- a/cmake/scripts/Makefile.am
+++ b/cmake/scripts/Makefile.am
@@ -5,7 +5,7 @@ MODULES = BuildTests.cmake.in \
RunDoxygen.cmake
modulesdir = $(datadir)/cmake/scripts
-modules_DATA = ${MODULES}
+dist_modules_DATA = ${MODULES}
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 91774c818..17d87196d 100644
--- a/dune/common/test/Makefile.am
+++ b/dune/common/test/Makefile.am
@@ -276,4 +276,4 @@ genericiterator_compile_fail_SOURCES = genericiterator_compile_fail.cc
include $(top_srcdir)/am/global-rules
-EXTRA_DIST = CMakeLists.txt
+EXTRA_DIST = CMakeLists.txt dummy.f
--
GitLab