ChangeLogTag: Wed Apr 9 14:10:42 2003 Chad Elliott <elliott_c@ociweb.com>

4 files changed, 59 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index 1743270effc..74dff8babb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,24 @@
+Wed Apr  9 14:10:42 2003  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/modules/MakeWorkspaceCreator.pm:
+        * bin/MakeProjectCreator/templates/make.mpd:
+
+          Added an install target and fixed a bug with nested makefiles.
+
+        * bin/MakeProjectCreator/templates/gnu.mpd:
+
+          Fixed a bug with 'requires' and 'avoids' when building libraries.
+
 Wed Apr  9 13:39:20 2003  Stuart Jones  <jones_s@ociweb.com>
 
-	* ace/DLL_Manager.cpp:
+        * ace/DLL_Manager.cpp:
+
+          Added check for NULL pointer in close method. The instance
+          method for the ACE_Framework_Repository class can return
+          NULL if the Object Manager is starting up, or shutting down
+          and the singleton hadn't been created. This was causing a
+          SEGV in a later pthread_mutex_lock (DOC Bug# 1479)
 
-	  Added check for NULL pointer in close method. The instance
-	  method for the ACE_Framework_Repository class can return 
-	  NULL if the Object Manager is starting up, or shutting down
-	  and the singleton hadn't been created. This was causing a
-	  SEGV in a later pthread_mutex_lock (DOC Bug# 1479)
-	
 Wed Apr  9 17:11:12 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl
 
         List of changed gathered the last weeks by Mark Drijver
@@ -122,8 +133,8 @@ Wed Apr  9 15:51:32 UTC 2003  Don Hinton  <dhinton@dresystems.com>
 
 Wed Apr 09 17:04:01 2003  Simon McQueen  <sm@prismtechnologies.com>
 
-	* apps/mkcsregdb/mkcsregdb.dsp: Added missing library in release
-	configuration.
+        * apps/mkcsregdb/mkcsregdb.dsp: Added missing library in release
+        configuration.
 
 Wed Apr  9 08:22:56 2003  Chad Elliott  <elliott_c@ociweb.com>
 
diff --git a/bin/MakeProjectCreator/modules/MakeWorkspaceCreator.pm b/bin/MakeProjectCreator/modules/MakeWorkspaceCreator.pm
index 2f67e6eb4a4..99675f875fc 100644
--- a/bin/MakeProjectCreator/modules/MakeWorkspaceCreator.pm
+++ b/bin/MakeProjectCreator/modules/MakeWorkspaceCreator.pm
@@ -74,12 +74,22 @@ sub write_comps {
   ## If there is more than one project, use a for loop
   if ($#list > 0) {
     print $fh "\t\@for file in \$(MFILES); do \\$crlf" .
-              "\t\$(MAKE) -f \$\$file \$(\@); \\$crlf" .
+              "\told=`pwd`; \\$crlf" .
+              "\tcd `dirname \$\$file`; \\$crlf" .
+              "\t\$(MAKE) -f `basename \$\$file` \$(\@); \\$crlf" .
+              "\tcd \$\$old; \\$crlf" .
               "\tdone$crlf";
   }
   else {
     ## Otherwise, just list the call to make without a for loop
-    print $fh "\t\@\$(MAKE) -f " . $list[0] . " \$(\@);$crlf";
+    print $fh "\t\@";
+    my($dname) = dirname($list[0]);
+    if ($dname ne '.') {
+      print $fh "cd $dname && ";
+    }
+    print $fh "\$(MAKE) -f " .
+              ($dname eq '.' ? $list[0] : basename($list[0])) .
+              " \$(\@);$crlf";
   }
 }
 
diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd
index d42836168b6..8894deb93b1 100644
--- a/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/bin/MakeProjectCreator/templates/gnu.mpd
@@ -26,6 +26,11 @@ IDL_SRC = $(foreach ext, C.cpp S.cpp, $(foreach file, $(IDL_FILES), $(file)$(ext
 <%endif%>
 
 <%gnu_source_files%>
+#----------------------------------------------------------------------------
+#       Include macros and targets
+#----------------------------------------------------------------------------
+<%marker(macros)%>
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 <%if(!exename)%>
 <%if(comps)%>
 
@@ -94,11 +99,6 @@ endif
 <%endif%>
 <%endif%>
 
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
-<%marker(macros)%>
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 <%if(tao)%>
 include $(TAO_ROOT)/rules.tao.GNU
 <%endif%>
diff --git a/bin/MakeProjectCreator/templates/make.mpd b/bin/MakeProjectCreator/templates/make.mpd
index 766e8d33875..219b65c13ec 100644
--- a/bin/MakeProjectCreator/templates/make.mpd
+++ b/bin/MakeProjectCreator/templates/make.mpd
@@ -48,20 +48,20 @@ OUTPUT_OPTION = -o $@
 <%marker(local)%>
 
 <%if(exename)%>
-all: $(BIN)
+all: $(BIN) <%if(install)%>install<%endif%>
 
 $(BIN): $(OBJS)
 	$(LINK.cc) $(OUTPUT_OPTION) $(OBJS) $(LDLIBS)
 
 <%endif%>
 <%if(sharedname)%>
-all: $(SHLIB)
+all: $(SHLIB) <%if(install)%>install<%endif%>
 
 $(SHLIB): $(OBJS)
 	$(LINK.cc) $(SHFLAGS) $(OUTPUT_OPTION) $(OBJS) $(LDLIBS)
 
 <%endif%>
-<%if(sharedname)%>
+<%if(staticname)%>
 $(LIB): $(OBJS)
 	$(AR) $(ARFLAGS) $(LIB) $(OBJS)
 
@@ -69,6 +69,25 @@ $(LIB): $(OBJS)
 %.o: %.cpp
 	$(COMPILE.cc) $< $(OUTPUT_OPTION)
 
+<%if(install)%>
+<%if(exename)%>
+INSTARGET = $(BIN)
+<%else%>
+<%if(sharedname)%>
+INSTARGET = $(SHLIB)
+<%else%>
+<%if(staticname)%>
+INSTARGET = $(LIB)
+<%endif%>
+<%endif%>
+<%endif%>
+install:
+	@echo "Installing $(INSTARGET) -> <%install%>/$(INSTARGET)"
+	@mkdir -p "<%install%>"
+	@$(RM) "<%install%>/$(INSTARGET)"
+	@ln -s "$(PWD)/$(INSTARGET)" "<%install%>"
+
+<%endif%>
 clean:
 	-$(RM) $(OBJS)