Update of /cvsroot/compbench/CompBenchmarks++
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18272
Modified Files:
configure.in Makefile.am
Log Message:
libcompbenchmarks moved in a separate directory.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Makefile.am 28 Dec 2006 18:39:57 -0000 1.14
--- Makefile.am 22 Jan 2007 18:18:39 -0000 1.15
***************
*** 1,5 ****
! SUBDIRS = share System Compiler Benchmark UI CBM-PI SupportedBenchmarks
! lib_LTLIBRARIES = libcompbenchmarks.la
bin_PROGRAMS = compbenchmarks-core
--- 1,12 ----
! # -----------------------------------------------------------------------------
! # $Id$
! #
! # This is free software.
! # For details, see the GNU Public License in the COPYING file, or
! # Look http://www.fsf.org
! # -----------------------------------------------------------------------------
!
! SUBDIRS = libcompbenchmarks SupportedBenchmarks CBM-PI
bin_PROGRAMS = compbenchmarks-core
***************
*** 7,25 ****
compbenchmarks_core_SOURCES = cloptions.cpp main.cpp
- libcompbenchmarks_la_SOURCES = libcompbenchmarks.cpp
-
- libcompbenchmarks_la_LIBADD = System/libSystem.la \
- Compiler/libCompiler.la \
- Benchmark/libBenchmark.la \
- UI/libUI.la
- # -lwwwcore -lwwwapp -lwwwinit # !!!
-
- libcompbenchmarks_la_DEPENDENCIES = $(libcompbenchmarks_la_LIBADD)
-
- libcompbenchmarksinclude_HEADERS = libcompbenchmarks.h config.h CBM.h
-
libcompbenchmarksincludedir = $(includedir)/compbenchmarks
! compbenchmarks_core_LDADD = libcompbenchmarks.la
noinst_HEADERS = cloptions.h main.h $(libcompbenchmarks_la_SOURCES:.cpp=.h) # !!!
--- 14,20 ----
compbenchmarks_core_SOURCES = cloptions.cpp main.cpp
libcompbenchmarksincludedir = $(includedir)/compbenchmarks
! compbenchmarks_core_LDADD = libcompbenchmarks/libcompbenchmarks.la
noinst_HEADERS = cloptions.h main.h $(libcompbenchmarks_la_SOURCES:.cpp=.h) # !!!
***************
*** 27,31 ****
EXTRA_DIST = compbenchmarks-ui-perl Doxyfile compbenchmarks-ui-perl.1 compbenchmarks-core.pod compbenchmarks-core.1
! INCLUDES = -I $(top_srcdir)
man_MANS = compbenchmarks-ui-perl.1 compbenchmarks-core.1
--- 22,26 ----
EXTRA_DIST = compbenchmarks-ui-perl Doxyfile compbenchmarks-ui-perl.1 compbenchmarks-core.pod compbenchmarks-core.1
! INCLUDES = -I $(top_srcdir)/libcompbenchmarks -I $(top_srcdir)
man_MANS = compbenchmarks-ui-perl.1 compbenchmarks-core.1
Index: configure.in
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/configure.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** configure.in 21 Jan 2007 21:45:08 -0000 1.21
--- configure.in 22 Jan 2007 18:18:39 -0000 1.22
***************
*** 2,6 ****
# Process this file with autoconf to produce a configure script.
! AC_INIT(Benchmark/Benchmark.cpp)
AC_CANONICAL_HOST
--- 2,6 ----
# Process this file with autoconf to produce a configure script.
! AC_INIT(libcompbenchmarks/Benchmark/Benchmark.cpp)
AC_CANONICAL_HOST
***************
*** 8,12 ****
AM_INIT_AUTOMAKE(compbenchmarks, 0.5.0)
! AM_CONFIG_HEADER(config.h)
sys=`uname`
--- 8,12 ----
AM_INIT_AUTOMAKE(compbenchmarks, 0.5.0)
! AM_CONFIG_HEADER(libcompbenchmarks/config.h)
sys=`uname`
***************
*** 255,268 ****
AC_SUBST(CXXFLAGS)
! AC_OUTPUT(share/Makefile
! share/patches/Makefile
! share/system/Makefile
! share/system/cygwin/Makefile
! System/Makefile
! Compiler/Compiler-TCC/Makefile
! Compiler/Compiler-GCC/Makefile
! Compiler/Makefile
! Benchmark/Makefile
! UI/Makefile
SupportedBenchmarks/Makefile
CBM-PI/t/reference/Makefile
--- 255,270 ----
AC_SUBST(CXXFLAGS)
! AC_OUTPUT(libcompbenchmarks/share/Makefile
! libcompbenchmarks/share/patches/Makefile
! libcompbenchmarks/share/system/Makefile
! libcompbenchmarks/share/system/cygwin/Makefile
! libcompbenchmarks/Base/Makefile
! libcompbenchmarks/System/Makefile
! libcompbenchmarks/Compiler/Compiler-TCC/Makefile
! libcompbenchmarks/Compiler/Compiler-GCC/Makefile
! libcompbenchmarks/Compiler/Makefile
! libcompbenchmarks/Makefile
! libcompbenchmarks/Benchmark/Makefile
! libcompbenchmarks/UI/Makefile
SupportedBenchmarks/Makefile
CBM-PI/t/reference/Makefile
|
