diff --git a/.gitattributes b/.gitattributes index c0eccdc..ea55f5f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,7 +4,6 @@ /ChangeLog -text /GNUmakefile.orig -text /Makefile.am -text -/Makefile.orig -text /NEWS -text /README -text /autogen.sh -text diff --git a/Makefile.orig b/Makefile.orig deleted file mode 100755 index 883418f..0000000 --- a/Makefile.orig +++ /dev/null @@ -1,59 +0,0 @@ - -# This is a very rudimentary multiarchitecture makefile -# You need to uncomment the default block of make variables you need -# Some key things to watch for are the following defines -# -DREGRESSIONTEST : enables a main(){} inside of -# the H5Part.cc file that does simple regression testing. -# -DPARALLEL_IO : If you want to use parallel HDF5, you have to -# enable this. Otherwise, you get only the serial -# implementation of the library. - -# MacOS-X Serial -#CXX = c++ -#CC = cc -#F90 = xlf -#H5HOME = /usr/local -#CFLAGS = -O -g -I$(H5HOME)/include -#LDFLAGS = -L$(H5HOME)/lib -lhdf5 -lz -lm - -# AIX/SP-2 Parallel : Seaborg -#CXX = mpCC_r -#CC = mpcc_r -#F90 = mpxlf -#H5HOME = /usr/common/usg/hdf5/1.4.4/parallel -#H4HOME = /usr/common/usg/hdf/default -#OPT = -qarch=auto -qtune=auto-qcache=auto -O3 -qhot -#CFLAGS = -g -bmaxdata:800000000 -bmaxstack:256000000 -I$(H5HOME)/include -#LDFLAGS = -L$(H5HOME)/lib -lhdf5 -L$(H4HOME)/lib -lz -lm - -# Linux Serial -#CXX = g++ -#CC = gcc -#F90 = g77 # or could be pgif90 -#CFLAGS = -O -g -I$(H5HOME)/include -#LDFLAGS = -L$(H5HOME)/lib -lhdf5 -lz -lm - -# Linux Jacquard -CC = mpicc -CXX = mpicxx -F90 = mpif90 -H5HOME = /usr/common/usg/hdf5/1.6.3/parallel -CFLAGS = -O2 -DPARALLEL_IO -DH5_HAVE_PARALLEL -I$(H5HOME)/include -LDFLAGS = -L$(H5HOME)/lib -lhdf5 -lz -lm - -# Linux Parallel -#CC = gcc -#CXX = g++ -#F90 = g77 -#H5HOME = /usr/local -# /usr/common/usg/hdf5/1.6.3/parallel -#MPIHOME = /usr/local -#CFLAGS = -O -g -DPARALLEL_IO -DH5_HAVE_PARALLEL -I$(H5HOME)/include -#LDFLAGS = -L$(H5HOME)/lib -lhdf5 -lmpich -lrt -lz -lm - -all: H5PartTest H5PartTest.o H5Part.o -parallel: H5PartTest H5PartTest.o H5Part.o H5PartTestParallel H5PartAndreasTest # parallel regression tests -fortran: H5PartF.o # fortran bindings - -include rules.make -