Changeset 668 for trunk/test


Ignore:
Timestamp:
Jul 4, 2008, 1:28:06 AM (13 years ago)
Author:
Jari Häkkinen
Message:

Fixes #340. Run 'bootstrap' after update.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/Makefile.am

    r640 r668  
    33## $Id$
    44
    5 # Copyright (C) 2005, 2006, 2007 Jari Häkkinen, Peter Johansson
    6 # Copyright (C) 2008 Peter Johansson
     5# Copyright (C) 2005, 2006, 2007, 2008 Jari Häkkinen, Peter Johansson
    76#
    87# This file is part of svndigest, http://trac.thep.lu.se/svndigest
     
    4241noinst_HEADERS = Suite.h
    4342
    44 check_LTLIBRARIES = libsvndigesttest.la
     43check_LIBRARIES = libsvndigesttest.a
    4544
    4645
    47 LDADD = @builddir@/libsvndigesttest.la \
    48   @top_builddir@/lib/libsvndigest.la \
     46LDADD = @builddir@/libsvndigesttest.a \
     47  @top_builddir@/lib/libsvndigest.a \
    4948  $(SVNDIGEST_LIBS)
    50 AM_LDFLAGS = $(STATICFLAG) $(SVNDIGEST_LDFLAGS)
     49AM_LDFLAGS = $(SVNDIGEST_LDFLAGS)
    5150
    5251AM_CPPFLAGS = -I@top_srcdir@/lib $(SVNDIGEST_CPPFLAGS)
    5352AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS)
    5453
    55 libsvndigesttest_la_SOURCES = Suite.cc
     54libsvndigesttest_a_SOURCES = Suite.cc
    5655
    5756config_test_SOURCES = config_test.cc
     
    7170
    7271# some tests need the test repo to be checked out
    73 stats_test_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest.la
    74 copyright_test_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest.la
     72stats_test_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest.a
     73copyright_test_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest.a
    7574
    76 @top_builddir@/lib/libsvndigest.la:
     75@top_builddir@/lib/libsvndigest.a:
    7776  @cd @top_builddir@/lib/ && $(MAKE) $(AM_MAKEFLAGS);
    7877
     
    8483  rm -rf *.png *.tmp *~ $(targetdir)
    8584
    86 .PHONY: @top_builddir@/lib/libsvndigest.la
     85.PHONY: @top_builddir@/lib/libsvndigest.a
Note: See TracChangeset for help on using the changeset viewer.