Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv7467
Modified Files:
Makefile.am
Log Message:
Build process now follows more closely automake principles.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.am 21 Jan 2007 21:31:58 -0000 1.5
--- Makefile.am 21 Jan 2007 21:41:04 -0000 1.6
***************
*** 1,2 ****
--- 1,6 ----
+ lib_LTLIBRARIES = libCBM.la
+
+ libCBM_la_SOURCES = Glue.cpp CBM_wrap.cxx
+
SUBDIRS = t
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/CBM-PI -I.. -I.
***************
*** 11,32 ****
inst_pkgdatadir=@datarootdir@/compbenchmarks/@VERSION@/perl
! Glue.o: $(top_srcdir)/CBM-PI/Glue.cpp
! $(CXX) $(INCLUDES) -c $< -o $@
$(top_srcdir)/CBM-PI/CBM.pm: CBM.i
swig -c++ $(INCLUDES) -Wall -proxy -perl $<
! CBM.o: $(top_srcdir)/CBM-PI/CBM.pm
! $(CXX) $(INCLUDES) -c $(top_srcdir)/CBM-PI/CBM_wrap.cxx `$(PERL) -MExtUtils::Embed -e ccopts`
../libcompbenchmarks.la:
make -C .. libcompbenchmarks.la
! CBM.so: CBM.o Glue.o ../libcompbenchmarks.la
! ld -G CBM_wrap.o Glue.o -o CBM.so -L ../.libs -lcompbenchmarks
test:
@CBM_PROG_MAKE@ -C t test
all-local: CBM.so
--- 15,37 ----
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 $<
! AM_CXXFLAGS = `$(PERL) -MExtUtils::Embed -e ccopts`
../libcompbenchmarks.la:
make -C .. libcompbenchmarks.la
! libCBM_la_LIBADD = ../libcompbenchmarks.la
test:
@CBM_PROG_MAKE@ -C t test
+ CBM.so: libCBM.la
+ rm CBM.so; ln -s .libs/libCBM.so CBM.so
+
all-local: CBM.so
|
