diff options
Diffstat (limited to 'src/GNUmakefile')
| -rw-r--r-- | src/GNUmakefile | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/GNUmakefile b/src/GNUmakefile index b9fcc49..92ce0fc 100644 --- a/src/GNUmakefile +++ b/src/GNUmakefile @@ -4,9 +4,17 @@ # # http://amira.zib.de/make/ # -# $Revision: 1.1.1.1 $ -# $Date: 2000-09-13 13:49:09 $ +# $Revision: 1.2 $ +# $Date: 2004-08-30 16:55:16 $ # $Log: not supported by cvs2svn $ +# Revision 1.6 2003/07/16 14:46:47 werner +# Adjusted flags to make optional use of an external HDF5Open call, which is +# bundled into an `hdf5wrap' library. It is used in the context of Amira to +# enable globus/remote HDF5 for an existing binary without recompiling. +# +# Revision 1.5 2003/02/13 21:14:49 werner +# Adjusted makefile to new Amira CVS structure. Doesn't influence anyone else. +# # Revision 1.4 2000/05/29 14:06:11 werner # Using VPATH instead of PWD is much saver. # @@ -53,10 +61,14 @@ RULEFILE = $(shell if [ -r $(VPATH)../GNUmakefile.rules ] ; then echo $(VPATH).. include $(RULEFILE) CXXFLAGS += $(hdf5_FLAGS) $(hdf4_FLAGS) -I$(VPATH)./ -LIBS += $(hdf5_LIB) $(hdf4_LIB) -lm +LIBS += $(hdf5_LIB) $(hdf4_LIB) -lm $(hdf5wrap_LIB) # # Add a variable to the makefile configuration # +ifdef AMIRA_NUMREL +TARGET_FLAGS=-I$$(MAKE_LOCAL)/src/numrel/FlexIO -I$$(MAKE_ROOT)/src/numrel/FlexIO $(hdf5_FLAGS) $(hdf4_FLAGS) +else TARGET_FLAGS=-I$$(MAKE_LOCAL)/external/FlexIO -I$$(MAKE_ROOT)/external/FlexIO $(hdf5_FLAGS) $(hdf4_FLAGS) +endif |