A few more changes to help supprt NT.

NOTE: you will need to do a reconfig after this.

Tom


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

4 files changed, 26 insertions, 4 deletions

diff --git a/lib/make/configure b/lib/make/configure
index aa3c2391..00ec5266 100755
--- a/lib/make/configure
+++ b/lib/make/configure
@@ -2034,9 +2034,11 @@ EOF
 
 
 
+
 : ${PACKAGE_DIR=packages}
 : ${BUILD_DIR=build}
 : ${CCTK_LIBDIR=lib}
+: ${EXEDIR='$(CCTK_HOME)'}
 : ${EXE=cactus-unknown}
 
 # Integer types
@@ -2226,6 +2228,11 @@ LDFLAGS="$KNOWN_LDFLAGS $LDFLAGS"
 : ${CCOMPILEONLY="-c -o"}
 : ${FCOMPILEONLY="-c -o"}
 
+#Set the createexe flag if it's not been set by now
+
+
+
+: ${CREATEEXE="-o # Please leave the space, it's important !"}
 
 
  
@@ -2394,6 +2401,7 @@ s%@LIBDIRS@%$LIBDIRS%g
 s%@PACKAGE_DIR@%$PACKAGE_DIR%g
 s%@BUILD_DIR@%$BUILD_DIR%g
 s%@CCTK_LIBDIR@%$CCTK_LIBDIR%g
+s%@EXEDIR@%$EXEDIR%g
 s%@EXE@%$EXE%g
 s%@BUILD_ACTIVETHORNS@%$BUILD_ACTIVETHORNS%g
 s%@CST@%$CST%g
@@ -2401,6 +2409,7 @@ s%@F_FILE_PROCESSOR@%$F_FILE_PROCESSOR%g
 s%@C_FILE_PROCESSOR@%$C_FILE_PROCESSOR%g
 s%@CCOMPILEONLY@%$CCOMPILEONLY%g
 s%@FCOMPILEONLY@%$FCOMPILEONLY%g
+s%@CREATEEXE@%$CREATEEXE%g
 
 CEOF
 EOF
diff --git a/lib/make/configure.in b/lib/make/configure.in
index 47786fba..5fec6d8d 100644
--- a/lib/make/configure.in
+++ b/lib/make/configure.in
@@ -151,11 +151,13 @@ AC_SUBST(LIBDIRS)
 AC_SUBST(PACKAGE_DIR)
 AC_SUBST(BUILD_DIR)
 AC_SUBST(CCTK_LIBDIR)
+AC_SUBST(EXEDIR)
 AC_SUBST(EXE)
 
 : ${PACKAGE_DIR=packages}
 : ${BUILD_DIR=build}
 : ${CCTK_LIBDIR=lib}
+: ${EXEDIR='$(CCTK_HOME)'}
 : ${EXE=cactus-unknown}
 
 # Integer types
@@ -300,6 +302,11 @@ LDFLAGS="$KNOWN_LDFLAGS $LDFLAGS"
 : ${CCOMPILEONLY="-c -o"}
 : ${FCOMPILEONLY="-c -o"}
 
+#Set the createexe flag if it's not been set by now
+
+AC_SUBST(CREATEEXE)
+
+: ${CREATEEXE="-o # Please leave the space, it's important !"}
 
 dnl Run any other scripts necessary
 
diff --git a/lib/make/make.config.defn.in b/lib/make/make.config.defn.in
index 41b38aea..734a0fe3 100644
--- a/lib/make/make.config.defn.in
+++ b/lib/make/make.config.defn.in
@@ -38,6 +38,9 @@ ARFLAGS           = @ARFLAGS@
 CCOMPILEONLY = @CCOMPILEONLY@
 FCOMPILEONLY = @FCOMPILEONLY@
 
+# Most compilers use -o for naming the executable, alas some don't
+CREATEEXE = @CREATEEXE@
+
 # Library info
 
 LIBS    = @LIBS@
@@ -65,6 +68,9 @@ CST = @CST@
 C_FILE_PROCESSOR = @C_FILE_PROCESSOR@
 F_FILE_PROCESSOR = @F_FILE_PROCESSOR@
 
+# The directory in which to place the executable
+EXEDIR = @EXEDIR@
+
 # The name of the executable
-EXE    = @EXE@
+EXE    = $(EXEDIR)/@EXE@
 
diff --git a/lib/make/make.configuration b/lib/make/make.configuration
index 4a499691..4f2134dd 100644
--- a/lib/make/make.configuration
+++ b/lib/make/make.configuration
@@ -49,8 +49,8 @@ endif
 $(EXE): $(CONFIG)/make.thornlist $(patsubst %,$(CCTK_LIBDIR)/lib%.a,$(notdir $(THORNS))) $(CCTK_LIBDIR)/libCactus.a $(CCTK_LIBDIR)/libCactusBindings.a
 	@echo $(DIVIDER)
 	@echo Creating $(EXE) from $(THORNS)
-	$(CC) $(CFLAGS) -c $(DATESTAMP) -o $(TOP)/datestamp.o
-	$(LD) -o $@ $(LDFLAGS) $(EXTRAFLAGS) $(TOP)/datestamp.o -L$(CCTK_LIBDIR) -lCactus -lCactusBindings  $(addprefix -l,$(notdir $(THORNS))) $(addprefix -l,$(notdir $(THORNS))) -lCactus $(LIBDIRS:%=-L%) $(LIBS:%=-l%)
+	$(CC) $(CFLAGS) $(CCOMPILEONLY) $(TOP)/datestamp.o $(DATESTAMP)
+	$(LD) $(CREATEEXE)$@ $(LDFLAGS) $(EXTRAFLAGS) $(TOP)/datestamp.o -L$(CCTK_LIBDIR) -lCactus -lCactusBindings  $(addprefix -l,$(notdir $(THORNS))) $(addprefix -l,$(notdir $(THORNS))) -lCactus $(LIBDIRS:%=-L%) $(LIBS:%=-l%)
 	@echo $(DIVIDER)
 	@echo All done !
 	@echo $(DIVIDER)
@@ -64,7 +64,7 @@ $(EXE): $(CONFIG)/make.thornlist $(patsubst %,$(CCTK_LIBDIR)/lib%.a,$(notdir $(T
 # used for making thorn libraries.
 #
 # Checks if the library is Cactus, in which case it uses the main source 
-# directoryory.
+# directory.
 
 $(CCTK_LIBDIR)/lib%.a: update
 	@echo $(DIVIDER)