[Compbench-devel] CompBenchmarks++/Benchmark Makefile.am, 1.15, 1.16 Benchmark-BENCHPP.cpp, 1.7, NONE Benchmark-BENCHPP.h, 1.4, NONE Benchmark-BENCHPPLINUX.cpp, 1.6, NONE Benchmark-BENCHPPLINUX.h, 1.4, NONE Benchmark-BZIP2.cpp, 1.5, NONE Benchmark-BZIP2.h, 1.4, NONE Benchmark-GZIP.cpp, 1.6, NONE Benchmark-GZIP.h, 1.5, NONE Benchmark-LINPACKC.cpp, 1.2, NONE Benchmark-LINPACKC.h, 1.2, NONE Benchmark-NBENCH.cpp, 1.5, NONE Benchmark-NBENCH.h, 1.4, NONE Benchmark-SCIMARK2.cpp, 1.6, NONE Benchmark-SCIMARK2.h, 1.4, NONE benchmarks-genlibwrapper.sh, 1.2, NONE benchmarks.list, 1.7, NONE

[Frederic T. <xf...@us...>]

Update of /cvsroot/compbench/CompBenchmarks++/Benchmark
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17099

Modified Files:
	Makefile.am 
Removed Files:
	Benchmark-BENCHPP.cpp Benchmark-BENCHPP.h 
	Benchmark-BENCHPPLINUX.cpp Benchmark-BENCHPPLINUX.h 
	Benchmark-BZIP2.cpp Benchmark-BZIP2.h Benchmark-GZIP.cpp 
	Benchmark-GZIP.h Benchmark-LINPACKC.cpp Benchmark-LINPACKC.h 
	Benchmark-NBENCH.cpp Benchmark-NBENCH.h Benchmark-SCIMARK2.cpp 
	Benchmark-SCIMARK2.h benchmarks-genlibwrapper.sh 
	benchmarks.list 
Log Message:
Sources have been re-organised.

--- Benchmark-BENCHPP.cpp DELETED ---

--- benchmarks.list DELETED ---

--- Benchmark-NBENCH.h DELETED ---

--- Benchmark-LINPACKC.h DELETED ---

--- Benchmark-SCIMARK2.h DELETED ---

--- Benchmark-NBENCH.cpp DELETED ---

--- Benchmark-GZIP.h DELETED ---

--- Benchmark-BENCHPPLINUX.h DELETED ---

--- Benchmark-BZIP2.cpp DELETED ---

--- Benchmark-GZIP.cpp DELETED ---

--- benchmarks-genlibwrapper.sh DELETED ---

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Makefile.am	28 Dec 2006 13:20:45 -0000	1.15
--- Makefile.am	28 Dec 2006 17:39:46 -0000	1.16
***************
*** 1,52 ****
! noinst_LTLIBRARIES			=	libBenchmark.la
! lib_LTLIBRARIES				=	libcompbenchmarks-gzip.la \
! 						libcompbenchmarks-bzip2.la \
! 						libcompbenchmarks-nbench.la \
! 						libcompbenchmarks-scimark2.la \
! 						libcompbenchmarks-benchpp.la \
! 						libcompbenchmarks-benchpplinux.la \
! 						libcompbenchmarks-linpackc.la
  
! # SUBDIRS					=	Compiler
  
  sources					=       Benchmark.cpp \
  						Benchmark-DLLoader.cpp \
- 						Benchmark-Selector.cpp \
  						Benchmark-Autotools.cpp \
