Give local makefile variables unique names.

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

1 files changed, 21 insertions, 21 deletions

diff --git a/src/make.configuration.deps b/src/make.configuration.deps
index 7c12f53..53ae00e 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
+IOHDF5_BUILD_DIR = $(BUILD_DIR)/IOHDF5
+IOHDF5_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%)
+IOHDF5_CFLAGS  = -DCCODE $(CFLAGS)
+IOHDF5_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)),)
-  MY_CFLAGS += $(HDF5_LFS_FLAGS)
+  IOHDF5_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%)
+IOHDF5_CFLAGS += -I$(CONFIG) -I$(BINDINGS_DIR)/include -I$(FLESH_DIR)/include -I$(PACKAGE_DIR) $(HDF5_INC_DIRS:%=-I%)
 
 # general linking rule
-$(UTIL_DIR)/%: $(MY_BUILD_DIR)/%.o
+$(UTIL_DIR)/%: $(IOHDF5_BUILD_DIR)/%.o
 	@echo Creating $* in $(UTIL_DIR) from $<
 	if [ ! -d $(UTIL_DIR) ]; then $(MKDIR) $(MKDIRFLAGS) $(UTIL_DIR) ; fi
-	$(LD) $< $(CREATEEXE)$(OPTIONSEP)$@ $(MY_LDFLAGS)
+	$(LD) $< $(CREATEEXE)$(OPTIONSEP)$@ $(IOHDF5_LDFLAGS)
 
 # general compile rule
-$(MY_BUILD_DIR)/%.o: $(MY_SRC_DIR)/%.c
+$(IOHDF5_BUILD_DIR)/%.o: $(IOHDF5_SRC_DIR)/%.c
 	@echo Compiling $<
-	if [ ! -d $(MY_BUILD_DIR) ]; then $(MKDIR) $(MKDIRFLAGS) $(MY_BUILD_DIR) ; fi
-	$(CC) $< $(MY_CFLAGS) -c -o $@
+	if [ ! -d $(IOHDF5_BUILD_DIR) ]; then $(MKDIR) $(MKDIRFLAGS) $(IOHDF5_BUILD_DIR) ; fi
+	$(CC) $< $(IOHDF5_CFLAGS) -c -o $@
 
 
 # linking rule for hdf5_convert_from_ieeeio
-$(UTIL_DIR)/hdf5_convert_from_ieeeio: $(MY_BUILD_DIR)/hdf5_convert_from_ieeeio.o
+$(UTIL_DIR)/hdf5_convert_from_ieeeio: $(IOHDF5_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) $< $(MY_LDFLAGS) -L$(CCTK_LIBDIR) -l$(CCTK_LIBNAME_PREFIX)FlexIO -o $@
+	$(LD) $< $(IOHDF5_LDFLAGS) -L$(CCTK_LIBDIR) -l$(CCTK_LIBNAME_PREFIX)FlexIO -o $@
 
 # compile rule for hdf5_convert_from_ieeeio
-$(MY_BUILD_DIR)/hdf5_convert_from_ieeeio.o: $(MY_SRC_DIR)/hdf5_convert_from_ieeeio.c
+$(IOHDF5_BUILD_DIR)/hdf5_convert_from_ieeeio.o: $(IOHDF5_SRC_DIR)/hdf5_convert_from_ieeeio.c
 	@echo Compiling $<
-	if [ ! -d $(MY_BUILD_DIR) ]; then $(MKDIR) $(MKDIRFLAGS) $(MY_BUILD_DIR) ; fi
-	$(CC) $< -DANSI $(MY_CFLAGS) $(INC_DIRS:%=-I%) -c -o $@
+	if [ ! -d $(IOHDF5_BUILD_DIR) ]; then $(MKDIR) $(MKDIRFLAGS) $(IOHDF5_BUILD_DIR) ; fi
+	$(CC) $< -DANSI $(IOHDF5_CFLAGS) $(INC_DIRS:%=-I%) -c -o $@
 
 
 # linking rule for hdf5_convert_from_sdf
-$(UTIL_DIR)/hdf5_convert_from_sdf: $(MY_BUILD_DIR)/hdf5_convert_from_sdf.o
+$(UTIL_DIR)/hdf5_convert_from_sdf: $(IOHDF5_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) $< $(MY_LDFLAGS) $(GENERAL_LIBRARIES) -o $@
+	$(LD) $< $(IOHDF5_LDFLAGS) $(GENERAL_LIBRARIES) -o $@
 
 # compile rule for hdf5_convert_from_sdf
-$(MY_BUILD_DIR)/hdf5_convert_from_sdf.o: $(MY_SRC_DIR)/hdf5_convert_from_sdf.c
+$(IOHDF5_BUILD_DIR)/hdf5_convert_from_sdf.o: $(IOHDF5_SRC_DIR)/hdf5_convert_from_sdf.c
 	@echo Compiling $<
-	if [ ! -d $(MY_BUILD_DIR) ]; then $(MKDIR) $(MKDIRFLAGS) $(MY_BUILD_DIR) ; fi
-	$(CC) $< $(MY_CFLAGS) $(INC_DIRS:%=-I%) -c -o $@
+	if [ ! -d $(IOHDF5_BUILD_DIR) ]; then $(MKDIR) $(MKDIRFLAGS) $(IOHDF5_BUILD_DIR) ; fi
+	$(CC) $< $(IOHDF5_CFLAGS) $(INC_DIRS:%=-I%) -c -o $@