Added simple support for compiling with DEBUG.

It follows the way MPI was added with "extras".

So, to make a configuration be compiled with debug, say
make DEBUG=ALL <configname>

if fact, now you could say DEBUG=whatevershiticomeup and it's going to work
the same... but we will add DEBUG=FORTRAN,C,ALL etc... support in the future.

- Joan


git-svn-id: http://svn.cactuscode.org/flesh/trunk@810 17b73243-c579-4c4c-a9d2-2d5706c11dac

3 files changed, 50 insertions, 13 deletions

diff --git a/lib/make/extras/DEBUG/setup.sh b/lib/make/extras/DEBUG/setup.sh
new file mode 100755
index 00000000..7ff94211
--- /dev/null
+++ b/lib/make/extras/DEBUG/setup.sh
@@ -0,0 +1,37 @@
+#! /bin/sh
+# /*@@
+#   @file      setup.sh
+#   @date      Wed Jul 21 11:18:40 1999
+#   @author    Joan Masso
+#   @desc 
+#   Setup MPI
+#   @enddesc 
+# @@*/
+    
+if test -n "$DEBUG" ; then
+	
+echo "Configuring with DEBUG. Blocks with #ifdef CCTK_DEBUG will be activated"
+
+CCTK_WriteLine cctk_extradefs.h "#define CCTK_DEBUG"
+
+# Work out which variation of DEBUG
+    
+if test -r $srcdir/extras/DEBUG/$DEBUG ; then
+	. $srcdir/extras/DEBUG/$DEBUG
+else
+    echo "DEBUG Selected. Assuming -g flag for all compilers"
+   : ${DEBUG_C_FLAG="-g"} 
+   : ${DEBUG_CXX_FLAG="-g"} 
+   : ${DEBUG_F77_FLAG="-g"}
+   : ${DEBUG_F90_FLAG="-g"}
+   : ${DEBUG_LD_FLAG="-g"} 
+fi
+
+CCTK_WriteLine make.extra.defn "DEBUG_C = $DEBUG_C_FLAG"
+CCTK_WriteLine make.extra.defn "DEBUG_CXX = $DEBUG_CXX_FLAG"
+CCTK_WriteLine make.extra.defn "DEBUG_F77 = $DEBUG_F77_FLAG"
+CCTK_WriteLine make.extra.defn "DEBUG_F90 = $DEBUG_F90_FLAG"
+CCTK_WriteLine make.extra.defn "DEBUG_LD = $DEBUG_LD_FLAG"
+
+fi
+
diff --git a/lib/make/make.config.rules.in b/lib/make/make.config.rules.in
index 41ddfff8..e552548e 100644
--- a/lib/make/make.config.rules.in
+++ b/lib/make/make.config.rules.in
@@ -45,7 +45,7 @@ cat $< | $(PERL) $(C_FILE_PROCESSOR) $(CONFIG) > $(notdir $<)
 endef
 
 define COMPILE_C 
-current_wd=`$(GET_WD)` ; cd $(SCRATCH_BUILD) ; $(CC) $(CFLAGS) $(CCOMPILEONLY)$(OPTIONSEP)$$current_wd$(DIRSEP)$@ $$current_wd$(DIRSEP)$(notdir $<) $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DCCODE
+current_wd=`$(GET_WD)` ; cd $(SCRATCH_BUILD) ; $(CC) $(DEBUG_C) $(CFLAGS) $(CCOMPILEONLY)$(OPTIONSEP)$$current_wd$(DIRSEP)$@ $$current_wd$(DIRSEP)$(notdir $<) $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DCCODE
 endef
 
 define POSTPROCESS_C