! 						Benchmark-xZIP.cpp
! 
! 
! libcompbenchmarks_gzip_la_LIBADD		= ../libcompbenchmarks.la
! libcompbenchmarks_bzip2_la_LIBADD		= ../libcompbenchmarks.la
! libcompbenchmarks_nbench_la_LIBADD		= ../libcompbenchmarks.la
! libcompbenchmarks_scimark2_la_LIBADD 		= ../libcompbenchmarks.la
! libcompbenchmarks_benchpp_la_LIBADD 		= ../libcompbenchmarks.la
! libcompbenchmarks_benchpplinux_la_LIBADD	= ../libcompbenchmarks.la
! libcompbenchmarks_linpackc_la_LIBADD 		= ../libcompbenchmarks.la
! 
! Benchmark-Selector.cpp: Benchmark-Selector.liblist.h
! 
! Benchmark-GZIP.cpp: 
! libcompbenchmarks_gzip_la_SOURCES	=	Benchmark-GZIP.cpp Benchmark-GZIP.h Benchmark-GZIP.libwrapper.h
! 
! Benchmark-BZIP2.cpp:
! libcompbenchmarks_bzip2_la_SOURCES	=	Benchmark-BZIP2.cpp Benchmark-BZIP2.h Benchmark-BZIP2.libwrapper.h
! 
! Benchmark-NBENCH.cpp:
! libcompbenchmarks_nbench_la_SOURCES	=	Benchmark-NBENCH.cpp Benchmark-NBENCH.h Benchmark-NBENCH.libwrapper.h
! 
! Benchmark-SCIMARK2.cpp:
! libcompbenchmarks_scimark2_la_SOURCES	=	Benchmark-SCIMARK2.cpp Benchmark-SCIMARK2.h Benchmark-SCIMARK2.libwrapper.h
! 
! Benchmark-BENCHPP.cpp:
! libcompbenchmarks_benchpp_la_SOURCES	=	Benchmark-BENCHPP.cpp Benchmark-BENCHPP.h Benchmark-BENCHPP.libwrapper.h
! 
! Benchmark-BENCHPPLINUX.cpp:
! libcompbenchmarks_benchpplinux_la_SOURCES	=	Benchmark-BENCHPPLINUX.cpp Benchmark-BENCHPPLINUX.h Benchmark-BENCHPPLINUX.libwrapper.h
! 
! Benchmark-LINPACKC.cpp:
! libcompbenchmarks_linpackc_la_SOURCES   =	Benchmark-LINPACKC.cpp Benchmark-LINPACKC.h Benchmark-LINPACKC.libwrapper.h
! 
! # libBenchmark_la_LIBADD			=	Compiler/libBenchmarkCompiler.la
  
  libBenchmark_la_SOURCES 		=	$(sources) 
--- 1,11 ----
! # Benchmark
  
! noinst_LTLIBRARIES			=	libBenchmark.la
  
  sources					=       Benchmark.cpp \
  						Benchmark-DLLoader.cpp \
  						Benchmark-Autotools.cpp \
! 						Benchmark-xZIP.cpp \
! 						Benchmark-Selector.cpp
  
  libBenchmark_la_SOURCES 		=	$(sources) 
***************
*** 55,95 ****
  libBenchmarkincludedir			=	$(includedir)/compbenchmarks/Benchmark
  
! INCLUDES				=	-I $(top_srcdir)
! 
! CBM_GENLIBWRAPPER			=	$(top_srcdir)/Benchmark/benchmarks-genlibwrapper.sh
! CBM_GENLIBLIST				=	$(top_srcdir)/Benchmark/benchmarks-genliblist.sh
! 
! 
! EXTRA_DIST				=	benchmarks-genlibwrapper.sh benchmarks-genliblist.sh benchmarks.list
! 
! %.libwrapper.h: $(top_srcdir)/Benchmark/benchmarks.list $(CBM_GENLIBWRAPPER)
! 	@(doit=0; echo -n "Checking $@ : "; if test ! -f $(top_srcdir)/Benchmark/$@; then \
! 	doit=1; \
! 	fi; \
! 	$(CBM_GENLIBWRAPPER) $@ $(top_srcdir)/Benchmark > $@.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)
! 
! Benchmark-Selector.liblist.h: $(top_srcdir)/Benchmark/benchmarks.list $(CBM_GENLIBLIST)
! 	@(doit=0; echo -n "Checking $@ : "; if test ! -f $(top_srcdir)/Benchmark/$@; then \
! 	doit=1; \
! 	fi; \
! 	$(CBM_GENLIBLIST) $(top_srcdir)/Benchmark > $@.tmp; \
! 	if test $$doit = "0"; 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)
! 
! clean-all: rm *.libwrapper.h *.liblist.h
\ No newline at end of file
--- 14,16 ----
  libBenchmarkincludedir			=	$(includedir)/compbenchmarks/Benchmark
  
! INCLUDES				=	-I $(top_srcdir)
\ No newline at end of file

--- Benchmark-BENCHPP.h DELETED ---

--- Benchmark-SCIMARK2.cpp DELETED ---

--- Benchmark-LINPACKC.cpp DELETED ---

--- Benchmark-BENCHPPLINUX.cpp DELETED ---

--- Benchmark-BZIP2.h DELETED ---