diff options
Diffstat (limited to 'Carpet/CarpetIOASCII/src')
| -rw-r--r-- | Carpet/CarpetIOASCII/src/make.configuration.defn | 6 | ||||
| -rw-r--r-- | Carpet/CarpetIOASCII/src/make.configuration.deps | 11 |
2 files changed, 7 insertions, 10 deletions
diff --git a/Carpet/CarpetIOASCII/src/make.configuration.defn b/Carpet/CarpetIOASCII/src/make.configuration.defn index 668c82ade..672b0cf21 100644 --- a/Carpet/CarpetIOASCII/src/make.configuration.defn +++ b/Carpet/CarpetIOASCII/src/make.configuration.defn @@ -1,4 +1,8 @@ # Main make.configuration.defn file for thorn CarpetIOASCII # $Header:$ -ALL_UTILS += carpet2sdf carpet2xgraph +ALL_UTILS += carpet2xgraph + +ifneq ($(strip $(HAVE_SDF)), ) + ALL_UTILS += carpet2sdf +endif diff --git a/Carpet/CarpetIOASCII/src/make.configuration.deps b/Carpet/CarpetIOASCII/src/make.configuration.deps index 12e4ef2e3..24b261ac3 100644 --- a/Carpet/CarpetIOASCII/src/make.configuration.deps +++ b/Carpet/CarpetIOASCII/src/make.configuration.deps @@ -34,7 +34,7 @@ $(UTIL_DIR)$(DIRSEP)%: $(BUILD_DIR)$(DIRSEP)CarpetIOASCII$(DIRSEP)%.o $(BUILD_DIR)$(DIRSEP)CarpetIOASCII$(DIRSEP)carpet2sdf.o: $(PACKAGE_DIR)$(DIRSEP)Carpet$(DIRSEP)CarpetIOASCII$(DIRSEP)src$(DIRSEP)util$(DIRSEP)carpet2sdf.c @echo "Compiling carpet2sdf" -$(MKDIR) $(MKDIRFLAGS) $(BUILD_DIR)$(DIRSEP)CarpetIOASCII 2> /dev/null - -$(CC) $< -DCCODE $(CFLAGS) -I$(CONFIG) -I$(BINDINGS_DIR)$(DIRSEP)include -I$(FLESH_DIR)$(DIRSEP)include -I$(CCTK_HOME)$(DIRSEP)arrangements -I$(SDF_INCDIRS:%=-I%) $(CCOMPILEONLY)$(OPTIONSEP)$@ + $(CC) $< -DCCODE $(CFLAGS) $(INC_DIRS:%=-I%) $(CCOMPILEONLY)$(OPTIONSEP)$@ @@ -43,11 +43,4 @@ $(BUILD_DIR)$(DIRSEP)CarpetIOASCII$(DIRSEP)carpet2sdf.o: $(PACKAGE_DIR)$(DIRSEP) $(UTIL_DIR)$(DIRSEP)carpet2sdf: $(BUILD_DIR)$(DIRSEP)CarpetIOASCII$(DIRSEP)carpet2sdf.o @echo "Creating $* in $(UTIL_DIR) from $<" -$(MKDIR) $(MKDIRFLAGS) $(UTIL_DIR) 2> /dev/null - -$(LD) $(CREATEEXE)$(OPTIONSEP)$@ $(DEBUG_LD) $(LDFLAGS) $(EXTRAFLAGS) $< $(SDF_LIBDIRS:%=-L%) $(SDF_LIBS:%=-l%) - @if [ ! -e $(UTIL_DIR)$(DIRSEP)/carpet2sdf ]; then \ - echo "*************************************"; \ - echo "Warning: could not install carpet2sdf"; \ - echo "*************************************"; \ - echo "echo \"carpet2sdf could not be installed\"" > $@; \ - chmod a+x $@; \ - fi + $(LD) $(CREATEEXE)$(OPTIONSEP)$@ $(DEBUG_LD) $(LDFLAGS) $(EXTRAFLAGS) $< $(GENERAL_LIBRARIES) |