Use makefile defines provided by other thorns' configuration files.

git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IOHDF5/trunk@213 4825ed28-b72c-4eae-9704-e50c059e567d

2 files changed, 29 insertions, 30 deletions

diff --git a/src/make.configuration.defn b/src/make.configuration.defn
index b44abf3..b1d145c 100644
--- a/src/make.configuration.defn
+++ b/src/make.configuration.defn
@@ -3,11 +3,10 @@
 # add the recombiner and the IEEEIO converter to the Cactus utitlity tools
 ALL_UTILS += hdf5_recombiner hdf5_merge hdf5_extract hdf5_double_to_single
 
-ifeq ($(findstring CactusExternal/FlexIO,$(THORNS)),CactusExternal/FlexIO)
-ALL_UTILS += hdf5_convert_from_ieeeio
-FLEXIO_INC_DIRS = $(CCTK_HOME)$(DIRSEP)arrangements/CactusExternal/FlexIO/src
+ifneq ($(strip $(HAVE_FLEXIO)), )
+  ALL_UTILS += hdf5_convert_from_ieeeio
 endif
 
-ifeq ($(findstring CactusIO/IOSDF,$(THORNS)),CactusIO/IOSDF)
-ALL_UTILS += hdf5_convert_from_sdf
+ifneq ($(strip $(HAVE_SDF)), )
+  ALL_UTILS += hdf5_convert_from_sdf
 endif
diff --git a/src/make.configuration.deps b/src/make.configuration.deps
index 5282a28..7c12f53 100644
--- a/src/make.configuration.deps
+++ b/src/make.configuration.deps
@@ -1,51 +1,51 @@
+MY_BUILD_DIR = $(BUILD_DIR)/IOHDF5
+MY_SRC_DIR   = $(PACKAGE_DIR)/CactusPUGHIO/IOHDF5/src/util
+
+MY_CFLAGS  = -DCCODE $(CFLAGS)
+MY_LDFLAGS = $(DEBUG_LD) $(LDFLAGS) $(EXTRAFLAGS) $(HDF5_LIB_DIRS:%=-L%) $(HDF5_LIBS:%=-l%)
+
 # Extend CFLAGS if HDF5 library was built with LFS support
 ifneq ($(strip $(HDF5_LFS_FLAGS)),)
-  CFLAGS += $(HDF5_LFS_FLAGS)
+  MY_CFLAGS += $(HDF5_LFS_FLAGS)
 endif
 
+# add includes
+MY_CFLAGS += -I$(CONFIG) -I$(BINDINGS_DIR)/include -I$(FLESH_DIR)/include -I$(PACKAGE_DIR) $(HDF5_INC_DIRS:%=-I%)
+
 # general linking rule
-$(UTIL_DIR)$(DIRSEP)%: $(BUILD_DIR)$(DIRSEP)IOHDF5$(DIRSEP)%.o
+$(UTIL_DIR)/%: $(MY_BUILD_DIR)/%.o
 	@echo Creating $* in $(UTIL_DIR) from $<
 	if [ ! -d $(UTIL_DIR) ]; then $(MKDIR) $(MKDIRFLAGS) $(UTIL_DIR) ; fi
-	$(LD) $(CREATEEXE)$(OPTIONSEP)$@ $(DEBUG_LD) $(LDFLAGS) $(EXTRAFLAGS) $< $(HDF5_LIB_DIRS:%=-L%) $(HDF5_LIBS:%=-l%) -lm
+	$(LD) $< $(CREATEEXE)$(OPTIONSEP)$@ $(MY_LDFLAGS)
 
 # general compile rule
-$(BUILD_DIR)$(DIRSEP)IOHDF5$(DIRSEP)%.o: $(PACKAGE_DIR)$(DIRSEP)CactusPUGHIO$(DIRSEP)IOHDF5$(DIRSEP)src$(DIRSEP)util$(DIRSEP)%.c
+$(MY_BUILD_DIR)/%.o: $(MY_SRC_DIR)/%.c
 	@echo Compiling $<
-	if [ ! -d $(BUILD_DIR)$(DIRSEP)IOHDF5 ]; then $(MKDIR) $(MKDIRFLAGS) $(BUILD_DIR)$(DIRSEP)IOHDF5 ; fi
-	cd $(BUILD_DIR)$(DIRSEP)IOHDF5
-	$(CC) $< -DCCODE $(CFLAGS) -I$(CONFIG) -I$(BINDINGS_DIR)$(DIRSEP)include -I$(FLESH_DIR)$(DIRSEP)include -I$(CCTK_HOME)$(DIRSEP)arrangements $(HDF5_INC_DIRS:%=-I%) $(SYS_INC_DIRS:%=-I%) $(CCOMPILEONLY)$(OPTIONSEP)$@
+	if [ ! -d $(MY_BUILD_DIR) ]; then $(MKDIR) $(MKDIRFLAGS) $(MY_BUILD_DIR) ; fi
+	$(CC) $< $(MY_CFLAGS) -c -o $@
 
 
 # linking rule for hdf5_convert_from_ieeeio
-$(UTIL_DIR)$(DIRSEP)hdf5_convert_from_ieeeio: $(BUILD_DIR)$(DIRSEP)IOHDF5$(DIRSEP)hdf5_convert_from_ieeeio.o
+$(UTIL_DIR)/hdf5_convert_from_ieeeio: $(MY_BUILD_DIR)/hdf5_convert_from_ieeeio.o
 	@echo Creating hdf5_convert_from_ieeeio in $(UTIL_DIR) from $<
 	if [ ! -d $(UTIL_DIR) ]; then $(MKDIR) $(MKDIRFLAGS) $(UTIL_DIR) ; fi
