Skip to content
Snippets Groups Projects
Commit 52f30446 authored by Jorrit Fahlke's avatar Jorrit Fahlke
Browse files

Use LDADD instead of LOCAL_LIBS. LDADD is the standard way of doing what

LOCAL_LIBS is meant to do.  Also remove the bad example of passing
preprocessor flags in CXXFLAGS from duneproject.

[[Imported from SVN: r5842]]
parent f05ff80e
No related branches found
No related tags found
No related merge requests found
...@@ -496,7 +496,7 @@ noinst_PROGRAMS = ${CMODULE} ...@@ -496,7 +496,7 @@ noinst_PROGRAMS = ${CMODULE}
${CMODULE}_SOURCES = $CMODULE.cc ${CMODULE}_SOURCES = $CMODULE.cc
${CMODULE}_CXXFLAGS = \$(AM_CXXFLAGS) \\ ${CMODULE}_CPPFLAGS = \$(AM_CPPFLAGS) \\
\$(DUNEMPICPPFLAGS) \\ \$(DUNEMPICPPFLAGS) \\
\$(UG_CPPFLAGS) \\ \$(UG_CPPFLAGS) \\
\$(AMIRAMESH_CPPFLAGS) \\ \$(AMIRAMESH_CPPFLAGS) \\
......
...@@ -16,7 +16,7 @@ DUNE_CHECK_ALL ...@@ -16,7 +16,7 @@ DUNE_CHECK_ALL
AC_SUBST([DUNE_COMMON_ROOT], '$(abs_top_srcdir)') AC_SUBST([DUNE_COMMON_ROOT], '$(abs_top_srcdir)')
AC_SUBST([DUNE_COMMON_BIN], '$(abs_top_srcdir)/bin/') AC_SUBST([DUNE_COMMON_BIN], '$(abs_top_srcdir)/bin/')
AC_SUBST([AM_CPPFLAGS], '-I$(top_srcdir)') AC_SUBST([AM_CPPFLAGS], '-I$(top_srcdir)')
AC_SUBST([LOCAL_LIBS], '$(top_builddir)/dune/common/libcommon.la') AC_SUBST([LDADD], '$(top_builddir)/lib/libdunecommon.la')
# write output # write output
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
......
...@@ -7,8 +7,6 @@ noinst_LTLIBRARIES = libcommon.la ...@@ -7,8 +7,6 @@ noinst_LTLIBRARIES = libcommon.la
libcommon_la_SOURCES = stdstreams.cc configparser.cc libcommon_la_SOURCES = stdstreams.cc configparser.cc
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/..
commonincludedir = $(includedir)/dune/common commonincludedir = $(includedir)/dune/common
commoninclude_HEADERS = alignment.hh array.hh \ commoninclude_HEADERS = alignment.hh array.hh \
arraylist.hh bitsetvector.hh debugstream.hh deprecated.hh \ arraylist.hh bitsetvector.hh debugstream.hh deprecated.hh \
......
...@@ -39,8 +39,6 @@ check_PROGRAMS = $(TESTPROGS) ...@@ -39,8 +39,6 @@ check_PROGRAMS = $(TESTPROGS)
noinst_HEADERS = dummyiterator.hh noinst_HEADERS = dummyiterator.hh
LDADD = $(LOCAL_LIBS)
# define the programs # define the programs
smallobject_SOURCES = smallobject.cc smallobject_SOURCES = smallobject.cc
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment