Merge pull request #68 from rolk/am-fix

Very minor nitpicks in the build system

Makefile.am

@@ -14,7 +14,7 @@ lib_LTLIBRARIES = lib/libopmcore.la
 AM_CPPFLAGS =					\
 $(ERT_CPPFLAGS)                                 \
 $(OPM_BOOST_CPPFLAGS)                           \
-${SUPERLU_CPPFLAGS}
+$(SUPERLU_CPPFLAGS)
 
 # ----------------------------------------------------------------------
 # Link-time flags needed both to successfully link the library and to
@@ -23,8 +23,8 @@ ${SUPERLU_CPPFLAGS}
 lib_libopmcore_la_LDFLAGS =			\
 -R $(OPM_BOOST_LIBDIR)				\
 $(OPM_BOOST_LDFLAGS)                            \
-$(ERT_LDFLAGS)
-${SUPERLU_LDFLAGS}
+$(ERT_LDFLAGS)                                  \
+$(SUPERLU_LDFLAGS)
 
 lib_libopmcore_la_LIBADD = 			\
 $(BOOST_FILESYSTEM_LIB)				\
@@ -32,7 +32,7 @@ $(BOOST_SYSTEM_LIB)				\
 $(BOOST_DATE_TIME_LIB)				\
 $(BOOST_UNIT_TEST_FRAMEWORK_LIB)		\
 $(ERT_LIBS)                                     \
-$(LAPACK_LIBS) ${SUPERLU_LIBS} $(BLAS_LIBS) $(LIBS)
+$(LAPACK_LIBS) $(SUPERLU_LIBS) $(BLAS_LIBS) $(LIBS)
 
 # ----------------------------------------------------------------------
 # Library constituents.  SOURCES followed by HEADERS.

m4/opm_superlu.m4

@@ -124,7 +124,7 @@ AC_DEFUN([_slu_search_default],
 #   HAVE_SUPERLU
 #     ENABLE_SUPERLU or undefined.  Whether SuperLU was found.  The correct
 #     way to check this is "#if HAVE_SUPERLU": This way SuperLU features will
-#     be disabled unless ${SUPERLU_CPPFLAGS} was given when compiling.
+#     be disabled unless $(SUPERLU_CPPFLAGS) was given when compiling.
 #   SUPERLU_POST_2005_VERSION
 #     1 or undefined.  A post-2005 version of SuperLU uses the header
 #     "slu_ddefs.h" while earlier versions use "dsp_defs.h".
@@ -308,7 +308,7 @@ AC_DEFUN([OPM_PATH_SUPERLU],[
     fi
     AC_SUBST([SUPERLU_LIBS])
     AC_SUBST([SUPERLU_CPPFLAGS])
-    #DUNE_ADD_ALL_PKG([SUPERLU], [\${SUPERLU_CPPFLAGS}], [], [\${SUPERLU_LIBS}])
+    #DUNE_ADD_ALL_PKG([SUPERLU], [\$(SUPERLU_CPPFLAGS)], [], [\$(SUPERLU_LIBS)])
 
     # tell automake
     AM_CONDITIONAL(SUPERLU, test x$HAVE_SUPERLU = x1)

tests/Makefile.am

@@ -1,6 +1,6 @@
 AM_CPPFLAGS =					\
 -I$(top_srcdir)					\
-$(OPM_BOOST_CPPFLAGS) ${SUPERLU_CPPFLAGS}	\
+$(OPM_BOOST_CPPFLAGS) $(SUPERLU_CPPFLAGS)	\
 $(ERT_CPPFLAGS)
 
 AM_LDFLAGS = $(OPM_BOOST_LDFLAGS) $(ERT_LDFLAGS)