Update of /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3280
Modified Files:
Makefile.am
Log Message:
Fix #141702 : Correcly compile each benchmark support source (without the need of running make twice).
Obsolete rule removed.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.am 22 Jan 2007 18:07:12 -0000 1.4
--- Makefile.am 29 Aug 2007 19:34:46 -0000 1.5
***************
*** 25,47 ****
Benchmark-GZIP.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-GZIP.libwrapper.h
! libcompbenchmarks_bm_gzip_la_SOURCES = Benchmark-GZIP.cpp Benchmark-GZIP.h
Benchmark-BZIP2.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-BZIP2.libwrapper.h
! libcompbenchmarks_bm_bzip2_la_SOURCES = Benchmark-BZIP2.cpp Benchmark-BZIP2.h
Benchmark-NBENCH.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-NBENCH.libwrapper.h
! libcompbenchmarks_bm_nbench_la_SOURCES = Benchmark-NBENCH.cpp Benchmark-NBENCH.h
Benchmark-SCIMARK2.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-SCIMARK2.libwrapper.h
! libcompbenchmarks_bm_scimark2_la_SOURCES = Benchmark-SCIMARK2.cpp Benchmark-SCIMARK2.h
Benchmark-BENCHPP.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-BENCHPP.libwrapper.h
! libcompbenchmarks_bm_benchpp_la_SOURCES = Benchmark-BENCHPP.cpp Benchmark-BENCHPP.h
Benchmark-BENCHPPLINUX.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-BENCHPPLINUX.libwrapper.h
! libcompbenchmarks_bm_benchpplinux_la_SOURCES = Benchmark-BENCHPPLINUX.cpp Benchmark-BENCHPPLINUX.h
Benchmark-LINPACKC.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-LINPACKC.libwrapper.h
! libcompbenchmarks_bm_linpackc_la_SOURCES = Benchmark-LINPACKC.cpp Benchmark-LINPACKC.h
INCLUDES = -I $(top_srcdir)/libcompbenchmarks -I $(top_srcdir)
--- 25,47 ----
Benchmark-GZIP.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-GZIP.libwrapper.h
! libcompbenchmarks_bm_gzip_la_SOURCES = Benchmark-GZIP.cpp Benchmark-GZIP.h Benchmark-GZIP.libwrapper.h
Benchmark-BZIP2.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-BZIP2.libwrapper.h
! libcompbenchmarks_bm_bzip2_la_SOURCES = Benchmark-BZIP2.cpp Benchmark-BZIP2.h Benchmark-BZIP2.libwrapper.h
Benchmark-NBENCH.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-NBENCH.libwrapper.h
! libcompbenchmarks_bm_nbench_la_SOURCES = Benchmark-NBENCH.cpp Benchmark-NBENCH.h Benchmark-NBENCH.libwrapper.h
Benchmark-SCIMARK2.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-SCIMARK2.libwrapper.h
! libcompbenchmarks_bm_scimark2_la_SOURCES = Benchmark-SCIMARK2.cpp Benchmark-SCIMARK2.h Benchmark-SCIMARK2.libwrapper.h
Benchmark-BENCHPP.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-BENCHPP.libwrapper.h
! libcompbenchmarks_bm_benchpp_la_SOURCES = Benchmark-BENCHPP.cpp Benchmark-BENCHPP.h Benchmark-BENCHPP.libwrapper.h
Benchmark-BENCHPPLINUX.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-BENCHPPLINUX.libwrapper.h
! libcompbenchmarks_bm_benchpplinux_la_SOURCES = Benchmark-BENCHPPLINUX.cpp Benchmark-BENCHPPLINUX.h Benchmark-BENCHPPLINUX.libwrapper.h
Benchmark-LINPACKC.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-LINPACKC.libwrapper.h
! libcompbenchmarks_bm_linpackc_la_SOURCES = Benchmark-LINPACKC.cpp Benchmark-LINPACKC.h Benchmark-LINPACKC.libwrapper.h
INCLUDES = -I $(top_srcdir)/libcompbenchmarks -I $(top_srcdir)
***************
*** 52,71 ****
EXTRA_DIST = benchmarks-genlibwrapper.pl benchmarks.list
- %.libwraXpper.h: $(top_srcdir)/SupportedBenchmarks/benchmarks.list $(CBM_GENLIBWRAPPER)
- echo ">>>>>>>>>>>>>>>> $@"
- @(doit=0; echo -n "Checking $@ : "; if test ! -f $(top_srcdir)/SupportedBenchmarks/$@; then \
- doit=1; \
- fi; \
- $(CBM_GENLIBWRAPPER) $@ $(top_srcdir)/SupportedBenchmarks > $@.tmp; \
- if test $$doit = "1"; then \
- mv $@.tmp $@ && echo "created."; \
- else \
- diff $@.tmp $@ > /dev/null; \
- if test ! $$? == 0; then mv $@.tmp $@ && echo "updated."; else \
- echo "up-to-date."; \
- fi; \
- fi; \
- rm $@.tmp 2> /dev/null; exit 0)
-
$(top_srcdir)/SupportedBenchmarks/%.libwrapper.h: $(top_srcdir)/SupportedBenchmarks/benchmarks.list $(CBM_GENLIBWRAPPER)
$(CBM_GENLIBWRAPPER) $@ $(top_srcdir)/SupportedBenchmarks > $@
--- 52,55 ----
|
