hepmc - Diff between revs 277 and 285

Subversion Repositories:
Rev:
Show entire file - Ignore whitespace
Rev 277 Rev 285
Line 1... Line 1...
1 # Applicable to each test program: 1 # Applicable to each test program:
2 -  
3 if USE_GMAKE -  
4 MAKE = gmake -  
5 endif -  
6 2
7 INCLUDES = -I$(top_builddir) -I$(top_srcdir) 3 INCLUDES = -I$(top_builddir) -I$(top_srcdir)
8 4
9 # libraries to link, and whence 5 # libraries to link, and whence
10 if BUILD_STATIC -  
11 LDADD = $(top_builddir)/src/libHepMC.a \ -  
12 $(top_builddir)/fio/libHepMCfio.a -  
13 else -  
14 if BUILD_VISUAL 6 if BUILD_VISUAL
15 LDADD = $(top_builddir)/src/HepMC.$(SHEXT) \ -  
16 $(top_builddir)/fio/HepMCfio.$(SHEXT) -  
-   7 HepMCLIB = $(top_builddir)/src/.libs/HepMC.$(SHEXT)
-   8 HepMCfioLIB = $(top_builddir)/fio/.libs/HepMCfio.$(SHEXT)
17 else 9 else
18 LIBS += $(MY_LD)$(top_builddir)/src \ -  
19 $(MY_LD)$(top_builddir)/fio -  
20 LDADD = $(top_builddir)/src/libHepMC.$(SHEXT) \ -  
21 $(top_builddir)/fio/libHepMCfio.$(SHEXT) -  
22 endif -  
-   10 HepMCLIB = $(top_builddir)/src/.libs/libHepMC.a
-   11 HepMCfioLIB = $(top_builddir)/fio/.libs/libHepMCfio.a
23 endif 12 endif
-   13
-   14 #LDADD = $(top_builddir)/src/libHepMC.la \
-   15 # $(top_builddir)/fio/libHepMCfio.la
24 16
25 # Identify executables needed during testing: 17 # Identify executables needed during testing:
26 check_PROGRAMS = testSimpleVector testUnits \ -  
-   18 check_PROGRAMS = testSimpleVector testUnits testPrintBug \
27 testHepMC testHepMCIteration testMass \ 19 testHepMC testHepMCIteration testMass \
28 testPrintBug testMultipleCopies \ -  
29 testDeprecated -  
-   20 testMultipleCopies testDeprecated
30 21
31 check_SCRIPTS = testHepMC.sh testHepMCIteration.sh testPrintBug.sh \ 22 check_SCRIPTS = testHepMC.sh testHepMCIteration.sh testPrintBug.sh \
32 testMass.sh testDeprecated.sh 23 testMass.sh testDeprecated.sh
33 24
34 # Identify test(s) to run when 'make check' is requested: 25 # Identify test(s) to run when 'make check' is requested:
Line 46... Line 37...
46 testMass_SOURCES = testMass.cc 37 testMass_SOURCES = testMass.cc
47 testHepMCIteration_SOURCES = testHepMCIteration.cc 38 testHepMCIteration_SOURCES = testHepMCIteration.cc
48 testMultipleCopies_SOURCES = testMultipleCopies.cc 39 testMultipleCopies_SOURCES = testMultipleCopies.cc
49 testPrintBug_SOURCES = testPrintBug.cc 40 testPrintBug_SOURCES = testPrintBug.cc
50 testDeprecated_SOURCES = testDeprecated.cc 41 testDeprecated_SOURCES = testDeprecated.cc
-   42
-   43 # Identify the link libraries and flags on a per-test basis:
-   44 testSimpleVector_LDADD = $(top_builddir)/src/libHepMC.la
-   45 testUnits_LDADD = $(top_builddir)/src/libHepMC.la
-   46 testHepMC_LDADD = $(top_builddir)/src/libHepMC.la
-   47 testMass_LDADD = $(top_builddir)/src/libHepMC.la
-   48 testHepMCIteration_LDADD = $(top_builddir)/src/libHepMC.la
-   49 testMultipleCopies_LDADD = $(top_builddir)/src/libHepMC.la
-   50 testPrintBug_LDADD = $(top_builddir)/src/libHepMC.la
-   51 testDeprecated_LDADD = $(top_builddir)/src/libHepMC.la
-   52
-   53 #testHepMC_LDFLAGS = -Wl,--rpath -Wl,$(top_builddir)/src/.libs \
-   54 # -Wl,--rpath -Wl,$(top_builddir)/fio/.libs
-   55 #testMass_LDFLAGS = -Wl,$(top_builddir)/fio/.libs
-   56 #testHepMCIteration_LDFLAGS = -Wl,$(top_builddir)/fio/.libs
-   57 #testMultipleCopies_LDFLAGS = -Wl,$(top_builddir)/fio/.libs
-   58 #testDeprecated_LDFLAGS = -Wl,$(top_builddir)/fio/.libs
51 59
52 # Identify input data file(s) and prototype output file(s): 60 # Identify input data file(s) and prototype output file(s):
53 EXTRA_DIST = testHepMC.input testHepMC.output testHepMCParticle.output \ 61 EXTRA_DIST = testHepMC.input testHepMC.output testHepMCParticle.output \
54 testPrintBug.output testHepMCExtended.dat \ 62 testPrintBug.output testHepMCExtended.dat \
55 testHepMCIteration.output testHepMCIterationExtended.output \ 63 testHepMCIteration.output testHepMCIterationExtended.output \