ChangeLogTag: Mon Apr 12 13:55:46 2004 Chad Elliott <elliott_c@ociweb.com>

5 files changed, 29 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 0bcc32e2f7c..d3d1c107c1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Mon Apr 12 13:55:46 2004  Chad Elliott  <elliott_c@ociweb.com>
+
+        * apps/JAWS/clients/Caching/caching.mpc:
+        * apps/JAWS/server/server.mpc:
+
+          Made these project require ace_filecache.
+
+        * bin/MakeProjectCreator/config/ftclientorb.mpb:
+
+          Made this base project require ace_uuid.
+
+        * bin/MakeProjectCreator/templates/gnu.mpd:
+
+          Cleaned up and simplified the template somewhat.
+
 Mon Apr 12 12:54:37 2004  Chad Elliott  <elliott_c@ociweb.com>
 
         * ace/config-win32-common.h:
diff --git a/apps/JAWS/clients/Caching/caching.mpc b/apps/JAWS/clients/Caching/caching.mpc
index be214dce3d1..214d284fa85 100644
--- a/apps/JAWS/clients/Caching/caching.mpc
+++ b/apps/JAWS/clients/Caching/caching.mpc
@@ -2,6 +2,8 @@
 // $Id$
 
 project(http_client) : aceexe {
+  requires += ace_filecache
+
   Source_Files {
     http_handler.cpp
     http_client.cpp
diff --git a/apps/JAWS/server/server.mpc b/apps/JAWS/server/server.mpc
index fb48da83f24..4930b8b85aa 100644
--- a/apps/JAWS/server/server.mpc
+++ b/apps/JAWS/server/server.mpc
@@ -4,6 +4,8 @@
 project(JAWS) : acelib {
   sharedname = JAWS
   dynamicflags = ACE_BUILD_SVC_DLL
+  requires    += ace_filecache
+
   Source_Files {
     HTTP_Server.cpp
     HTTP_Config.cpp
@@ -22,6 +24,7 @@ project(JAWS_server) : aceexe {
   exename = main
   after += JAWS
   libs  += JAWS
+  requires += ace_filecache
 
   Source_Files {
     main.cpp
diff --git a/bin/MakeProjectCreator/config/ftclientorb.mpb b/bin/MakeProjectCreator/config/ftclientorb.mpb
index c4562f3f4d3..2a97a543b59 100644
--- a/bin/MakeProjectCreator/config/ftclientorb.mpb
+++ b/bin/MakeProjectCreator/config/ftclientorb.mpb
@@ -4,5 +4,6 @@
 project : ftorbutils {
   after     += FT_ClientORB 
   libs      += TAO_FT_ClientORB
+  requires  += ace_uuid
   tagchecks += FT_ClientORB
-}
\ No newline at end of file
+}
diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd
index 7bbefcd70f8..91f760e8884 100644
--- a/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/bin/MakeProjectCreator/templates/gnu.mpd
@@ -95,7 +95,7 @@ tao_dont_use_idl_make_rule = 1
 include $(TAO_ROOT)/rules.tao.GNU
 <%endif%>
 
-# To build multiple executables in the same directory on AIX, it works
+# To build multiple targets in the same directory on AIX, it works
 # best to have a template directory per project.
 # The compiler/linker isn't too smart about instantiating templates...
 ifdef TEMPINCDIR
@@ -426,26 +426,22 @@ endif
 <%endif%>
 <%if(idl_files)%>
 <%if(source_files)%>
+ADDITIONAL_IDL_TARGETS +=<%foreach(idl_files)%> <%if(flag_overrides(idl_file, gendir))%><%flag_overrides(idl_file, gendir)%>/<%basenoextension(idl_file)%>$(IDL_CLIENT_HDR_EXT)<%else%><%noextension(idl_file)%>$(IDL_CLIENT_HDR_EXT)<%endif%><%endfor%>
+idl_stubs: $(ADDITIONAL_IDL_TARGETS)
+
 # This assignment forces make to run the idl_stubs
 # target before building any of the source files.
 FORCED_IDL_STUBS = <%source_files%>
-
-ADDITIONAL_IDL_TARGETS +=<%foreach(idl_files)%> <%if(flag_overrides(idl_file, gendir))%><%flag_overrides(idl_file, gendir)%>/<%basenoextension(idl_file)%>$(IDL_CLIENT_HDR_EXT)<%else%><%noextension(idl_file)%>$(IDL_CLIENT_HDR_EXT)<%endif%><%endfor%>
-
-## We really only want the generated source files, but there's no
-## way to get just the cpp files from the custom_type output files in MPC
 <%foreach(custom_types)%>
 <%foreach(custom_type->input_files)%>
-<%if(custom_type->input_file->output_files)%>
-<%foreach(custom_type->input_file->output_files)%>
-FORCED_IDL_STUBS := $(FORCED_IDL_STUBS:<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%>=)
+<%if(custom_type->input_file->source_output_files)%>
+<%foreach(custom_type->input_file->source_output_files)%>
+FORCED_IDL_STUBS := $(FORCED_IDL_STUBS:<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->source_output_file)%><%else%><%custom_type->input_file->source_output_file%><%endif%>=)
 <%endfor%>
 <%endif%>
 <%endfor%>
 <%endfor%>
 
-idl_stubs: $(ADDITIONAL_IDL_TARGETS)
-
 ifneq ($(FORCED_IDL_STUBS),)
 $(FORCED_IDL_STUBS): idl_stubs
 endif