summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Wendling <wendling@ncsa.uiuc.edu>2003-06-05 22:16:57 (GMT)
committerBill Wendling <wendling@ncsa.uiuc.edu>2003-06-05 22:16:57 (GMT)
commitad76468b3e5b91cac0d5b177c1e125431a9498d6 (patch)
treeec70dab26e5f040ba967bd119fcc5f58f12147c8
parentbb79a09646de07809663dc694fe906edb6c4b9df (diff)
downloadhdf5-ad76468b3e5b91cac0d5b177c1e125431a9498d6.zip
hdf5-ad76468b3e5b91cac0d5b177c1e125431a9498d6.tar.gz
hdf5-ad76468b3e5b91cac0d5b177c1e125431a9498d6.tar.bz2
[svn-r6981] Purpose:
Utility Addition Description: Added h5c++ script file to compile HDF5 C++ applications. Modified so that these are compiled only during a make check-install action and then only with the h5c++ script. Platforms tested: Verbena (Fortran & C++) Arabica (Fortran & C++) Modi4 (Fortran & Parallel) Misc. update:
-rw-r--r--c++/examples/Makefile.in40
1 files changed, 19 insertions, 21 deletions
diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in
index 8c08e2e..a3e8de1 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -21,16 +21,14 @@ srcdir=@srcdir@
@COMMENCE@
+## Replace building CC with the just installed h5cc
+CXX=$(bindir)/h5c++
+CPPFLAGS=-I. -I$(srcdir)
+CFLAGS=
+
hdf5_srcdir=$(top_srcdir)/src
hdf5_builddir=$(top_builddir)/src
-## Add include directory to the cpp preprocessor flags
-CPPFLAGS=-I. -I../src -I$(srcdir)/../src -I$(hdf5_builddir) -I$(hdf5_srcdir) @CPPFLAGS@
-
-## Add the C++ API library and the hdf5 library to the library lists
-LIB=../src/libhdf5_cpp.la
-LIBHDF5=$(hdf5_builddir)/libhdf5.la
-
## List all source files here. The list of object files will be
## created by replacing the `.cpp' with a `.lo'. This list is necessary
## for building automatic dependencies.
@@ -54,25 +52,25 @@ CLEAN=
## How to build the programs... they all depend on the Fortran & C hdf5 libraries
$(TEST_PROGS): $(LIB) $(LIBHDF5)
-compound: compound.lo
- @$(LT_LINK_EXE) $(CXXFLAGS) -o $@ compound.lo $(LDFLAGS) $(LIB) $(LIBS) $(LIBHDF5) $(DEFAULT_LIBS)
+compound: $(srcdir)/compound.cpp
+ $(CXX) $(CPPFLAGS) -o $@ $<
-h5group: h5group.lo
- @$(LT_LINK_EXE) $(CXXFLAGS) -o $@ h5group.lo $(LDFLAGS) $(LIB) $(LIBS) $(LIBHDF5) $(DEFAULT_LIBS)
+h5group: $(srcdir)/h5group.cpp
+ $(CXX) $(CPPFLAGS) -o $@ $<
-create: create.lo
- @$(LT_LINK_EXE) $(CXXFLAGS) -o $@ create.lo $(LDFLAGS) $(LIB) $(LIBS) $(LIBHDF5) $(DEFAULT_LIBS)
+create: $(srcdir)/create.cpp
+ $(CXX) $(CPPFLAGS) -o $@ $<
-readdata: readdata.lo
- @$(LT_LINK_EXE) $(CXXFLAGS) -o $@ readdata.lo $(LDFLAGS) $(LIB) $(LIBS) $(LIBHDF5) $(DEFAULT_LIBS)
+readdata: $(srcdir)/readdata.cpp
+ $(CXX) $(CPPFLAGS) -o $@ $<
-chunks: chunks.lo
- @$(LT_LINK_EXE) $(CXXFLAGS) -o $@ chunks.lo $(LDFLAGS) $(LIB) $(LIBS) $(LIBHDF5) $(DEFAULT_LIBS)
+chunks: $(srcdir)/chunks.cpp
+ $(CXX) $(CPPFLAGS) -o $@ $<
-extend_ds: extend_ds.lo
- @$(LT_LINK_EXE) $(CXXFLAGS) -o $@ extend_ds.lo $(LDFLAGS) $(LIB) $(LIBS) $(LIBHDF5) $(DEFAULT_LIBS)
+extend_ds: $(srcdir)/extend_ds.cpp
+ $(CXX) $(CPPFLAGS) -o $@ $<
-writedata: writedata.lo
- @$(LT_LINK_EXE) $(CXXFLAGS) -o $@ writedata.lo $(LDFLAGS) $(LIB) $(LIBS) $(LIBHDF5) $(DEFAULT_LIBS)
+writedata: $(srcdir)/writedata.cpp
+ $(CXX) $(CPPFLAGS) -o $@ $<
@CONCLUDE@