diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2002-02-15 16:02:41 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2002-02-15 16:02:41 (GMT) |
| commit | 7b3df5b3f4bee819277e8a72e208437eb6ed5f26 (patch) | |
| tree | 91585d7fb5e956b925e1bebf0994a36fa090424a | |
| parent | f28193d92c629b8f6b311c55a02d3672b30fe7ec (diff) | |
| download | hdf5-7b3df5b3f4bee819277e8a72e208437eb6ed5f26.zip hdf5-7b3df5b3f4bee819277e8a72e208437eb6ed5f26.tar.gz hdf5-7b3df5b3f4bee819277e8a72e208437eb6ed5f26.tar.bz2 | |
[svn-r4976] Purpose:
Feature
Description:
Change examples to use the installed h5cc to compile the examples
programs. That will test the correctness of the installed software.
Removed examples from make targets in the top level so that it does
not get invoked in make or make check since one cannot compile
the example programs until after "make install" has completed.
Platforms tested:
eirene and modi4 (parallel)
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | examples/Makefile.in | 32 |
2 files changed, 17 insertions, 17 deletions
diff --git a/Makefile.in b/Makefile.in index e0be549..c275988 100644 --- a/Makefile.in +++ b/Makefile.in @@ -62,7 +62,7 @@ lib progs check test _test uninstall: done tests TAGS dep depend: - @@SETX@; for d in $(SUBDIRS) perform examples; do \ + @@SETX@; for d in $(SUBDIRS) perform; do \ (cd $$d && $(MAKE) $@) || exit 1; \ done diff --git a/examples/Makefile.in b/examples/Makefile.in index 8010245..f4f6da8 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -11,10 +11,10 @@ srcdir=@srcdir@ EXAMPLEDIR=$(docdir)/hdf5/examples/c -## Add include directory to the C preprocessor flags and the hdf5 library -## to the library list. -CPPFLAGS=-I. -I$(srcdir) -I../src -I$(top_srcdir)/src @CPPFLAGS@ -LIBHDF5=../src/libhdf5.la +## Replace building CC with the just installed h5cc +CC=$(bindir)/h5cc +CPPFLAGS=-I. -I$(srcdir) +CFLAGS= ## These are the programs that `make all' or `make tests' will build and which ## `make check' will run. List them in the order they should be run. @@ -40,39 +40,39 @@ EXAMPLE_PROGS=$(TEST_SRC) ## How to build the programs... they all depend on the hdf5 library $(TEST_PROGS) $(TEST_PROGS_PARA): $(LIBHDF5) h5_chunk_read: h5_chunk_read.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5_chunk_read.lo $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(CC) $(CPPFLAGS) -o $@ h5_chunk_read.lo h5_compound: h5_compound.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5_compound.lo $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(CC) $(CPPFLAGS) -o $@ h5_compound.lo h5_extend_write: h5_extend_write.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5_extend_write.lo $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(CC) $(CPPFLAGS) -o $@ h5_extend_write.lo h5_group: h5_group.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5_group.lo $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(CC) $(CPPFLAGS) -o $@ h5_group.lo h5_write: h5_write.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5_write.lo $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(CC) $(CPPFLAGS) -o $@ h5_write.lo h5_read: h5_read.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5_read.lo $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(CC) $(CPPFLAGS) -o $@ h5_read.lo h5_select: h5_select.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5_select.lo $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(CC) $(CPPFLAGS) -o $@ h5_select.lo h5_attribute: h5_attribute.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5_attribute.lo $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(CC) $(CPPFLAGS) -o $@ h5_attribute.lo h5_mount: h5_mount.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5_mount.lo $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(CC) $(CPPFLAGS) -o $@ h5_mount.lo h5_reference: h5_reference.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5_reference.lo $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(CC) $(CPPFLAGS) -o $@ h5_reference.lo h5_drivers: h5_drivers.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5_drivers.lo $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(CC) $(CPPFLAGS) -o $@ h5_drivers.lo ph5example: ph5example.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ $@.lo $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(CC) $(CPPFLAGS) -o $@ $@.lo @CONCLUDE@ |