From a028a2d76e44ad27e96d50141a1e89ac6e39c321 Mon Sep 17 00:00:00 2001 From: Felix Albrecht <felix.albrecht@uni-muenster.de> Date: Mon, 19 Sep 2011 18:45:03 +0200 Subject: [PATCH] added missing Makefiles and fixed existing ones --- configure.ac | 1 + .../evaluation/local/binary/Makefile.am | 2 +- examples/Makefile.am | 2 +- .../Makefile.am | 35 +++++++++++++++++++ 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 examples/elliptic_discontinuous_galerkin/Makefile.am diff --git a/configure.ac b/configure.ac index 131c10ff7..b472902cf 100644 --- a/configure.ac +++ b/configure.ac @@ -56,6 +56,7 @@ AC_CONFIG_FILES([ dune/detailed-discretizations/mapper/continuous/Makefile examples/Makefile examples/elliptic_finite_element/Makefile + examples/elliptic_discontinuous_galerkin/Makefile m4/Makefile dune-detailed-discretizations.pc ]) diff --git a/dune/detailed-discretizations/evaluation/local/binary/Makefile.am b/dune/detailed-discretizations/evaluation/local/binary/Makefile.am index acdbff6c0..95569c7aa 100644 --- a/dune/detailed-discretizations/evaluation/local/binary/Makefile.am +++ b/dune/detailed-discretizations/evaluation/local/binary/Makefile.am @@ -1,4 +1,4 @@ evaluation_local_binary_includedir = $(includedir)/dune/detailed-discretizations/evaluation/local/binary -evaluation_local_binary_include_HEADERS = elliptic.hh ipdgfluxes.hh +evaluation_local_binary_include_HEADERS = elliptic.hh include $(top_srcdir)/am/global-rules diff --git a/examples/Makefile.am b/examples/Makefile.am index b607a672d..a034288d6 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,6 +1,6 @@ # $Id$ -SUBDIRS = elliptic_finite_element +SUBDIRS = elliptic_finite_element elliptic_discontinuous_galerkin if BUILD_DOCS # TODO: set up documentation tree automatically diff --git a/examples/elliptic_discontinuous_galerkin/Makefile.am b/examples/elliptic_discontinuous_galerkin/Makefile.am new file mode 100644 index 000000000..f7d0c1879 --- /dev/null +++ b/examples/elliptic_discontinuous_galerkin/Makefile.am @@ -0,0 +1,35 @@ +GRIDDIM=2 +GRIDTYPE=YASPGRID +POLORDER=1 + +noinst_PROGRAMS = elliptic_discontinuous_galerkin + +elliptic_discontinuous_galerkin_SOURCES = main.cc + +elliptic_discontinuous_galerkin_CPPFLAGS = $(AM_CPPFLAGS) \ + $(DUNEMPICPPFLAGS) \ + $(UG_CPPFLAGS) \ + $(AMIRAMESH_CPPFLAGS) \ + $(ALBERTA_CPPFLAGS) \ + $(ALUGRID_CPPFLAGS) -DGRIDDIM=$(GRIDDIM) -D$(GRIDTYPE) -DPOLORDER=$(POLORDER) -Wall -O0 -DDEBUG -funroll-loops -g -ggdb -fno-strict-aliasing -std=c++0x +# 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. +elliptic_discontinuous_galerkin_LDADD = \ + $(DUNE_LDFLAGS) $(DUNE_LIBS) \ + $(ALUGRID_LDFLAGS) $(ALUGRID_LIBS) \ + $(ALBERTA_LDFLAGS) $(ALBERTA_LIBS) \ + $(AMIRAMESH_LDFLAGS) $(AMIRAMESH_LIBS) \ + $(UG_LDFLAGS) $(UG_LIBS) \ + $(DUNEMPILIBS) \ + $(LDADD) +elliptic_discontinuous_galerkin_LDFLAGS = $(AM_LDFLAGS) \ + $(DUNEMPILDFLAGS) \ + $(UG_LDFLAGS) \ + $(AMIRAMESH_LDFLAGS) \ + $(ALBERTA_LDFLAGS) \ + $(ALUGRID_LDFLAGS) \ + $(DUNE_LDFLAGS) + +include $(top_srcdir)/am/global-rules -- GitLab