|
|
Blitz Devel : |
From: Theodore Papadopoulo (Theodore.Papadopoulo_at_[hidden])
Date: 2004-05-03 07:49:26
Contrarily, to what has been assumed in a message (Julian I believe
it was you, but I may be wrong), the $(top_builddir) in several
Makefile.am are useful for people willing to compile in separate
directory !!! Thus they should be put back...
Unless I'm missing something, this patch restores this ability and
has no drawback.. Also, I find compilation of blitz somewhat
complicated by the AC_FC_FREEFORM, AC_FC_SRCEXT autoconf macros,
which just break configuration, are these standard ?? (I upgraded to
the latest autoconf and automake).
Last thing to correct is the building of the documentation when
building in a separate directory. Will try to figure what to do,
unless someone beats me (the problem is getting the images from the
source directory).
Thanks
Theo.
Index: benchmarks/Makefile.am
===================================================================
RCS file: /cvsroot/blitz/blitz/benchmarks/Makefile.am,v
retrieving revision 1.17
diff -c -3 -p -r1.17 Makefile.am
*** benchmarks/Makefile.am 9 Apr 2004 21:41:25 -0000 1.17
--- benchmarks/Makefile.am 3 May 2004 12:29:04 -0000
*************** loop4.cpp loop4f.f loop4f90.f90 loopstru
*** 12,18 ****
makeloops.cpp qcd.txt quinlan.cpp stenciln.cpp tiny3.cpp
! AM_CXXFLAGS = -I$(srcdir) -I$(top_srcdir) @CXX_OPTIMIZE_FLAGS@ @CXXFFLAGS@ @CXXFCFLAG@
AM_FFLAGS = @F77_OPTIMIZE_FLAGS@
LIBS = -L$(top_builddir)/lib -lblitz -lm @BLASLIB@ @FORTLIBS@ @CXX_LIBS@
--- 12,18 ----
makeloops.cpp qcd.txt quinlan.cpp stenciln.cpp tiny3.cpp
! AM_CXXFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) @CXX_OPTIMIZE_FLAGS@ @CXXFFLAGS@ @CXXFCFLAG@
AM_FFLAGS = @F77_OPTIMIZE_FLAGS@
LIBS = -L$(top_builddir)/lib -lblitz -lm @BLASLIB@ @FORTLIBS@ @CXX_LIBS@
*************** ctime:
*** 77,83 ****
@echo Flags: $(CXXFLAGS)
@for benchmark in $(COMPILE_TIME_BENCHMARKS) ; do \
echo Compile time for $$benchmark.cpp: ; \
! time $(CXX) $(AM_CXXFLAGS) $(CXXFLAGS) -c $$benchmark.cpp; \
done
check-benchmarks: run run-loops ctime
--- 77,83 ----
@echo Flags: $(CXXFLAGS)
@for benchmark in $(COMPILE_TIME_BENCHMARKS) ; do \
echo Compile time for $$benchmark.cpp: ; \
! time $(CXX) $(AM_CXXFLAGS) $(CXXFLAGS) -c $(srcdir)/$$benchmark.cpp; \
done
check-benchmarks: run run-loops ctime
Index: doc/examples/Makefile.am
===================================================================
RCS file: /cvsroot/blitz/blitz/doc/examples/Makefile.am,v
retrieving revision 1.8
diff -c -3 -p -r1.8 Makefile.am
*** doc/examples/Makefile.am 9 Apr 2004 20:08:17 -0000 1.8
--- doc/examples/Makefile.am 3 May 2004 12:29:04 -0000
***************
*** 4,10 ****
EXTRA_DIST = fixed-class.cpp fixed-point.h makefile.example io.data
! AM_CXXFLAGS = -I$(srcdir) -I$(top_srcdir) @CXX_DEBUG_FLAGS@
LDADD = -L$(top_builddir)/lib -lblitz
EXAMPLES = simple storage outer strideslice slicing debug output io dump xor \
--- 4,10 ----
EXTRA_DIST = fixed-class.cpp fixed-point.h makefile.example io.data
! AM_CXXFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) @CXX_DEBUG_FLAGS@
LDADD = -L$(top_builddir)/lib -lblitz
EXAMPLES = simple storage outer strideslice slicing debug output io dump xor \
Index: doc/stencils/Makefile.am
===================================================================
RCS file: /cvsroot/blitz/blitz/doc/stencils/Makefile.am,v
retrieving revision 1.11
diff -c -3 -p -r1.11 Makefile.am
*** doc/stencils/Makefile.am 9 Apr 2004 20:06:38 -0000 1.11
--- doc/stencils/Makefile.am 3 May 2004 12:29:04 -0000
***************
*** 4,10 ****
EXTRA_DIST = dump-stencil.cpp
! AM_CXXFLAGS = -I$(srcdir) -I$(top_srcdir)
LDADD = -L$(top_builddir)/lib -lblitz -lm
COMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--- 4,10 ----
EXTRA_DIST = dump-stencil.cpp
! AM_CXXFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
LDADD = -L$(top_builddir)/lib -lblitz -lm
COMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
*************** LTCXXCOMPILE = $(LIBTOOL) --mode=link $(
*** 16,34 ****
%2D.texi :
$(LTCXXCOMPILE) "-Dstenciltoapply=$(patsubst %.texi,%,$@)(A)" \
-o $(patsubst %.cpp,%,$<) $< $(LDADD)
! ./$(patsubst %.cpp,%,$<) > $@ 2>&1
-rm -f $(patsubst %.cpp,%,$<)
%2D4.texi :
$(LTCXXCOMPILE) "-Dstenciltoapply=$(patsubst %.texi,%,$@)(A)" \
-o $(patsubst %.cpp,%,$<) $< $(LDADD)
! ./$(patsubst %.cpp,%,$<) > $@ 2>&1
-rm -f $(patsubst %.cpp,%,$<)
%.texi :
$(LTCXXCOMPILE) "-Dstenciltoapply=$(patsubst %.texi,%,$@)(A,1)" \
-o $(patsubst %.cpp,%,$<) $< $(LDADD)
! ./$(patsubst %.cpp,%,$<) > $@ 2>&1
-rm -f $(patsubst %.cpp,%,$<)
central12.texi: dump-stencil.cpp
--- 16,34 ----
%2D.texi :
$(LTCXXCOMPILE) "-Dstenciltoapply=$(patsubst %.texi,%,$@)(A)" \
-o $(patsubst %.cpp,%,$<) $< $(LDADD)
! $(patsubst %.cpp,%,$<) > $@ 2>&1
-rm -f $(patsubst %.cpp,%,$<)
%2D4.texi :
$(LTCXXCOMPILE) "-Dstenciltoapply=$(patsubst %.texi,%,$@)(A)" \
-o $(patsubst %.cpp,%,$<) $< $(LDADD)
! $(patsubst %.cpp,%,$<) > $@ 2>&1
-rm -f $(patsubst %.cpp,%,$<)
%.texi :
$(LTCXXCOMPILE) "-Dstenciltoapply=$(patsubst %.texi,%,$@)(A,1)" \
-o $(patsubst %.cpp,%,$<) $< $(LDADD)
! $(patsubst %.cpp,%,$<) > $@ 2>&1
-rm -f $(patsubst %.cpp,%,$<)
central12.texi: dump-stencil.cpp
Index: examples/Makefile.am
===================================================================
RCS file: /cvsroot/blitz/blitz/examples/Makefile.am,v
retrieving revision 1.13
diff -c -3 -p -r1.13 Makefile.am
*** examples/Makefile.am 9 Apr 2004 20:09:21 -0000 1.13
--- examples/Makefile.am 3 May 2004 12:29:04 -0000
***************
*** 4,10 ****
EXTRA_DIST = stencil4.f profile.cpp tiny2.cpp tiny3.cpp
! AM_CXXFLAGS = -I$(srcdir) -I$(top_srcdir)
LDADD = -L$(top_builddir)/lib -lblitz
EXTRA_PROGRAMS = array cartesian cast cfd complex-test convolve curldiv \
--- 4,10 ----
EXTRA_DIST = stencil4.f profile.cpp tiny2.cpp tiny3.cpp
! AM_CXXFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
LDADD = -L$(top_builddir)/lib -lblitz
EXTRA_PROGRAMS = array cartesian cast cfd complex-test convolve curldiv \
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/blitz/blitz/lib/Makefile.am,v
retrieving revision 1.11
diff -c -3 -p -r1.11 Makefile.am
*** lib/Makefile.am 9 Apr 2004 20:10:13 -0000 1.11
--- lib/Makefile.am 3 May 2004 12:29:04 -0000
***************
*** 4,10 ****
EXTRA_DIST = readme.txt
! AM_CXXFLAGS = -I$(srcdir) -I$(top_srcdir)
lib_LTLIBRARIES = libblitz.la
libblitz_la_SOURCES = $(top_srcdir)/src/globals.cpp
--- 4,10 ----
EXTRA_DIST = readme.txt
! AM_CXXFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
lib_LTLIBRARIES = libblitz.la
libblitz_la_SOURCES = $(top_srcdir)/src/globals.cpp
Index: testsuite/Makefile.am
===================================================================
RCS file: /cvsroot/blitz/blitz/testsuite/Makefile.am,v
retrieving revision 1.10
diff -c -3 -p -r1.10 Makefile.am
*** testsuite/Makefile.am 9 Apr 2004 20:09:46 -0000 1.10
--- testsuite/Makefile.am 3 May 2004 12:29:04 -0000
***************
*** 6,12 ****
EXTRA_DIST = testsuite.h
! AM_CXXFLAGS = -I$(srcdir) -I$(top_srcdir) @CXX_DEBUG_FLAGS@
LDADD = -L$(top_builddir)/lib -lblitz
EXTRA_PROGRAMS = Adnene-Ben-Abdallah-1 Adnene-Ben-Abdallah-2 arrayresize \
--- 6,12 ----
EXTRA_DIST = testsuite.h
! AM_CXXFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) @CXX_DEBUG_FLAGS@
LDADD = -L$(top_builddir)/lib -lblitz
EXTRA_PROGRAMS = Adnene-Ben-Abdallah-1 Adnene-Ben-Abdallah-2 arrayresize \
--------------------------------------------------------------------
Theodore Papadopoulo
Email: Theodore.Papadopoulo_at_[hidden] Tel: (33) 04 92 38 76 01
--------------------------------------------------------------------