summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>2005-08-08 18:16:00 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>2005-08-08 18:16:00 (GMT)
commitc5781c8289ad4abc83073f5b53a20179169eb59c (patch)
tree686e2ca4ff7b4258ad2a93fbb932e05fd981ea5e
parentfbb2dd8545d2fa273e948ee589c05f739d5b0362 (diff)
downloadhdf5-c5781c8289ad4abc83073f5b53a20179169eb59c.zip
hdf5-c5781c8289ad4abc83073f5b53a20179169eb59c.tar.gz
hdf5-c5781c8289ad4abc83073f5b53a20179169eb59c.tar.bz2
[svn-r11214] Purpose:
bug fix Description: Previous commit contained an extra bin (t_chunk_alloc) that is not ready yet. It was a mistake. Removed it.
-rw-r--r--testpar/Makefile.am2
-rw-r--r--testpar/Makefile.in24
2 files changed, 8 insertions, 18 deletions
diff --git a/testpar/Makefile.am b/testpar/Makefile.am
index d1ecb25..92985b8 100644
--- a/testpar/Makefile.am
+++ b/testpar/Makefile.am
@@ -24,7 +24,7 @@ INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/test
# Test programs and scripts. These are our main targets.
#
-TEST_PROG_PARA=t_mpi t_fphdf5 testphdf5 t_chunk_alloc
+TEST_PROG_PARA=t_mpi t_fphdf5 testphdf5
TEST_SCRIPT_PARA=testph5.sh
check_PROGRAMS = $(TEST_PROG_PARA)
diff --git a/testpar/Makefile.in b/testpar/Makefile.in
index 1f2a169..0cb208d 100644
--- a/testpar/Makefile.in
+++ b/testpar/Makefile.in
@@ -29,7 +29,7 @@
#
# hdf5 Parallel Library Test Makefile(.in)
#
-SOURCES = t_chunk_alloc.c t_fphdf5.c t_mpi.c $(testphdf5_SOURCES)
+SOURCES = t_fphdf5.c t_mpi.c $(testphdf5_SOURCES)
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -65,18 +65,12 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/H5config.h
CONFIG_CLEAN_FILES = testph5.sh
-am__EXEEXT_1 = t_mpi$(EXEEXT) t_fphdf5$(EXEEXT) testphdf5$(EXEEXT) \
- t_chunk_alloc$(EXEEXT)
-t_chunk_alloc_SOURCES = t_chunk_alloc.c
-t_chunk_alloc_OBJECTS = t_chunk_alloc.$(OBJEXT)
-t_chunk_alloc_LDADD = $(LDADD)
-am__DEPENDENCIES_1 = $(top_builddir)/src/libhdf5.la
-am__DEPENDENCIES_2 = $(top_builddir)/test/libh5test.la
-t_chunk_alloc_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_2)
+am__EXEEXT_1 = t_mpi$(EXEEXT) t_fphdf5$(EXEEXT) testphdf5$(EXEEXT)
t_fphdf5_SOURCES = t_fphdf5.c
t_fphdf5_OBJECTS = t_fphdf5.$(OBJEXT)
t_fphdf5_LDADD = $(LDADD)
+am__DEPENDENCIES_1 = $(top_builddir)/src/libhdf5.la
+am__DEPENDENCIES_2 = $(top_builddir)/test/libh5test.la
t_fphdf5_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
t_mpi_SOURCES = t_mpi.c
t_mpi_OBJECTS = t_mpi.$(OBJEXT)
@@ -99,8 +93,8 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = t_chunk_alloc.c t_fphdf5.c t_mpi.c $(testphdf5_SOURCES)
-DIST_SOURCES = t_chunk_alloc.c t_fphdf5.c t_mpi.c $(testphdf5_SOURCES)
+SOURCES = t_fphdf5.c t_mpi.c $(testphdf5_SOURCES)
+DIST_SOURCES = t_fphdf5.c t_mpi.c $(testphdf5_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -332,7 +326,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test
# Test programs and scripts. These are our main targets.
#
-TEST_PROG_PARA = t_mpi t_fphdf5 testphdf5 t_chunk_alloc
+TEST_PROG_PARA = t_mpi t_fphdf5 testphdf5
TEST_SCRIPT_PARA = testph5.sh
check_SCRIPTS = $(TEST_SCRIPT)
testphdf5_SOURCES = testphdf5.c t_dset.c t_file.c t_mdset.c t_ph5basic.c \
@@ -402,9 +396,6 @@ clean-checkPROGRAMS:
echo " rm -f $$p $$f"; \
rm -f $$p $$f ; \
done
-t_chunk_alloc$(EXEEXT): $(t_chunk_alloc_OBJECTS) $(t_chunk_alloc_DEPENDENCIES)
- @rm -f t_chunk_alloc$(EXEEXT)
- $(LINK) $(t_chunk_alloc_LDFLAGS) $(t_chunk_alloc_OBJECTS) $(t_chunk_alloc_LDADD) $(LIBS)
t_fphdf5$(EXEEXT): $(t_fphdf5_OBJECTS) $(t_fphdf5_DEPENDENCIES)
@rm -f t_fphdf5$(EXEEXT)
$(LINK) $(t_fphdf5_LDFLAGS) $(t_fphdf5_OBJECTS) $(t_fphdf5_LDADD) $(LIBS)
@@ -421,7 +412,6 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_chunk_alloc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_coll_chunk.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_dset.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_file.Po@am__quote@