Ignore:
Timestamp:
Jun 4, 2008, 12:05:22 AM (14 years ago)
Author:
Jari Häkkinen
Message:

Merged trunk changes r608:645 to replacing_gnuplot branch.

Location:
branches/replacing_gnuplot/test
Files:
5 deleted
1 edited
5 copied

Legend:

Unmodified
Added
Removed
  • branches/replacing_gnuplot/test/Makefile.am

    r607 r646  
    2323# 02111-1307, USA.
    2424
    25 check_PROGRAMS = config_test date gnuplot_pipe \
    26   parser trac utility_test
     25check_PROGRAMS = config_test date_test gnuplot_pipe_test \
     26  parser_test trac_test utility_test
    2727
    2828# these tests are only for developers since we do not distribute test repository
    2929if HAVE_SVN_WC
    30 check_PROGRAMS += copyright stats_test
     30check_PROGRAMS += copyright_test stats_test
    3131endif
    3232
     
    4545
    4646
    47 LDADD = $(STATICFLAG) @builddir@/libsvndigesttest.la \
    48   @top_builddir@/lib/libsvndigest.la
     47LDADD = @builddir@/libsvndigesttest.la \
     48  @top_builddir@/lib/libsvndigest.la \
     49  $(SVNDIGEST_LIBS)
     50AM_LDFLAGS = $(STATICFLAG) $(SVNDIGEST_LDFLAGS)
    4951
    50 AM_CPPFLAGS = -I@top_srcdir@/lib
     52AM_CPPFLAGS = -I@top_srcdir@/lib $(SVNDIGEST_CPPFLAGS)
     53AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS)
    5154
    5255libsvndigesttest_la_SOURCES = Suite.cc
    5356
    5457config_test_SOURCES = config_test.cc
    55 copyright_SOURCES = copyright.cc
    56 date_SOURCES = date.cc
    57 gnuplot_pipe_SOURCES = gnuplot_pipe.cc
    58 parser_SOURCES = parser.cc
     58copyright_test_SOURCES = copyright_test.cc
     59date_test_SOURCES = date_test.cc
     60gnuplot_pipe_test_SOURCES = gnuplot_pipe_test.cc
     61parser_test_SOURCES = parser_test.cc
    5962stats_test_SOURCES = stats_test.cc
    60 trac_SOURCES = trac.cc
     63trac_test_SOURCES = trac_test.cc
    6164utility_test_SOURCES = utility_test.cc
    6265
     
    6972# some tests need the test repo to be checked out
    7073stats_test_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest.la
    71 copyright_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest.la
     74copyright_test_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest.la
     75
     76@top_builddir@/lib/libsvndigest.la:
     77  @cd @top_builddir@/lib/ && $(MAKE) $(AM_MAKEFLAGS);
    7278
    7379$(toy_project):
     
    7682
    7783clean-local:
    78   rm -rf *.png *.tmp *~ check_repo_status.sh test_repo.sh \
    79   $(targetdir)
     84  rm -rf *.png *.tmp *~ $(targetdir)
     85
     86.PHONY: @top_builddir@/lib/libsvndigest.la
Note: See TracChangeset for help on using the changeset viewer.