Changeset 1581 for branches/0.10-stable


Ignore:
Timestamp:
Feb 25, 2015, 9:09:58 AM (4 years ago)
Author:
Peter Johansson
Message:

fixes #529

Provide object files for linking rather than corresponding source
files as SOURCES for option.test. It removes the warning from automake
1.15 and it avoids some extra compilations as we recycle the object
files instead.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/0.10-stable/test/Makefile.am

    r1567 r1581  
    3434CLEANFILES = $(EXTRA_PROGRAMS)
    3535
    36 option_test_SOURCES = option.cc $(top_srcdir)/bin/Parameter.cc \
    37   $(top_srcdir)/bin/AbstractParameter.cc $(top_srcdir)/bin/svndigestParameter.cc
     36option_test_SOURCES = option.cc
    3837
    3938distributed_TESTS =
     
    7776## graph test needs to link against Graph class
    7877graph_test_LDADD = $(LDADD) $(top_builddir)/lib/libsvndigest.a
     78
     79## we need to link in some object files from bin/
     80option_test_LDADD = ../bin/Parameter.$(OBJEXT) \
     81  ../bin/AbstractParameter.$(OBJEXT) \
     82  ../bin/svndigestParameter.$(OBJEXT) $(LDADD)
    7983
    8084AM_LDFLAGS = $(SVNDIGEST_LDFLAGS)
Note: See TracChangeset for help on using the changeset viewer.