diff options
| author | tradke <tradke@21a6bef8-4479-4f54-8f8d-0db94a2919ef> | 2003-06-17 09:28:50 +0000 |
|---|---|---|
| committer | tradke <tradke@21a6bef8-4479-4f54-8f8d-0db94a2919ef> | 2003-06-17 09:28:50 +0000 |
| commit | 7d93b7392428b8c9fc4a19e0370a4ad991da3f2b (patch) | |
| tree | 5e0b37bf31a7b97970d83a8f45d1f830a9c9b099 | |
| parent | 3d986cc1591a8eb5646f2c5cd4045609aa69df21 (diff) | |
Added ioconvert to the utility programs to be build from FlexIO.
git-svn-id: http://svn.cactuscode.org/arrangements/CactusExternal/FlexIO/trunk@36 21a6bef8-4479-4f54-8f8d-0db94a2919ef
| -rw-r--r-- | src/make.configuration.defn | 2 | ||||
| -rw-r--r-- | src/make.configuration.deps | 19 |
2 files changed, 15 insertions, 6 deletions
diff --git a/src/make.configuration.defn b/src/make.configuration.defn index c502b3f..6b9c087 100644 --- a/src/make.configuration.defn +++ b/src/make.configuration.defn @@ -1,4 +1,4 @@ # make.configuration.defn for FlexIO # add the ioinfo program to the Cactus utitlity tools -ALL_UTILS += ioinfo +ALL_UTILS += ioinfo ioconvert diff --git a/src/make.configuration.deps b/src/make.configuration.deps index 83f7e43..fea553c 100644 --- a/src/make.configuration.deps +++ b/src/make.configuration.deps @@ -1,13 +1,22 @@ # make.configuration.deps for FlexIO # makefile rules to build FlexIO utilities -$(UTIL_DIR)$(DIRSEP)ioinfo: $(BUILD_DIR)$(DIRSEP)FlexIO$(DIRSEP)ioinfo.o $(CCTK_LIBDIR)/$(LIBNAME_PREFIX)FlexIO$(LIBNAME_SUFFIX) - @echo Creating ioinfo in $(UTIL_DIR) from $< +# enable HDF5 if available +ifneq ($(HDF5_LIBS),) +CXXFLAGS += -DWITH_HDF5 $(HDF5_INC_DIRS:%=-I%) $(SYS_INC_DIRS:%=-I%) +H5IOOBJ = $(BUILD_DIR)$(DIRSEP)FlexIO$(DIRSEP)H5IO.o +LDFLAGS += $(H5IOOBJ) $(HDF5_LIB_DIRS:%=-L%) $(HDF5_LIBS:%=-l%) -lm +endif + +# general linking rule +$(UTIL_DIR)$(DIRSEP)%: $(BUILD_DIR)$(DIRSEP)FlexIO$(DIRSEP)%.o $(H5IOOBJ) + @echo Creating $* in $(UTIL_DIR) from $< if [ ! -d $(UTIL_DIR) ]; then $(MKDIR) $(MKDIRFLAGS) $(UTIL_DIR) ; fi - $(LD) $(CREATEEXE)$(OPTIONSEP)$@ $(DEBUG_LD) $(LDFLAGS) $(EXTRAFLAGS) -L$(CCTK_LIBDIR) $< -lFlexIO + $(LD) $(CREATEEXE)$(OPTIONSEP)$@ $(DEBUG_LD) $(LDFLAGS) $(EXTRAFLAGS) $< -L$(CCTK_LIBDIR) -lFlexIO -$(BUILD_DIR)$(DIRSEP)FlexIO$(DIRSEP)ioinfo.o: $(PACKAGE_DIR)$(DIRSEP)CactusExternal$(DIRSEP)FlexIO$(DIRSEP)src$(DIRSEP)ioinfo.cc +# general compile rule +$(BUILD_DIR)$(DIRSEP)FlexIO$(DIRSEP)%.o: $(PACKAGE_DIR)$(DIRSEP)CactusExternal$(DIRSEP)FlexIO$(DIRSEP)src$(DIRSEP)%.cc @echo Compiling $< if [ ! -d $(BUILD_DIR)$(DIRSEP)FlexIO ]; then $(MKDIR) $(MKDIRFLAGS) $(BUILD_DIR)$(DIRSEP)FlexIO ; fi cd $(BUILD_DIR)$(DIRSEP)FlexIO - $(CXX) $< $(CXXFLAGS) -I$(PACKAGE_DIR)$(DIRSEP)CactusExternal$(DIRSEP)FlexIO$(DIRSEP)src $(CCOMPILEONLY)$(OPTIONSEP)$@ + $(CXX) $< -DCCODE $(CXXFLAGS) $(CCOMPILEONLY)$(OPTIONSEP)$@ |