[Compbench-devel] CompBenchmarks++/Benchmark Makefile.am,1.6,1.7

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

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

Modified Files:
	Makefile.am 
Log Message:
Some class names changed. Shared library interface.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.am	1 Oct 2006 19:36:11 -0000	1.6
--- Makefile.am	1 Nov 2006 13:00:50 -0000	1.7
***************
*** 1,22 ****
! noinst_LTLIBRARIES		=	libBenchmark.la
! SUBDIRS				=	Compiler
  
! sources				=       Benchmark.cpp \
! 					Benchmark-Selector.cpp \
! 					Benchmark-Autotools.cpp \
! 					Benchmark-xZIP.cpp \
! 					Benchmark-GZIP.cpp \
! 					Benchmark-BZIP2.cpp \
! 					Benchmark-NBENCH.cpp \
! 					Benchmark-SCIMARK2.cpp \
! 					Benchmark-BENCHPP.cpp \
! 					Benchmark-LINPACKC.cpp
  
  
! libBenchmark_la_LIBADD		=	Compiler/libBenchmarkCompiler.la
  
! libBenchmark_la_SOURCES 	=	$(sources)
  
! noinst_HEADERS			=	$(sources:.cpp=.h)
  
! INCLUDES			=	-I $(top_srcdir)
--- 1,60 ----
! noinst_LTLIBRARIES			=	libBenchmark.la
! lib_LTLIBRARIES				=	libcompbenchmarks-gzip.la \
! 						libcompbenchmarks-bzip2.la \
! 						libcompbenchmarks-nbench.la \
! 						libcompbenchmarks-scimark2.la \
! 						libcompbenchmarks-benchpp.la \
! 						libcompbenchmarks-linpackc.la
  
! # SUBDIRS					=	Compiler
  
+ sources					=       Benchmark.cpp \
+ 						Benchmark-DLLoader.cpp \
+ 						Benchmark-Selector.cpp \
+ 						Benchmark-Autotools.cpp \
+ 						Benchmark-xZIP.cpp
  
! Benchmark-Selector.cpp: Benchmark-Selector.liblist.h
  
! Benchmark-GZIP.cpp: Benchmark-GZIP.libwrapper.h
! libcompbenchmarks_gzip_la_SOURCES	=	Benchmark-GZIP.cpp Benchmark-GZIP.h Benchmark-GZIP.libwrapper.h
  
! Benchmark-BZIP2.cpp: Benchmark-BZIP2.libwrapper.h
! libcompbenchmarks_bzip2_la_SOURCES	=	Benchmark-BZIP2.cpp Benchmark-BZIP2.h Benchmark-BZIP2.libwrapper.h
  
! Benchmark-NBENCH.cpp: Benchmark-NBENCH.libwrapper.h
! libcompbenchmarks_nbench_la_SOURCES	=	Benchmark-NBENCH.cpp Benchmark-NBENCH.h Benchmark-NBENCH.libwrapper.h
! 
! Benchmark-SCIMARK2.cpp: Benchmark-SCIMARK2.libwrapper.h
! libcompbenchmarks_scimark2_la_SOURCES	=	Benchmark-SCIMARK2.cpp Benchmark-SCIMARK2.h Benchmark-SCIMARK2.libwrapper.h
! 
! Benchmark-BENCHPP.cpp: Benchmark-BENCHPP.libwrapper.h
! libcompbenchmarks_benchpp_la_SOURCES	=	Benchmark-BENCHPP.cpp Benchmark-BENCHPP.h Benchmark-BENCHPP.libwrapper.h
! 
! Benchmark-LINPACKC.cpp: Benchmark-LINPACKC.libwrapper.h
! libcompbenchmarks_linpackc_la_SOURCES   =	Benchmark-LINPACKC.cpp Benchmark-LINPACKC.h Benchmark-LINPACKC.libwrapper.h
! 
! # libBenchmark_la_LIBADD			=	Compiler/libBenchmarkCompiler.la
! 
! libBenchmark_la_SOURCES 		=	$(sources) 
! 
! libBenchmarkinclude_HEADERS		=	$(sources:.cpp=.h)
! libBenchmarkincludedir			=	$(includedir)/Benchmark
! 
! INCLUDES				=	-I $(top_srcdir)
! 
! CBM_GENLIBWRAPPER			=	$(top_srcdir)/Benchmark/benchmarks-genlibwrapper.sh
! CBM_GENLIST				=	$(top_srcdir)/Benchmark/benchmarks-list.sh
! 
! 
! extra_DIST				=	benchmarks-genlibwrapper.sh benchmarks-list.sh benchmarks.list
! 
! %.libwrapper.h: $(top_srcdir)/Benchmark/benchmarks.list $(CBM_GENLIBWRAPPER)
! 	@echo "Generating $@"
! 	@$(CBM_GENLIBWRAPPER) $@ $(top_srcdir)/Benchmark > $@
! 
! Benchmark-Selector.liblist.h: $(top_srcdir)/Benchmark/benchmarks.list $(CBM_GENLIST)
! 	@echo "Generating benchmark's list in $@"
! 	@$(CBM_GENLIST) > $@
! 
! clean-all: rm *.libwrapper.h *.liblist.h
\ No newline at end of file