ChangeLogTag:Sat Nov 4 19:33:39 2000 Carlos O'Ryan <coryan@uci.edu>

5 files changed, 57 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index a73652f6860..c9314fa8913 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sat Nov  4 19:33:39 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_compile:
+          Fixed the mail message, the path to the CGI script was garbled.
+
+        * include/makeinclude/rules.local.GNU:
+          My last fixed did not work for static builds, the SOLINK rules
+          got in the way.  It works correctly for both static and shared
+          builds now.
+
 Sat Nov  4 18:19:46 2000  Carlos O'Ryan  <coryan@uci.edu>
 
         * ace/RMCast/RMCast_IO_UDP.cpp:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index a73652f6860..c9314fa8913 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,13 @@
+Sat Nov  4 19:33:39 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_compile:
+          Fixed the mail message, the path to the CGI script was garbled.
+
+        * include/makeinclude/rules.local.GNU:
+          My last fixed did not work for static builds, the SOLINK rules
+          got in the way.  It works correctly for both static and shared
+          builds now.
+
 Sat Nov  4 18:19:46 2000  Carlos O'Ryan  <coryan@uci.edu>
 
         * ace/RMCast/RMCast_IO_UDP.cpp:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index a73652f6860..c9314fa8913 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,13 @@
+Sat Nov  4 19:33:39 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_compile:
+          Fixed the mail message, the path to the CGI script was garbled.
+
+        * include/makeinclude/rules.local.GNU:
+          My last fixed did not work for static builds, the SOLINK rules
+          got in the way.  It works correctly for both static and shared
+          builds now.
+
 Sat Nov  4 18:19:46 2000  Carlos O'Ryan  <coryan@uci.edu>
 
         * ace/RMCast/RMCast_IO_UDP.cpp:
diff --git a/bin/auto_compile b/bin/auto_compile
index 8e5e7588179..7d9b88b1474 100755
--- a/bin/auto_compile
+++ b/bin/auto_compile
@@ -241,14 +241,14 @@ sub report_errors {
   if ($#_ >= 0) {
     local $to = $ADMIN;
 
-    open (MAIL, "|".$MAIL.' -s "[AUTO_COMPILE] '.$BUILD.'" '.$to)
+    open (MAIL, "|".$MAIL.' -s "[AUTO_COMPILE] '.$HOST.' '.$BUILD.'" '.$to)
       || mydie "Cannot open mail pipe for: $_\n";
 
     print MAIL 'The following message is brought to you by: ', "\n";
-    print MAIL $CMD, ' [', $REVISION, "] for $BUILD on $CHECKOUT\n\n";
+    print MAIL $CMD, ' [', $REVISION, "] for $BUILD on $HOST\n\n";
 
     print MAIL "\nPlease check the following log for more info:\n\n";
-    print MAIL $LOG_URL, $LOG_NAME, "\n\n";
+    print MAIL $LOG_URL, '?', $HOST, '_', $BUILD, "\n\n";
 
     local $m;
     foreach $m (@_) {
diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU
index a0fa7db6c93..472cf393e6d 100644
--- a/include/makeinclude/rules.local.GNU
+++ b/include/makeinclude/rules.local.GNU
@@ -69,28 +69,29 @@ $(VDIR)%.o: %.cc $(VDIR).creation_stamp
 	$(COMPILE.cc) $(CC_OUTPUT_FLAG) $@ $<
 	${MVCMD}
 
-# If SOLINK is defined, then the .$(SOEXT) file is built from the .$(OBJEXT) file via
-# separate rules in the same directory.  Otherwise, the .$(SOEXT) and .$(OBJEXT) are
-# built via the same rule.  SOLINK is required for the repository under
-# gcc.
+# If SOLINK is defined, then the .$(SOEXT) file is built from the
+# .$(OBJEXT) file via separate rules in the same directory.
+# Otherwise, the .$(SOEXT) and .$(OBJEXT) are built via the same rule.
+# SOLINK is required for the repository under gcc.
 ifndef SOLINK
 # I added the "Executable Shared Object (ESO)" define to separate between
 # normal shared object files and executable shared object files (the kind
 # that the service configurator needs to be able to function).
 # 970104 Marius Kjeldahl <mariusk@sn.no, marius@funcom.com>
 ifdef (ESOBUILD)
-$(VSHDIR)%.$(SOEXT): %.cpp
+$(VSHDIR)%.$(SOEXT): %.cpp $(VSHDIR).creation_stamp
 	$(ESOBUILD)
 else
-$(VSHDIR)%.$(SOEXT): %.cpp
+$(VSHDIR)%.$(SOEXT): %.cpp $(VSHDIR).creation_stamp
 	$(SOBUILD)
 endif
 
 ifeq ($(split), 1)
 $(VSHDIR)%.$(OBJEXT): %.cpp $(VSHDIR).creation_stamp
 	$(COMPILE.cc) $(PIC) SPLIT/`echo $< | sed "s/.cpp/_S\*/"`
-	mv *.$(OBJEXT) $(OBJDIRS)
+	mv *.$(OBJEXT) $(VSHDIR)
 else
+
 $(VSHDIR)%.$(OBJEXT): %.cpp $(VSHDIR).creation_stamp
 	$(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG) $@ $<
 endif
@@ -103,17 +104,28 @@ $(VSHDIR)%.$(OBJEXT): %.c $(VSHDIR).creation_stamp
 
 $(VSHDIR)%.$(SOEXT): $(VSHDIR)%.$(OBJEXT)
 	$(SOLINK)
-
 endif
 
+ifeq ($(OS),"Windows_NT")
+$(VDIR).creation_stamp:
+	@if not exist $@ mkdir $@
+	@echo > $@
+else
 $(VDIR).creation_stamp:
-	-@test -d $(VDIR) || mkdir $(VDIR)
+	@-mkdir $(VDIR)
 	@touch $@
+endif
 
-ifneq ($(VSHDIR),$(VDIR))
+ifneq ($(VDIR),$(VSHDIR))
+  ifeq ($(OS),"Windows_NT")
+$(VSHDIR).creation_stamp:
+	@if not exist $@ mkdir $@
+	@echo > $@
+  else
 $(VSHDIR).creation_stamp:
-	-@test -d $(VSHDIR) || mkdir $(VSHDIR)
+	@-mkdir $(VSHDIR)
 	@touch $@
+  endif
 endif
 
 #----------------------------------------------------------------------------
@@ -279,13 +291,7 @@ rcs_info.local:
 
 build.objdirs: $(OBJDIRS)
 
-ifeq ($(OS),"Windows_NT")
-$(OBJDIRS):
-	if not exist $@ mkdir $@
-else
-$(OBJDIRS):
-	test -d $@ || mkdir $@
-endif
+$(OBJDIRS): $(VDIR).creation_stamp $(VSHDIR).creation_stamp
 
 #---------------------------------------------------------------------------
 #       Source file splitting