Skip to content
Snippets Groups Projects
Commit f95f6a5f authored by Elias Pipping's avatar Elias Pipping Committed by Elias Pipping
Browse files

Clean up the build system

parent 4cb2a7b3
Branches
No related tags found
No related merge requests found
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
/configure /configure
/depcomp /depcomp
/dependencies.m4 /dependencies.m4
/doc/doxygen/Doxyfile.in
/install-sh /install-sh
/ltmain.sh /ltmain.sh
/missing /missing
......
# $Id$ EXTRA_DIST = dune.module
# we need the module file to be able to build via dunecontrol SUBDIRS = src m4 dune
EXTRA_DIST=dune.module
SUBDIRS = src m4 dune doc
if BUILD_DOCS
#SUBDIRS += doc
endif
# pass most important options when "make distcheck" is used
DISTCHECK_CONFIGURE_FLAGS = --with-dune-common=$(DUNE_COMMON_ROOT) --with-dune-fufem=$(DUNE_FUFEM_ROOT) --with-dune-tnnmg=$(DUNE_TNNMG_ROOT) CXX="$(CXX)" CC="$(CC)"
include $(top_srcdir)/am/top-rules include $(top_srcdir)/am/top-rules
include $(top_srcdir)/am/global-rules include $(top_srcdir)/am/global-rules
......
...@@ -7,24 +7,12 @@ AM_SILENT_RULES ...@@ -7,24 +7,12 @@ AM_SILENT_RULES
AC_CONFIG_SRCDIR([src/one-body-sample.cc]) AC_CONFIG_SRCDIR([src/one-body-sample.cc])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
# we need no more than the standard DE-stuff
# this module depends on dune-common dune-fufem dune-tnnmg
# this implies checking for [dune-common], [dune-grid], [dune-istl], [dune-localfunctions], [dune-fufem], [dune-solvers], [dune-tnnmg]
DUNE_CHECK_ALL 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([ AC_CONFIG_FILES([
Makefile Makefile
src/Makefile src/Makefile
src/tests/Makefile src/tests/Makefile
doc/Makefile
doc/doxygen/Makefile
doc/doxygen/Doxyfile
dune/Makefile dune/Makefile
dune/tectonic/Makefile dune/tectonic/Makefile
m4/Makefile m4/Makefile
......
SUBDIRS = doxygen
CURDIR = doc
BASEDIR = ..
# add list of html files to generate from wml
PAGES=
docdir=$(datadir)/doc/dune-tectonic
include $(top_srcdir)/am/webstuff
include $(top_srcdir)/am/global-rules
# This file contains local changes to the doxygen configuration
# please us '+=' to add file/directories to the lists
# The INPUT tag can be used to specify the files and/or directories that contain
# documented source files. You may enter file names like "myfile.cpp" or
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
INPUT += @top_srcdir@/dune/
# see e.g. dune-grid for the examples of mainpage and modules
# INPUT += @srcdir@/mainpage # @srcdir@/modules
# The EXCLUDE tag can be used to specify files and/or directories that should
# excluded from the INPUT source files. This way you can easily exclude a
# subdirectory from a directory tree whose root is specified with the INPUT tag.
# EXCLUDE += @top_srcdir@/dune/tectonic/test
# The EXAMPLE_PATH tag can be used to specify one or more files or
# directories that contain example code fragments that are included (see
# the \include command).
# EXAMPLE_PATH += @top_srcdir@/src
# The IMAGE_PATH tag can be used to specify one or more files or
# directories that contain image that are included in the documentation (see
# the \image command).
# IMAGE_PATH += @top_srcdir@/dune/tectonic/pics
BASEDIR=../..
CURDIR=doc/doxygen
include $(top_srcdir)/am/doxygen
include $(top_srcdir)/am/global-rules
...@@ -37,8 +37,30 @@ test_minimise2_SOURCES = test-minimise2.cc ...@@ -37,8 +37,30 @@ test_minimise2_SOURCES = test-minimise2.cc
TESTS = $(check_PROGRAMS) TESTS = $(check_PROGRAMS)
AM_CXXFLAGS = \
-Wall \
-Wextra \
-Wno-c++11-compat \
-Wno-c++11-extensions \
-Wno-deprecated-declarations \
-Wno-mismatched-tags \
-Wno-missing-declarations \
-Wno-overloaded-virtual \
-Wno-reorder \
-Wno-sign-compare \
-Wno-tautological-compare \
-Wno-type-limits \
-Wno-unused-parameter \
-Wno-unused-variable
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DDUNE_FMatrix_WITH_CHECKING \
$(DUNE_CPPFLAGS) \ $(DUNE_CPPFLAGS) \
$(PYTHON_CPPFLAGS) \
$(ALUGRID_CPPFLAGS) \
-I$(top_srcdir) -I$(top_srcdir)
# The libraries have to be given in reverse order (most basic libraries
# last).
LDADD = \
$(DUNE_LDFLAGS) $(DUNE_LIBS)
AM_LDFLAGS = \
$(DUNE_LDFLAGS)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment