From 819f345a23ccf635dcf2ee9af76a7ee528f94336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A5rd=20Skaflestad?= <Bard.Skaflestad@sintef.no>
Date: Mon, 6 Jun 2011 23:59:16 +0200
Subject: [PATCH] Polish Make script for extensibility

1) Sort list of (_noinst) test programs.
2) Remove a few TABs that (potentially) cause conflicts.
---
 examples/Makefile.am | 61 ++++++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 28 deletions(-)

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 2d99860..93ea925 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,22 +1,23 @@
 SUBDIRS =
 
 check_PROGRAMS =
-noinst_PROGRAMS = grdecl_to_legacy_test \
-                  make_vtk_test \
-                  istl_test \
-                  ifsh_solver_test \
-                  mimetic_solver_test \
-                  mimetic_aniso_solver_test \
-                  mimetic_periodic_test \
-		  spe10_test \
-		  tpfa_solver_test \
-		  tpfa_compressible_solver_test \
-		  known_answer_test \
-                  aniso_implicitcap_test \
-                  implicitcap_test \
-                  aniso_simulator_test \
-                  simulator_test \
-		  blackoil_sim_test
+noinst_PROGRAMS =				\
+aniso_implicitcap_test				\
+aniso_simulator_test				\
+blackoil_sim_test				\
+grdecl_to_legacy_test				\
+ifsh_solver_test				\
+implicitcap_test				\
+istl_test					\
+known_answer_test				\
+make_vtk_test					\
+mimetic_aniso_solver_test			\
+mimetic_periodic_test				\
+mimetic_solver_test				\
+simulator_test					\
+spe10_test					\
+tpfa_compressible_solver_test			\
+tpfa_solver_test
 
 grdecl_to_legacy_test_SOURCES = grdecl_to_legacy_test.cpp
 
@@ -69,26 +70,30 @@ TESTS = $(check_PROGRAMS)
 # ALUgrid (both debug and release), we may reinstate them.
 # AM_CPPFLAGS += $(DUNEMPICPPFLAGS) $(BOOST_CPPFLAGS) $(ALUGRID_CPPFLAGS) $(SUPERLU_CPPFLAGS)
 # AM_LDFLAGS  += $(DUNEMPILDFLAGS) $(BOOST_LDFLAGS) $(ALUGRID_LDFLAGS) $(SUPERLU_LDFLAGS)
-# LDADD = $(DUNE_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)   \
-          $(BOOST_SYSTEM_LIB) $(DUNEMPILIBS)              \
-	  $(ALUGRID_LIBS) $(SUPERLU_LIBS)                \
+# LDADD = $(DUNE_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)	\
+          $(BOOST_SYSTEM_LIB) $(DUNEMPILIBS)		\
+          $(ALUGRID_LIBS) $(SUPERLU_LIBS)		\
           $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
+
 AM_CPPFLAGS += $(DUNEMPICPPFLAGS) $(BOOST_CPPFLAGS) $(SUPERLU_CPPFLAGS)
 AM_LDFLAGS  += $(DUNEMPILDFLAGS) $(BOOST_LDFLAGS) $(SUPERLU_LDFLAGS)
-LDADD = $(DUNE_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)   \
-        $(BOOST_SYSTEM_LIB) $(DUNEMPILIBS)              \
-	$(SUPERLU_LIBS)                                 \
-        $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
+
+LDADD =						\
+$(DUNE_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)	\
+$(BOOST_SYSTEM_LIB) $(DUNEMPILIBS)		\
+$(SUPERLU_LIBS)					\
+$(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
 
 # don't follow the full GNU-standard
 # we need automake 1.5
 AUTOMAKE_OPTIONS = foreign 1.5
 
 # pass most important options when "make distcheck" is used
-DISTCHECK_CONFIGURE_FLAGS = --with-dune-common=$(DUNE_COMMON_ROOT) \
-                            --with-dune-grid=$(DUNE_GRID_ROOT) \
-                            --with-dune-istl=$(DUNE_ISTL_ROOT) \
-                            --with-dune-cornerpoint=$(DUNE_CORNERPOINT_ROOT) \
-                            CXX="$(CXX)" CC="$(CC)"
+DISTCHECK_CONFIGURE_FLAGS =				\
+--with-dune-common=$(DUNE_COMMON_ROOT)			\
+--with-dune-grid=$(DUNE_GRID_ROOT)			\
+--with-dune-istl=$(DUNE_ISTL_ROOT)			\
+--with-dune-cornerpoint=$(DUNE_CORNERPOINT_ROOT)	\
+CXX="$(CXX)" CC="$(CC)"
 
 include $(top_srcdir)/am/global-rules