-	$(LD) $(CREATEEXE)$(OPTIONSEP)$@ $(DEBUG_LD) $(LDFLAGS) $(EXTRAFLAGS) $< -L$(CCTK_LIBDIR) -l$(CCTK_LIBNAME_PREFIX)FlexIO $(HDF5_LIB_DIRS:%=-L%) $(HDF5_LIBS:%=-l%) -lm
+	$(LD) $< $(MY_LDFLAGS) -L$(CCTK_LIBDIR) -l$(CCTK_LIBNAME_PREFIX)FlexIO -o $@
 
 # compile rule for hdf5_convert_from_ieeeio
-$(BUILD_DIR)$(DIRSEP)IOHDF5$(DIRSEP)hdf5_convert_from_ieeeio.o: $(PACKAGE_DIR)$(DIRSEP)CactusPUGHIO$(DIRSEP)IOHDF5$(DIRSEP)src$(DIRSEP)util$(DIRSEP)hdf5_convert_from_ieeeio.c
+$(MY_BUILD_DIR)/hdf5_convert_from_ieeeio.o: $(MY_SRC_DIR)/hdf5_convert_from_ieeeio.c
 	@echo Compiling $<
-	if [ ! -d $(BUILD_DIR)$(DIRSEP)IOHDF5 ]; then $(MKDIR) $(MKDIRFLAGS) $(BUILD_DIR)$(DIRSEP)IOHDF5 ; fi
-	cd $(BUILD_DIR)$(DIRSEP)IOHDF5
-	$(CC) $< -DCCODE $(CFLAGS) -DANSI -I$(CONFIG) -I$(BINDINGS_DIR)$(DIRSEP)include -I$(FLESH_DIR)$(DIRSEP)include -I$(CCTK_HOME)$(DIRSEP)arrangements $(HDF5_INC_DIRS:%=-I%) $(FLEXIO_INC_DIRS:%=-I%) $(SYS_INC_DIRS:%=-I%) $(CCOMPILEONLY)$(OPTIONSEP)$@
-
+	if [ ! -d $(MY_BUILD_DIR) ]; then $(MKDIR) $(MKDIRFLAGS) $(MY_BUILD_DIR) ; fi
+	$(CC) $< -DANSI $(MY_CFLAGS) $(INC_DIRS:%=-I%) -c -o $@
 
-# need to extract SDF includes and libs from the bindings makefiles
-# (those are not included when building utilities)
-SDF_INC_DIRS := $(shell grep INC_DIRS $(CONFIG)/../bindings/Configuration/IOSDF/make.configuration.defn 2>/dev/null | cut -f2 -d'=')
-SDF_LIB_DIRS := $(shell grep LIBDIRS $(CONFIG)/../bindings/Configuration/make.link | cut -f2 -d'=')
-SDF_LIBS := $(shell grep LIBS $(CONFIG)/../bindings/Configuration/make.link | cut -f2 -d'=')
 
 # linking rule for hdf5_convert_from_sdf
-$(UTIL_DIR)$(DIRSEP)hdf5_convert_from_sdf: $(BUILD_DIR)$(DIRSEP)IOHDF5$(DIRSEP)hdf5_convert_from_sdf.o
+$(UTIL_DIR)/hdf5_convert_from_sdf: $(MY_BUILD_DIR)/hdf5_convert_from_sdf.o
 	@echo Creating hdf5_convert_from_sdf in $(UTIL_DIR) from $<
 	if [ ! -d $(UTIL_DIR) ]; then $(MKDIR) $(MKDIRFLAGS) $(UTIL_DIR) ; fi
-	$(LD) $(CREATEEXE)$(OPTIONSEP)$@ $(DEBUG_LD) $(LDFLAGS) $(EXTRAFLAGS) $< -L$(CCTK_LIBDIR) $(SDF_LIB_DIRS:%=-L%) $(SDF_LIBS:%=-l%) $(HDF5_LIB_DIRS:%=-L%) $(HDF5_LIBS:%=-l%) -lm
+	$(LD) $< $(MY_LDFLAGS) $(GENERAL_LIBRARIES) -o $@
 
 # compile rule for hdf5_convert_from_sdf
-$(BUILD_DIR)$(DIRSEP)IOHDF5$(DIRSEP)hdf5_convert_from_sdf.o: $(PACKAGE_DIR)$(DIRSEP)CactusPUGHIO$(DIRSEP)IOHDF5$(DIRSEP)src$(DIRSEP)util$(DIRSEP)hdf5_convert_from_sdf.c
+$(MY_BUILD_DIR)/hdf5_convert_from_sdf.o: $(MY_SRC_DIR)/hdf5_convert_from_sdf.c
 	@echo Compiling $<
-	if [ ! -d $(BUILD_DIR)$(DIRSEP)IOHDF5 ]; then $(MKDIR) $(MKDIRFLAGS) $(BUILD_DIR)$(DIRSEP)IOHDF5 ; fi
-	cd $(BUILD_DIR)$(DIRSEP)IOHDF5
-	$(CC) $< -DCCODE $(CFLAGS) -DANSI -I$(CONFIG) -I$(BINDINGS_DIR)$(DIRSEP)include -I$(FLESH_DIR)$(DIRSEP)include -I$(SDF_INC_DIRS) $(HDF5_INC_DIRS:%=-I%) $(FLEXIO_INC_DIRS:%=-I%) $(SYS_INC_DIRS:%=-I%) $(CCOMPILEONLY)$(OPTIONSEP)$@
+	if [ ! -d $(MY_BUILD_DIR) ]; then $(MKDIR) $(MKDIRFLAGS) $(MY_BUILD_DIR) ; fi
+	$(CC) $< $(MY_CFLAGS) $(INC_DIRS:%=-I%) -c -o $@