[Compbench-devel] CompBenchmarks++/CBM-PI Makefile.am,1.9,1.10

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

Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv31675

Modified Files:
	Makefile.am 
Log Message:
More tests.
Directly dependent headers are referenced for module building.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile.am	23 Jan 2007 18:55:22 -0000	1.9
--- Makefile.am	24 Jan 2007 19:33:12 -0000	1.10
***************
*** 14,19 ****
  libCBM_la_DEPENDENCIES =      ../libcompbenchmarks/libcompbenchmarks.la
  
  SUBDIRS		=	t
! INCLUDES	 =	-I$(top_srcdir)/libcompbenchmarks -I$(top_srcdir)/CBM-PI -I.. -I. -I$(top_srcdir)
  
  # LDFLAGS		  =	-L../testing/.libs -lcompbenchmarks
--- 14,29 ----
  libCBM_la_DEPENDENCIES =      ../libcompbenchmarks/libcompbenchmarks.la
  
+ CBMPI_DEP_H      = $(top_srcdir)/libcompbenchmarks/libcompbenchmarks.h \
+ 		 $(top_srcdir)/libcompbenchmarks/System/System.h \
+ 		 $(top_srcdir)/libcompbenchmarks/Benchmark/Package.h \
+ 		 $(top_srcdir)/libcompbenchmarks/Benchmark/Benchmark.h \
+ 		 $(top_srcdir)/libcompbenchmarks/Compiler/Compiler.h \
+ 		 $(top_srcdir)/libcompbenchmarks/Base/XML.h \
+ 		 $(top_srcdir)/libcompbenchmarks/Base/XMLReader.h \
+ 		 $(top_srcdir)/libcompbenchmarks/Base/Config.h \
+ 		 $(top_srcdir)/CBM-PI/Glue.h
+ 
  SUBDIRS		=	t
! # INCLUDES	 =	-I$(top_srcdir)/libcompbenchmarks -I$(top_srcdir)/CBM-PI -I.. -I. -I$(top_srcdir)
  
  # LDFLAGS		  =	-L../testing/.libs -lcompbenchmarks
***************
*** 27,34 ****
  inst_pkgdatadir=@datarootdir@/compbenchmarks/@VERSION@/perl
  
! $(top_srcdir)/CBM-PI/CBM_wrap.cxx: CBM.i
  	swig -c++ $(INCLUDES) -Wall -proxy -perl $<
  
! $(top_srcdir)/CBM-PI/CBM.pm: CBM.i
  	swig -c++ $(INCLUDES) -Wall -proxy -perl $<
  
--- 37,44 ----
  inst_pkgdatadir=@datarootdir@/compbenchmarks/@VERSION@/perl
  
! $(top_srcdir)/CBM-PI/CBM_wrap.cxx: CBM.i $(CBMPI_DEP_H)
  	swig -c++ $(INCLUDES) -Wall -proxy -perl $<
  
! $(top_srcdir)/CBM-PI/CBM.pm: CBM.i $(CBMPI_DEP_H)
  	swig -c++ $(INCLUDES) -Wall -proxy -perl $<
  
***************
*** 37,41 ****
  libCBM_la_LIBADD	= ../libcompbenchmarks/libcompbenchmarks.la
  
! INCLUDES		=	-I $(top_srcdir)/libcompbenchmarks -I/usr/include/libxml2 # !!! $(xml2-config --cflags)
  
  # libBase_la_LIBADD	=	-L/usr/lib -lxml2 # !!! `xml2-config --libs`
--- 47,51 ----
  libCBM_la_LIBADD	= ../libcompbenchmarks/libcompbenchmarks.la
  
! INCLUDES		=	-I$(top_srcdir)/libcompbenchmarks -I$(top_srcdir) -I/usr/include/libxml2 # !!! $(xml2-config --cflags)
  
  # libBase_la_LIBADD	=	-L/usr/lib -lxml2 # !!! `xml2-config --libs`