@@ -57,7 +57,7 @@ cat $< | $(PERL) $(CCTK_HOME)/lib/sbin/c_file_processor.pl $(CONFIG) > $(notdir
 endef
 
 define COMPILE_CXX
-current_wd=`$(GET_WD)` ; cd $(SCRATCH_BUILD) ; $(CXX) $(CXXFLAGS) $(CCOMPILEONLY)$(OPTIONSEP)$$current_wd$(DIRSEP)$@ $$current_wd$(DIRSEP)$(notdir $<) $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DCCODE
+current_wd=`$(GET_WD)` ; cd $(SCRATCH_BUILD) ; $(CXX) $(DEBUG_CXX) $(CXXFLAGS) $(CCOMPILEONLY)$(OPTIONSEP)$$current_wd$(DIRSEP)$@ $$current_wd$(DIRSEP)$(notdir $<) $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DCCODE
 endef
 
 define POSTPROCESS_CXX
@@ -69,7 +69,7 @@ cat $< | sed 's.//.AUTOMATICALLY_GENERATED_CONCATONATION_PROTECTION_STRING.g' |
 endef
 
 define COMPILE_F77
-current_wd=`$(GET_WD)` ; cd $(SCRATCH_BUILD) ; $(F77) $(F77FLAGS) $(FCOMPILEONLY)$(OPTIONSEP)$$current_wd$(DIRSEP)$@ $$current_wd$(DIRSEP)$(basename $(notdir $<)).f 
+current_wd=`$(GET_WD)` ; cd $(SCRATCH_BUILD) ; $(F77) $(DEBUG_F77) $(F77FLAGS) $(FCOMPILEONLY)$(OPTIONSEP)$$current_wd$(DIRSEP)$@ $$current_wd$(DIRSEP)$(basename $(notdir $<)).f 
 endef
 
 define POSTPROCESS_F77
@@ -81,7 +81,7 @@ cat $< | sed 's.//.AUTOMATICALLY_GENERATED_CONCATONATION_PROTECTION_STRING.g' |
 endef
 
 define COMPILE_F90
-current_wd=`$(GET_WD)` ; cd $(SCRATCH_BUILD) ; $(F90) $(F90FLAGS) $(FCOMPILEONLY)$(OPTIONSEP)$$current_wd$(DIRSEP)$@ $$current_wd$(DIRSEP)$(basename $(notdir $<)).f  
+current_wd=`$(GET_WD)` ; cd $(SCRATCH_BUILD) ; $(F90) $(DEBUG_F90) $(F90FLAGS) $(FCOMPILEONLY)$(OPTIONSEP)$$current_wd$(DIRSEP)$@ $$current_wd$(DIRSEP)$(basename $(notdir $<)).f  
 endef
 
 define POSTPROCESS_F90
@@ -106,7 +106,7 @@ endef
 	@echo $(DIVIDER)
 	@echo Preprocessing $<
 	$(PREPROCESS_C)
-	@echo Compiling $<
+	@echo Compiling $(DEBUG_C) $<
 	$(COMPILE_C)
 	@echo Postprocessing $<
 	$(POSTPROCESS_C)
@@ -121,7 +121,7 @@ endef
 	@echo $(DIVIDER)
 	@echo Preprocessing $<
 	$(PREPROCESS_CXX)
-	@echo Compiling $<
+	@echo Compiling $(DEBUG_CXX) $<
 	$(COMPILE_CXX)
 	@echo Postprocessing $<
 	$(POSTPROCESS_CXX)
@@ -130,7 +130,7 @@ endef
 	@echo $(DIVIDER)
 	@echo Preprocessing $<
 	$(PREPROCESS_CXX)
-	@echo Compiling $<
+	@echo Compiling $(DEBUG_CXX) $<
 	$(COMPILE_CXX)
 	@echo Postprocessing $<
 	$(POSTPROCESS_CXX)
@@ -147,7 +147,7 @@ endef
 	@echo $(DIVIDER)
 	@echo Preprocessing $<
 	$(PREPROCESS_F77)
-	@echo Compiling $<
+	@echo Compiling $(DEBUG_F77) $<
 	$(COMPILE_F77)
 	@echo Postprocessing $<
 	$(POSTPROCESS_F77)
@@ -156,7 +156,7 @@ endef
 	@echo $(DIVIDER)
 	@echo Copying $<
 	$(PREPROCESS_f77)
-	@echo Compiling $<
+	@echo Compiling $(DEBUG_F77) $<
 	$(COMPILE_F77)
 	@echo Postprocessing $<
 	$(POSTPROCESS_F77)
@@ -174,7 +174,7 @@ endef
 	@echo $(DIVIDER)
 	@echo Preprocessing $<
 	$(PREPROCESS_F90)
-	@echo Compiling $<
+	@echo Compiling $(DEBUG_F90) $<
 	$(COMPILE_F90)
 	@echo Postprocessing $<
 	$(POSTPROCESS_F90)
@@ -183,7 +183,7 @@ endef
 	@echo $(DIVIDER)
 	@echo Copying $<
 	$(PREPROCESS_f)
-	@echo Compiling $<
+	@echo Compiling $(DEBUG_F90) $<
 	$(COMPILE_F90)
 	@echo Postprocessing $<
 	$(POSTPROCESS_F90)
diff --git a/lib/make/make.configuration b/lib/make/make.configuration
index 7133f0db..f4e7e892 100644
--- a/lib/make/make.configuration
+++ b/lib/make/make.configuration
@@ -58,9 +58,9 @@ endif
 $(EXEDIR)$(DIRSEP)$(EXE): $(CONFIG)/make.thornlist $(CONFIG)/cctk_version.h $(patsubst %,$(CCTK_LIBDIR)/lib%.a,$(notdir $(THORNS) $(CACTUSLIBS))) 
 	@echo $(DIVIDER)
 	@echo Creating $(EXE) in $(EXEDIR) from $(THORNS)
-	$(CC) $(CFLAGS) $(CCOMPILEONLY)$(OPTIONSEP)$(TOP)$(DIRSEP)datestamp.o -I$(CONFIG) $(subst /,$(DIRSEP),$(DATESTAMP))
+	$(CC) $(DEBUG_C) $(CFLAGS) $(CCOMPILEONLY)$(OPTIONSEP)$(TOP)$(DIRSEP)datestamp.o -I$(CONFIG) $(subst /,$(DIRSEP),$(DATESTAMP))
 	if [ ! -d $(EXEDIR) ]; then $(MKDIR) $(EXEDIR) ; fi
-	$(LD) $(CREATEEXE)$(OPTIONSEP)$(subst /,$(DIRSEP),$@) $(LDFLAGS) $(EXTRAFLAGS) $(subst /,$(DIRSEP), $(TOP)/datestamp.o) $(CACTUSLIBLINKLINE) $(LIBDIRS:%=-L%) $(LIBS:%=-l%) 
+	$(LD) $(CREATEEXE)$(OPTIONSEP)$(subst /,$(DIRSEP),$@) $(DEBUG_LD) $(LDFLAGS) $(EXTRAFLAGS) $(subst /,$(DIRSEP), $(TOP)/datestamp.o) $(CACTUSLIBLINKLINE) $(LIBDIRS:%=-L%) $(LIBS:%=-l%) 
 	@echo $(DIVIDER)
 	@echo All done !
 	@echo $(DIVIDER)