summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>1998-07-02 00:21:15 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>1998-07-02 00:21:15 (GMT)
commit00366fcd9638029db89d3cfe76030accae67528a (patch)
treebfb9289c940c4696a331eae93274d6718851d0b4
parent227aeb2c8b04d190874a099d1c0aa94afea8923f (diff)
downloadhdf5-00366fcd9638029db89d3cfe76030accae67528a.zip
hdf5-00366fcd9638029db89d3cfe76030accae67528a.tar.gz
hdf5-00366fcd9638029db89d3cfe76030accae67528a.tar.bz2
[svn-r442] MPIO library maintained by William M. Davidson (wmdavid) has been
changed to use system supported MPI library. The path to it is changed slightly too. Updated all the paths variables. Also updated to reflect the new program source files structure. Platform tested: Intel Red
-rw-r--r--testpar/Makefile.ascired23
1 files changed, 9 insertions, 14 deletions
diff --git a/testpar/Makefile.ascired b/testpar/Makefile.ascired
index 9d3758c..4906b87 100644
--- a/testpar/Makefile.ascired
+++ b/testpar/Makefile.ascired
@@ -6,14 +6,14 @@
# Programs
SHELL=/bin/sh
-MPICH=/usr/community/mpi-io/romio/mpich_1.1.0
+MPICH=
ROMIO=/usr/community/mpi-io/romio/current
# MPI include directories and libs
-MPI_INC=-I$(MPICH)/include
-MPI_LIBS=$(MPICH)/lib/tflops/ptls/libmpi.a
+MPI_INC=
+MPI_LIBS=-lmpi
MPIO_INC=-I$(ROMIO)/include
-MPIO_LIBS=$(ROMIO)/lib/tflops/libmpio.a
+MPIO_LIBS=$(ROMIO)/lib/tflop/libmpio.a
RUN=yod -sz 8
RUNSEQ=yod -sz 1
@@ -30,22 +30,22 @@ MOSTLYCLEAN=/pfs/multi/tmp_1/your_own/Eg1.h5f /pfs/multi/tmp_1/your_own/Eg2.h5f
DISTCLEAN=go
# The default is to build the library and programs.
-all: testphdf5 shdf5
+all: progs
# These are our main targets. They should be listed in the order to be
# executed, generally most specific tests to least specific tests.
-PROGS=testphdf5 shdf5
+PROGS=testphdf5
TESTS=$(PROGS)
# Source and object files for programs... The PROG_SRC list contains all the
# source files and is used for things like dependencies, archiving, etc. The
# other source lists are for the individual tests, the files of which may
# overlap with other tests.
-PROG_SRC=testphdf5.c shdf5.c
+PROG_SRC=testphdf5.c t_dset.c t_file.c
PROG_OBJ=$(PROG_SRC:.c=.o)
-TESTPHDF5_SRC=testphdf5.c
+TESTPHDF5_SRC=testphdf5.c t_dset.c t_file.c
TESTPHDF5_OBJ=$(TESTPHDF5_SRC:.c=.o)
# Private header files (not to be installed)...
@@ -55,10 +55,6 @@ PRIVATE_HDR=testhdf5.h
testphdf5: $(TESTPHDF5_OBJ) ../src/libhdf5.a
$(CC) $(CFLAGS) -o $@ $(TESTPHDF5_OBJ) ../src/libhdf5.a $(MPIO_LIBS) $(MPI_LIBS) $(LIBS)
-shdf5: testphdf5.c ../src/libhdf5.a
- cp testphdf5.c shdf5.c
- $(CC) -UHAVE_PARALLEL $(CFLAGS) $(CPPFLAGS) -o $@ $@.c ../src/libhdf5.a $(MPIO_LIBS) $(MPI_LIBS) $(LIBS)
-
#------------------------------------------------------------- -*- makefile -*-
# The following section of this makefile comes from the
@@ -72,7 +68,6 @@ progs: $(PROGS)
# Runs each test in order, passing $(TEST_FLAGS) to the program.
test: $(PROGS)
$(RUN) testphdf5
- $(RUNSEQ) shdf5
# Removes temporary files without removing the final target files. That is,
# remove things like object files but not libraries or executables.
@@ -104,7 +99,7 @@ distclean: clean
maintainer-clean: distclean
# Implicit rules
-.c.o:
+.c.o: testphdf5.h
$(CC) $(CFLAGS) $(CPPFLAGS) -c $<