Changeset 646 for branches/replacing_gnuplot/test/Makefile.am

Timestamp:

Jun 4, 2008, 12:05:22 AM (13 years ago)

Author:

Jari Häkkinen

Message:

Merged trunk changes r608:645 to replacing_gnuplot branch.

File:

• branches/replacing_gnuplot/test/Makefile.am (modified) (4 diffs)

branches/replacing_gnuplot/test/Makefile.am

@@ -23 +23 @@
 # 02111-1307, USA.
 
-check_PROGRAMS = config_test date gnuplot_pipe \
-  parser trac utility_test
+check_PROGRAMS = config_test date_test gnuplot_pipe_test \
+  parser_test trac_test utility_test
 
 # these tests are only for developers since we do not distribute test repository
 if HAVE_SVN_WC
-check_PROGRAMS += copyright stats_test
+check_PROGRAMS += copyright_test stats_test
 endif
 
@@ -45 +45 @@
 
 
-LDADD = $(STATICFLAG) @builddir@/libsvndigesttest.la \
-  @top_builddir@/lib/libsvndigest.la
+LDADD = @builddir@/libsvndigesttest.la \
+  @top_builddir@/lib/libsvndigest.la \
+  $(SVNDIGEST_LIBS)
+AM_LDFLAGS = $(STATICFLAG) $(SVNDIGEST_LDFLAGS)
 
-AM_CPPFLAGS = -I@top_srcdir@/lib
+AM_CPPFLAGS = -I@top_srcdir@/lib $(SVNDIGEST_CPPFLAGS)
+AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS)
 
 libsvndigesttest_la_SOURCES = Suite.cc
 
 config_test_SOURCES = config_test.cc
-copyright_SOURCES = copyright.cc
-date_SOURCES = date.cc
-gnuplot_pipe_SOURCES = gnuplot_pipe.cc
-parser_SOURCES = parser.cc
+copyright_test_SOURCES = copyright_test.cc
+date_test_SOURCES = date_test.cc
+gnuplot_pipe_test_SOURCES = gnuplot_pipe_test.cc
+parser_test_SOURCES = parser_test.cc
 stats_test_SOURCES = stats_test.cc
-trac_SOURCES = trac.cc
+trac_test_SOURCES = trac_test.cc
 utility_test_SOURCES = utility_test.cc
 
@@ -69 +72 @@
 # some tests need the test repo to be checked out
 stats_test_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest.la
-copyright_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest.la
+copyright_test_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest.la
+
+@top_builddir@/lib/libsvndigest.la:
+  @cd @top_builddir@/lib/ && $(MAKE) $(AM_MAKEFLAGS);
 
 $(toy_project):
@@ -76 +82 @@
 
 clean-local: 
-  rm -rf *.png *.tmp *~ check_repo_status.sh test_repo.sh \
-  $(targetdir)
+  rm -rf *.png *.tmp *~ $(targetdir)
+
+.PHONY: @top_builddir@/lib/libsvndigest.la