Commit be103949 authored by Marc Howison's avatar Marc Howison

new build system for both H5hut and H5Part; preparing 1.6.3 release of H5Part

parent df552265
......@@ -15,7 +15,6 @@ aclocal $ACLOCAL_FLAGS || {
echo
echo
echo
echo
echo "+ running autoheader ... "
autoheader || {
echo
......@@ -25,6 +24,15 @@ autoheader || {
echo
echo
echo
echo "+ running libtoolize ... "
libtoolize --force || {
echo
echo "libtoolize failed"
exit 1
}
echo
echo
echo
echo "+ running autoconf ... "
autoconf || {
echo
......
This diff is collapsed.
......@@ -2,14 +2,13 @@
OBJEXT=o
LIBS = @LIBS@
INCLUDES = -I../include @INCLUDES@
# What to build... Will be determined by configure script.
lib_LIBRARIES = @LIB_C@
lib_LTLIBRARIES = @LIB_C@
# Listing of all possible targets that I may build.
EXTRA_LIBRARIES = ../lib/libH5hutC.a
EXTRA_LTLIBRARIES = libH5hutC.la
# Header files that I wish to install in $(prefix)/include
include_HEADERS = \
......@@ -31,7 +30,7 @@ include_HEADERS = \
EXTRA_HEADERS =
# Listing of sources
___lib_libH5hutC_a_SOURCES = \
libH5hutC_la_SOURCES = \
H5.c \
H5_attribs.c \
H5_attachments.c \
......@@ -39,6 +38,8 @@ ___lib_libH5hutC_a_SOURCES = \
H5Block.c \
H5Block_readwrite.c
libH5hutC_la_LDFLAGS = -version-info 2:0:0 -rpath '$(libdir)'
all: all-am
clean: clean-am
......
......@@ -2,7 +2,6 @@
OBJEXT=o
LIBS = @LIBS@
INCLUDES = -I../include @INCLUDES@
F90_FILES = H5.f90 \
......@@ -23,19 +22,21 @@ EXTRA_DIST = TestUnderscoreC.c \
nodist_include_HEADERS = ../include/H5hutF.h
# What to build... Will be determined by configure script.
lib_LIBRARIES = @LIB_FORTRAN@
lib_LTLIBRARIES = @LIB_FORTRAN@
# Listing of all possible targets that I may build.
EXTRA_LIBRARIES = ../lib/libH5hutF.a
EXTRA_LTLIBRARIES = libH5hutF.la
___lib_libH5hutF_a_SOURCES = \
libH5hutF_la_SOURCES = \
H5_F.c \
H5_attribs_F.c \
H5Part_F.c \
H5Block_F.c \
H5Block_readwrite_F.c
___lib_libH5hutF_a_DEPENDENCIES = ../include/H5hutF.h
libH5hutF_la_DEPENDENCIES = ../include/H5hutF.h
libH5hutF_la_LDFLAGS = -version-info 2:0:0 -rpath '$(libdir)'
../include/H5hutF.h: $(F90_FILES)
awk '/INTEGER\*8 FUNCTION/{print "\t" $$1 " " $$3}' $^ >$@
......
......@@ -2,7 +2,6 @@
OBJEXT=o
LIBS = @LIBS@
INCLUDES = -I../include @INCLUDES@
EXTRA_HEADERS = \
......@@ -69,13 +68,10 @@ EXTRA_HEADERS = \
EXTRA_DIST = $(EXTRA_HEADERS)
# What to build... Will be determined by configure script.
lib_LIBRARIES = ../lib/libH5hut.a
# Listing of all possible targets that I may build.
EXTRA_LIBRARIES = ../lib/libH5hut.a
lib_LTLIBRARIES = libH5hut.la
# Listing of sources
___lib_libH5hut_a_SOURCES = \
libH5hut_la_SOURCES = \
h5_attach.c \
h5_attribs.c \
h5_errorhandling.c \
......@@ -118,7 +114,9 @@ ___lib_libH5hut_a_SOURCES = \
h5t_store_trim.c \
h5t_tags.c
___lib_libH5hut_a_DEPENDENCIES = $(EXTRA_HEADERS)
libH5hut_la_DEPENDENCIES = $(EXTRA_HEADERS)
libH5hut_la_LDFLAGS = -version-info 2:0:0
all: all-am
......
......@@ -5,9 +5,6 @@ SUBDIRS = H5Fed
OBJEXT=o
AM_LDFLAGS = -L../src/lib @LDFLAGS@
LIBS = -lH5hutC -lH5hut @LIBS@
INCLUDES = -I../src/include @INCLUDES@
noinst_PROGRAMS = @BUILD_TESTS@
......@@ -25,6 +22,10 @@ h5u_test_SOURCES = \
testframe.h \
params.h
h5u_test_LDADD = \
../src/h5core/libH5hut.la \
../src/C/libH5hutC.la
h5b_test_SOURCES = \
h5b_test.c \
h5b_write.c \
......@@ -33,16 +34,16 @@ h5b_test_SOURCES = \
testframe.h \
params.h
h5b_test_DEPENDENCIES = \
../src/lib/libH5hut.a \
../src/lib/libH5hutC.a
h5b_test_LDADD = \
../src/h5core/libH5hut.la \
../src/C/libH5hutC.la
h5_attach_test_SOURCES = \
h5_attach_test.c
h5_attach_test_DEPENDENCIES = \
../src/h5core/libH5hut.a \
../src/C/libH5hutC.a
h5_attach_test_LDADD = \
../src/h5core/libH5hut.la \
../src/C/libH5hutC.la
clean: clean-am
rm -f *.h5
......
......@@ -212,10 +212,16 @@ test_read_data64(h5_file_t *file, int nparticles, int step)
val = H5PartGetNumParticles(file);
IVALUE(val, 4, "particle count");
x[0] = 0;
x[1] = 0;
x[2] = 0;
x[3] = 0;
status = H5PartReadDataFloat64(file, "x", x);
RETURN(status, H5_SUCCESS, "H5PartReadDataFloat64");
FVALUE(x[3], (double)(rank*2+3+nparticles*t), "x data");
FVALUE(x[0], (double)(2*rank+0+nparticles*t), "x data");
FVALUE(x[1], (double)(2*rank+3+nparticles*t), "x data");
FVALUE(x[2], (double)(2*rank+9+nparticles*t), "x data");
FVALUE(x[3], (double)(2*rank+7+nparticles*t), "x data");
val = H5PartGetNumParticles(file);
IVALUE(val, 4, "particle count");
......@@ -347,7 +353,7 @@ test_read_data32(h5_file_t *file, int nparticles, int step)
RETURN(status, H5_SUCCESS, "H5PartSetCanonicalView");
test_read_step_attribs(file, t);
return;
status = H5PartReadDataFloat32(file, "x", x);
RETURN(status, H5_SUCCESS, "H5PartReadDataFloat32");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment