From f1d65fc30498b8a40fea094b9d0d4aefe05cef9d Mon Sep 17 00:00:00 2001
From: Jonathan Youett <youett@math.fu-berlin.de>
Date: Fri, 11 Nov 2016 10:52:20 +0100
Subject: [PATCH] Remove autotools related files, autotools are not supported
anymore
---
CMakeLists.txt | 1 -
Makefile.am | 26 ------------------
cmake/Makefile.am | 3 ---
cmake/modules/Makefile.am | 6 -----
configure.ac | 33 -----------------------
doc/Makefile.am | 14 ----------
doc/doxygen/Makefile.am | 9 -------
dune/Makefile.am | 5 ----
dune/matrix-vector/Makefile.am | 6 -----
dune/matrix-vector/matrix-vector.hh | 6 -----
m4/CMakeLists.txt | 3 ---
m4/Makefile.am | 8 ------
m4/dune-matrix-vector.m4 | 17 ------------
src/Makefile.am | 41 -----------------------------
stamp-regenerate-config-h | 0
stamp-vc | 1 -
16 files changed, 179 deletions(-)
delete mode 100644 Makefile.am
delete mode 100644 cmake/Makefile.am
delete mode 100644 cmake/modules/Makefile.am
delete mode 100644 configure.ac
delete mode 100644 doc/Makefile.am
delete mode 100644 doc/doxygen/Makefile.am
delete mode 100644 dune/Makefile.am
delete mode 100644 dune/matrix-vector/Makefile.am
delete mode 100644 dune/matrix-vector/matrix-vector.hh
delete mode 100644 m4/CMakeLists.txt
delete mode 100644 m4/Makefile.am
delete mode 100644 m4/dune-matrix-vector.m4
delete mode 100644 src/Makefile.am
delete mode 100644 stamp-regenerate-config-h
delete mode 100644 stamp-vc
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d3b21c..6eeba4b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,6 @@ include(DuneMacros)
dune_project()
add_subdirectory("src")
-add_subdirectory("m4")
add_subdirectory("dune")
add_subdirectory("doc")
add_subdirectory("cmake/modules")
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index ad66661..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-# we need the module file to be able to build via dunecontrol
-EXTRA_DIST = dune.module \
- CMakeLists.txt \
- config.h.cmake
-
-SUBDIRS = src m4 dune doc cmake
-
-if BUILD_DOCS
-# TODO: set up documentation tree automatically
-#SUBDIRS += doc
-endif
-
-# don't follow the full GNU-standard
-# we need automake 1.9 or newer
-AUTOMAKE_OPTIONS = foreign 1.9
-
-# pass most important options when "make distcheck" is used
-DISTCHECK_CONFIGURE_FLAGS = --with-dune-common=$(DUNE_COMMON_ROOT) --with-dune-geometry=$(DUNE_GEOMETRY_ROOT) --with-dune-localfunctions=$(DUNE_LOCALFUNCTIONS_ROOT) --with-dune-grid=$(DUNE_GRID_ROOT) --with-dune-istl=$(DUNE_ISTL_ROOT) CXX="$(CXX)" CC="$(CC)"
-
-include $(top_srcdir)/am/top-rules
-include $(top_srcdir)/am/global-rules
-
-# Generate package configuration files for finding
-# installed modules with CMake
-include $(top_srcdir)/am/cmake-pkg-config
-
diff --git a/cmake/Makefile.am b/cmake/Makefile.am
deleted file mode 100644
index 26735eb..0000000
--- a/cmake/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = modules
-
-include $(top_srcdir)/am/global-rules
diff --git a/cmake/modules/Makefile.am b/cmake/modules/Makefile.am
deleted file mode 100644
index 8d3bacc..0000000
--- a/cmake/modules/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-MODULES = DuneMatrixVectorMacros.cmake
-modulesdir = $(datadir)/dune/cmake/modules
-dist_modules_DATA = ${MODULES}
-
-include $(top_srcdir)/am/global-rules
-EXTRA_DIST = CMakeLists.txt
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index ce119d4..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-AC_PREREQ([2.62])
-DUNE_AC_INIT # gets module version from dune.module file
-AC_CONFIG_SRCDIR([src/dune_matrix_vector.cc])
-AC_CONFIG_HEADERS([config.h])
-
-# we need no more than the standard DE-stuff
-# this module depends on dune-common dune-geometry dune-localfunctions dune-grid dune-istl
-# this implies checking for [dune-common], [dune-geometry], [dune-localfunctions], [dune-grid], [dune-istl]
-DUNE_CHECK_ALL
-
-# implicitly set the Dune-flags everywhere
-AC_SUBST(AM_CPPFLAGS, $DUNE_CPPFLAGS)
-AC_SUBST(AM_LDFLAGS, $DUNE_LDFLAGS)
-LIBS="$DUNE_LIBS"
-
-AC_CONFIG_FILES([
- Makefile
- src/Makefile
- cmake/Makefile
- cmake/modules/Makefile
- doc/Makefile
- doc/doxygen/Makefile
- doc/doxygen/Doxyfile
- dune/Makefile
- dune/matrix-vector/Makefile
- m4/Makefile
- dune-matrix-vector.pc
-])
-AC_OUTPUT
-# finally print the summary information
-DUNE_SUMMARY_ALL
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index b1ea719..0000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-
-SUBDIRS = doxygen
-CURDIR = doc
-BASEDIR = ..
-
-# add list of html files to generate from wml
-PAGES=
-
-docdir=$(datadir)/doc/dune-matrix-vector
-
-EXTRA_DIST = CMakeLists.txt
-
-include $(top_srcdir)/am/webstuff
-include $(top_srcdir)/am/global-rules
diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
deleted file mode 100644
index a4917f4..0000000
--- a/doc/doxygen/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-
-BASEDIR=../..
-CURDIR=doc/doxygen
-
-EXTRA_DIST = CMakeLists.txt
-
-include $(top_srcdir)/am/doxygen
-include $(top_srcdir)/am/global-rules
-
diff --git a/dune/Makefile.am b/dune/Makefile.am
deleted file mode 100644
index 3b353c0..0000000
--- a/dune/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIRS = matrix-vector
-
-EXTRA_DIST = CMakeLists.txt
-
-include $(top_srcdir)/am/global-rules
diff --git a/dune/matrix-vector/Makefile.am b/dune/matrix-vector/Makefile.am
deleted file mode 100644
index cc67fae..0000000
--- a/dune/matrix-vector/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-matrix_vectorincludedir = $(includedir)/dune/matrix-vector
-matrix_vectorinclude_HEADERS = matrix-vector.hh
-
-EXTRA_DIST = CMakeLists.txt
-
-include $(top_srcdir)/am/global-rules
diff --git a/dune/matrix-vector/matrix-vector.hh b/dune/matrix-vector/matrix-vector.hh
deleted file mode 100644
index bdc9609..0000000
--- a/dune/matrix-vector/matrix-vector.hh
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef DUNE_MATRIX_VECTOR.hh
-#define DUNE_MATRIX_VECTOR.hh
-
-// add your classes here
-
-#endif // DUNE_MATRIX_VECTOR.hh
diff --git a/m4/CMakeLists.txt b/m4/CMakeLists.txt
deleted file mode 100644
index c92e1f2..0000000
--- a/m4/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-
-install(PROGRAMS dune-matrix-vector.m4 DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dune/aclocal)
-
diff --git a/m4/Makefile.am b/m4/Makefile.am
deleted file mode 100644
index b0eb773..0000000
--- a/m4/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-M4FILES = dune-matrix-vector.m4
-
-aclocaldir = $(datadir)/dune/aclocal
-aclocal_DATA = $(M4FILES)
-
-EXTRA_DIST = $(M4FILES) CMakeLists.txt
-
-include $(top_srcdir)/am/global-rules
diff --git a/m4/dune-matrix-vector.m4 b/m4/dune-matrix-vector.m4
deleted file mode 100644
index 8646bfc..0000000
--- a/m4/dune-matrix-vector.m4
+++ /dev/null
@@ -1,17 +0,0 @@
-dnl -*- autoconf -*-
-# Macros needed to find dune-matrix-vector and dependent libraries. They are called by
-# the macros in ${top_src_dir}/dependencies.m4, which is generated by
-# "dunecontrol autogen"
-
-# Additional checks needed to build dune-matrix-vector
-# This macro should be invoked by every module which depends on dune-matrix-vector, as
-# well as by dune-matrix-vector itself
-AC_DEFUN([DUNE_MATRIX_VECTOR_CHECKS])
-
-# Additional checks needed to find dune-matrix-vector
-# This macro should be invoked by every module which depends on dune-matrix-vector, but
-# not by dune-matrix-vector itself
-AC_DEFUN([DUNE_MATRIX_VECTOR_CHECK_MODULE],
-[
- DUNE_CHECK_MODULES([dune-matrix-vector],[matrix-vector/matrix-vector.hh])
-])
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 6677a6d..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-
-SUBDIRS =
-
-noinst_PROGRAMS = dune_matrix_vector
-
-dune_matrix_vector_SOURCES = dune_matrix_vector.cc
-
-dune_matrix_vector_CPPFLAGS = $(AM_CPPFLAGS) \
- $(DUNEMPICPPFLAGS) \
- $(UG_CPPFLAGS) \
- $(ALBERTA_CPPFLAGS) \
- $(ALUGRID_CPPFLAGS)
-# The libraries have to be given in reverse order (most basic libraries
-# last). Also, due to some misunderstanding, a lot of libraries include the
-# -L option in LDFLAGS instead of LIBS -- so we have to include the LDFLAGS
-# here as well.
-dune_matrix_vector_LDADD = \
- $(DUNE_LDFLAGS) $(DUNE_LIBS) \
- $(ALUGRID_LDFLAGS) $(ALUGRID_LIBS) \
- $(ALBERTA_LDFLAGS) $(ALBERTA_LIBS) \
- $(UG_LDFLAGS) $(UG_LIBS) \
- $(DUNEMPILIBS) \
- $(LDADD)
-dune_matrix_vector_LDFLAGS = $(AM_LDFLAGS) \
- $(DUNEMPILDFLAGS) \
- $(UG_LDFLAGS) \
- $(ALBERTA_LDFLAGS) \
- $(ALUGRID_LDFLAGS) \
- $(DUNE_LDFLAGS)
-
-# don't follow the full GNU-standard
-# we need automake 1.9
-AUTOMAKE_OPTIONS = foreign 1.9
-
-# pass most important options when "make distcheck" is used
-DISTCHECK_CONFIGURE_FLAGS = --with-dune-common=$(DUNE_COMMON_ROOT) --with-dune-geometry=$(DUNE_GEOMETRY_ROOT) --with-dune-localfunctions=$(DUNE_LOCALFUNCTIONS_ROOT) --with-dune-grid=$(DUNE_GRID_ROOT) --with-dune-istl=$(DUNE_ISTL_ROOT) CXX="$(CXX)" CC="$(CC)"
-
-EXTRA_DIST = CMakeLists.txt
-
-include $(top_srcdir)/am/global-rules
-
diff --git a/stamp-regenerate-config-h b/stamp-regenerate-config-h
deleted file mode 100644
index e69de29..0000000
diff --git a/stamp-vc b/stamp-vc
deleted file mode 100644
index ea2c89e..0000000
--- a/stamp-vc
+++ /dev/null
@@ -1 +0,0 @@
-A stamp file to signify that this directory comes from a version control system, not an unpacked tarball
--
GitLab