Now preprocesses c files into the appropriate build directory, then

changes directory to $(TOP)/scratch and builds the file there, putting
the object file in the appropriate build directory.

When this is done for F90 it should mkae sure that all module files
end up in one place and are available for the F90 compiler.

Tom


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

1 files changed, 7 insertions, 2 deletions

diff --git a/lib/make/make.configuration b/lib/make/make.configuration
index 113f4c7e..2bdfde45 100644
--- a/lib/make/make.configuration
+++ b/lib/make/make.configuration
@@ -9,12 +9,15 @@
 # @@*/
 
 # Silence all but designated output
-.SILENT: 
+#.SILENT: 
 
 # Some configuration variables
 CONFIG = $(TOP)/config-data
 BINDINGS_DIR = $(TOP)/bindings
 
+# Scratch build area - need this to make sure F90 module files end up all
+# in one directory.
+export SCRATCH_BUILD=$(TOP)/scratch
 
 DATESTAMP = $(CCTK_HOME)/src/datestamp.c
 export MAKE_DIR  = $(CCTK_HOME)/lib/make
@@ -55,6 +58,7 @@ $(EXE): $(CONFIG)/make.thornlist $(patsubst %,$(CCTK_LIBDIR)/lib%.a,$(notdir $(T
 $(CCTK_LIBDIR)/lib%.a: update
 	@echo $(DIVIDER)
 	@echo Checking status of $(notdir $@)
+	if [ ! -d $(SCRATCH_BUILD) ]; then $(MKDIR) $(SCRATCH_BUILD) ; fi
 	if [ ! -d $(BUILD_DIR) ]; then $(MKDIR) $(BUILD_DIR) ; fi
 	thorn_name=$(@:$(CCTK_LIBDIR)/lib%.a=%); \
 	if [ "$$thorn_name" = "Cactus" ] ; then src_dir=$(CCTK_HOME)/src ; \
@@ -106,4 +110,5 @@ $(TOP)/ActiveThorns:
 update:
 
 clean:
-	find $(TOP) -name '*.o' -o -name '*.a' -exec rm {} \;
+	@echo Deleting all object files in $(TOP)
+	find $(TOP) \( -name '*.o' -o -name '*.a' \) -exec rm {} \;