[Compbench-devel] CompBenchmarks++/CBM-PI Makefile.am,1.12,1.13

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

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

Modified Files:
	Makefile.am 
Log Message:
libxml2 flags now defined by configure.in
-shadow option added for swig.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Makefile.am	25 Jan 2007 20:39:25 -0000	1.12
--- Makefile.am	26 Jan 2007 13:03:04 -0000	1.13
***************
*** 39,46 ****
  
  $(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 $<
  
  AM_CXXFLAGS = `$(PERL) -MExtUtils::Embed -e ccopts`
--- 39,46 ----
  
  $(top_srcdir)/CBM-PI/CBM_wrap.cxx: CBM.i $(CBMPI_DEP_H)
! 	swig -c++ $(INCLUDES) -Wall -proxy -shadow -perl $<
  
  $(top_srcdir)/CBM-PI/CBM.pm: CBM.i $(CBMPI_DEP_H)
! 	swig -c++ $(INCLUDES) -Wall -proxy -shadow -perl $<
  
  AM_CXXFLAGS = `$(PERL) -MExtUtils::Embed -e ccopts`
***************
*** 48,54 ****
  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`
  
  test:
--- 48,52 ----
  libCBM_la_LIBADD	= ../libcompbenchmarks/libcompbenchmarks.la
  
! INCLUDES		=	-I$(top_srcdir)/libcompbenchmarks -I$(top_srcdir) @XML_CPPFLAGS@
  
  test: