Changeset 1159 for branches/0.8-stable/test/Makefile.am

Timestamp:

Aug 10, 2010, 3:20:04 PM (11 years ago)

Author:

Peter Johansson

Message:

refs #467. Change how CPPFLAGS, CXXFLAGS and LDFLAGS are picked up
automagically in configure. First, save flag given by user. Second add
flags to e.g. LDFLAGS (based on --with-plplot etc) but add only values
not already in LDFLAGS. Third, calculate difference SVNDIGEST_LDFLAGS

LDFLAGS - LDFLAGS_init and restore LDFLAGS to LDFLAGS_init (given by

user). This implies we avoid multiple identical entries. For example,
before the linker could get 3 copies of '-L/opt/local/lib' because it
got one from APR_LDFLAGS, one from SVN_LDFLAGS, and one from
PLPLOT_LDFLAGS. It also means that if user gives ./configure -L/foo
-L/bar, configure will not add these paths into SVNDIGEST_LDFLAGS and
hence the user is in power of deciding the path order for the
linker/compiler.

File:

• branches/0.8-stable/test/Makefile.am (modified) (1 diff)

branches/0.8-stable/test/Makefile.am

@@ -60 +60 @@
   $(top_builddir)/yat/libyat.a \
   $(SVN_LIBS) $(APR_LIBS) $(PLPLOT_LIBS)
-AM_LDFLAGS = $(APR_LDFLAGS) $(SVN_LDFLAGS) $(PLPLOT_LDFLAGS)
+AM_LDFLAGS = $(SVNDIGEST_LDFLAGS)
 
-AM_CPPFLAGS = -I$(top_srcdir) $(APR_CPPFLAGS) $(SVN_CPPFLAGS) \
-  $(DEFAULT_CPPFLAGS) $(PLPLOT_CPPFLAGS)
-AM_CXXFLAGS = $(DEFAULT_CXXFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) $(SVNDIGEST_CPPFLAGS)
+AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS)
 
 libsvndigesttest_a_SOURCES = Suite.cc