Commit b0026a35 authored by Steffen Müthing's avatar Steffen Müthing

[Cleanup] Remove support for autotools

As autotools support has disappeared from the core modules, there is no
point in dragging around this dead code anymore.
parent 8f04a97e
......@@ -15,6 +15,8 @@ TypeTree 3.0
- TypeTree has updated its minimum compiler requirements. You now need a compiler that is at
least compatible with GCC 4.9 in C++14 mode.
- Removed support for autotools.
TypeTree 2.4
------------
......
......@@ -24,7 +24,6 @@ dune_project()
add_subdirectory(cmake/modules)
add_subdirectory(doc)
add_subdirectory(dune)
add_subdirectory(m4)
add_subdirectory(test)
# finalize the dune project, e.g. generating config.h etc.
......
# we need the module file to be able to build via dunecontrol
EXTRA_DIST = CMakeLists.txt \
dune.module \
GPL-2 \
GPL-3 \
LGPL-3 \
RELEASE_NOTES
# don't follow the full GNU-standard
# we need automake 1.5
AUTOMAKE_OPTIONS = foreign 1.5
# All subdirectories that must (or can) be handled before the library is built
SUBDIRS = \
cmake \
doc \
dune \
m4
# All subdirectories that must (or can) be handled after the library is built
# none yet...
SUBDIRS += test
# pass most important options when "make distcheck" is used
DISTCHECK_CONFIGURE_FLAGS = --with-dune=$(DUNEROOT) CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" CC="$(CC)"
include $(top_srcdir)/am/top-rules
include $(top_srcdir)/am/global-rules
# Distribute and install config.h.cmake
configdir = $(datadir)/dune-typetree
dist_config_DATA = config.h.cmake
# Generate package configuration files for finding
# installed modules with CMake
include $(top_srcdir)/am/cmake-pkg-config
SUBDIRS = modules
include $(top_srcdir)/am/global-rules
MODULES = \
DuneTypetreeMacros.cmake \
FindCXXDecltype.cmake \
FindCXXTemplateAliases.cmake \
FindGCCTypeof.cmake
modulesdir = $(datadir)/dune/cmake/modules
dist_modules_DATA = ${MODULES}
include $(top_srcdir)/am/global-rules
EXTRA_DIST = CMakeLists.txt
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.50)
DUNE_AC_INIT # gets module version from dune.module file
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([dune/typetree/nodetags.hh])
AC_CONFIG_HEADERS([config.h])
# add configure flags needed to create log files for dune-autobuild
DUNE_AUTOBUILD_FLAGS
#
# we need no more than the standard DE-stuff
# this module depends on dune-common
# this implies checking for [dune-common]
DUNE_CHECK_ALL
# implicitly set the Dune-flags everywhere
AC_SUBST(AM_CPPFLAGS, '$(DUNE_CPPFLAGS) -I$(top_srcdir)')
AC_SUBST(AM_LDFLAGS, $DUNE_LDFLAGS)
AC_CONFIG_FILES([
cmake/Makefile
cmake/modules/Makefile
doc/doxygen/Doxyfile
doc/doxygen/Makefile
doc/Makefile
dune-typetree.pc
dune/Makefile
dune/typetree/Makefile
test/Makefile
m4/Makefile
Makefile
])
AC_OUTPUT
# finally print the summary information
DUNE_SUMMARY_ALL
SUBDIRS = doxygen
# setting like in dune-web
BASEDIR=..
CURDIR=doc
if ! BUILD_DOCS
# add tag to notify that dist has been build without documentation
dist-hook:
echo "# No documentation included in distribution! " > $(distdir)/$(DOCUMENTATION_TAG_FILE)
endif
include $(top_srcdir)/am/webstuff
include $(top_srcdir)/am/global-rules
EXTRA_DIST = CMakeLists.txt
# setting like in dune-web
BASEDIR=../..
CURDIR=doc/doxygen
WHAT=
doxygen_DATA = $(WHAT)
#we need this in the distribution
EXTRA_DIST = CMakeLists.txt $(WHAT) $(DOXYGENDISTFILES)
all: $(WHAT) $(DOXYGENFILES)
include $(top_srcdir)/am/doxygen
include $(top_srcdir)/am/global-rules
# file to clean only in svn and not in tarball tree
SVNCLEANFILES = html $(WHAT) $(DOXYGENHEADER)
clean-local:
if test "x$(VPATH)" != "x" && test ! -e $(srcdir)/doxygen-tag; then \
if test -e $(top_srcdir)/doc/doxygen/Doxydep; then \
rm -rf $(SVNCLEANFILES); \
fi; \
fi
dunedir = $(includedir)/dune
SUBDIRS = typetree
include $(top_srcdir)/am/global-rules
EXTRA_DIST = CMakeLists.txt
typetreedir = $(includedir)/dune/typetree
typetree_HEADERS = \
accumulate_static.hh \
applytochildrensingletree.hh \
applytochildrentreepair.hh \
childextraction.hh \
compositenode.hh \
exceptions.hh \
filteredcompositenode.hh \
filters.hh \
fixedcapacitystack.hh \
generictransformationdescriptors.hh \
leafnode.hh \
nodeinterface.hh \
nodetags.hh \
pairtraversal.hh \
powercompositenodetransformationtemplates.hh \
powernode.hh \
proxynode.hh \
simpletransformationdescriptors.hh \
transformation.hh \
transformationutilities.hh \
traversal.hh \
traversalutilities.hh \
treepath.hh \
typetraits.hh \
typetree.hh \
utility.hh \
visitor.hh
include $(top_srcdir)/am/global-rules
EXTRA_DIST = CMakeLists.txt
install(PROGRAMS
cxx11_decltype.m4
cxx11_template_aliases.m4
dune-typetree.m4
gcc___typeof__.m4
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dune/aclocal/)
M4FILES = \
cxx11_template_aliases.m4 \
cxx11_decltype.m4 \
dune-typetree.m4 \
gcc___typeof__.m4
aclocaldir = $(datadir)/dune/aclocal
aclocal_DATA = $(M4FILES)
EXTRA_DIST = CMakeLists.txt $(M4FILES)
include $(top_srcdir)/am/global-rules
# tests for C++11 decltype support
# the associated macro is called HAVE_STD_DECLTYPE
AC_DEFUN([CXX11_DECLTYPE_CHECK],[
AC_CACHE_CHECK([whether the keyword decltype is supported], dune_cv_cxx11_decltype_support, [
AC_REQUIRE([AC_PROG_CXX])
AC_LANG_PUSH([C++])
AC_RUN_IFELSE([
AC_LANG_PROGRAM([
template<typename A, typename B>
struct check_equal;
template<typename A>
struct check_equal<A,A>
{
static const int result = 0;
};
struct A;
const A& foo();
],
[
return check_equal<decltype(foo()),const A&>::result;
])],
dune_cv_cxx11_decltype_support=yes,
dune_cv_cxx11_decltype_support=no)
AC_LANG_POP
])
if test "x$dune_cv_cxx11_decltype_support" = xyes; then
AC_DEFINE(HAVE_STD_DECLTYPE, 1, [Define to 1 if the C++11 keyword decltype is supported])
fi
])
# tests for C++11 template alias support
# the associated macro is called HAVE_TEMPLATE_ALIASES
AC_DEFUN([TEMPLATE_ALIASES_CHECK],[
AC_CACHE_CHECK([whether template aliases are supported], dune_cv_template_aliases_support, [
AC_REQUIRE([AC_PROG_CXX])
AC_LANG_PUSH([C++])
AC_RUN_IFELSE([
AC_LANG_PROGRAM([
template<typename T, typename U>
struct A
{};
template<typename T>
using A1 = A<T,int>;
template<typename U>
using A2 = A<int,U>;
template<typename T, typename U>
struct assert_equal;
template<typename T>
struct assert_equal<T,T>
{};
],
[
assert_equal<A1<int>,A2<int> >();
assert_equal<A<bool,int>,A1<bool> >();
return 0;
])],
dune_cv_template_aliases_support=yes,
dune_cv_template_aliases_support=no)
AC_LANG_POP
])
if test "x$dune_cv_template_aliases_support" = xyes; then
AC_DEFINE(HAVE_TEMPLATE_ALIASES, 1, [Define to 1 if template aliases are supported])
fi
])
# Additional checks needed to build the module
AC_DEFUN([DUNE_TYPETREE_CHECKS],
[
AC_REQUIRE([TEMPLATE_ALIASES_CHECK])
AC_REQUIRE([CXX11_DECLTYPE_CHECK])
AC_REQUIRE([GCC___TYPEOF___CHECK])
])
# Additional checks needed to find the module
AC_DEFUN([DUNE_TYPETREE_CHECK_MODULE],[
AC_MSG_NOTICE([Searching for dune-typetree...])
DUNE_CHECK_MODULES([dune-typetree], [typetree/utility.hh])
])
# tests for the __typeof__ keyword that provides decltype-like functionality
# for older versions of GCC
# the associated macro is called HAVE_GCC___TYPEOF__
AC_DEFUN([GCC___TYPEOF___CHECK],[
AC_CACHE_CHECK([whether the GCC extension __typeof__ is supported as a decltype fallback], dune_cv_gcc___typeof___support, [
AC_REQUIRE([AC_PROG_CXX])
AC_LANG_PUSH([C++])
AC_RUN_IFELSE([
AC_LANG_PROGRAM([
template<typename A, typename B>
struct check_equal;
template<typename A>
struct check_equal<A,A>
{
static const int result = 0;
};
struct A {};
A foo();
],
[
return check_equal<__typeof__(foo()),A>::result;
])],
dune_cv_gcc___typeof___support=yes,
dune_cv_gcc___typeof___support=no)
AC_LANG_POP
])
if test "x$dune_cv_gcc___typeof___support" = xyes; then
AC_DEFINE(HAVE_GCC___TYPEOF__, 1, [Define to 1 if the GCC extension __typeof__ (decltype fallback) is supported])
fi
])
#defined empty so we can add to it later
NORMALTESTS =
MOSTLYCLEANFILES =
check_SCRIPTS =
# AM_CPPFLAGS = @AM_CPPFLAGS@ \
# $(UG_CPPFLAGS) \
# $(ALUGRID_CPPFLAGS) \
# $(AMIRAMESH_CPPFLAGS) \
# $(DUNE_CPPFLAGS) \
# $(DUNEMPICPPFLAGS) \
# $(PARMETIS_CPPFLAGS)
# AM_LDFLAGS = @AM_LDFLAGS@ \
# $(UG_LDFLAGS) \
# $(ALUGRID_LDFLAGS) \
# $(AMIRAMESH_LDFLAGS) \
# $(DUNE_LDFLAGS) \
# $(DUNEMPILDFLAGS) \
# $(PARMETIS_LDFLAGS)
# LDADD = \
# $(PARMETIS_LIBS) \
# $(ALUGRID_LIBS) \
# $(AMIRAMESH_LIBS) \
# $(DUNE_LIBS) \
# $(DUNEMPILIBS) \
# $(UG_LIBS) \
# @LDADD@
#
noinst_HEADERS = \
typetreetargetnodes.hh \
typetreetestswitch.hh \
typetreetestutility.hh
headercheck_IGNORE = \
typetreetargetnodes.hh \
typetreetestswitch.hh \
typetreetestutility.hh
# scripts are not distributed automatically
# but since this is need for make all:
EXTRA_DIST = CMakeLists.txt
NORMALTESTS += testtypetree
testtypetree_SOURCES = testtypetree.cc
testtypetree_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_TYPETREE
NORMALTESTS += testtypetreetransformation
testtypetreetransformation_SOURCES = testtypetreetransformation.cc
testtypetreetransformation_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_TYPETREE
NORMALTESTS += testfilteredcompositenode
testfilteredcompositenode_SOURCES = testfilteredcompositenode.cc
testfilteredcompositenode_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_TYPETREE
NORMALTESTS += testproxynode
testproxynode_SOURCES = testproxynode.cc
testproxynode_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_TYPETREE
# list of tests to run
TESTS = $(NORMALTESTS)
# programs just to build when "make check" is used
check_PROGRAMS = $(NORMALTESTS)
include $(top_srcdir)/am/global-rules
DISTCHECK_CONFIGURE_FLAGS = --with-dune=$(DUNEROOT) CXX="$(CXX)" CC="$(CC)"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment