ChangeLogTag: Thu Nov 18 11:52:19 2004 Chad Elliott <elliott_c@ociweb.com>

8 files changed, 32 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index bc9b46a9a2f..0eaf3fb35a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+Thu Nov 18 11:52:19 2004  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/config/ciao_servant.mpb:
+        * bin/MakeProjectCreator/config/ciao_servant_dnc.mpb:
+        * bin/MakeProjectCreator/config/psdl.mpb:
+        * bin/MakeProjectCreator/config/taoidldefaults.mpb:
+
+          Changed these base projects to use 'dependent' in the new manner
+          where it represents the command upon which the generated files are
+          dependent.
+
+        * bin/MakeProjectCreator/templates/gnu.mpd:
+
+          Changed to use TAO_IDL_DEP as the dependency for the idl generated
+          files.
+
+        * bin/MakeProjectCreator/config/trading_serv.mpb:
+        * bin/MakeProjectCreator/config/trading_skel.mpb:
+
+          Renamed these mpc files to mpb files.  The mpc extension works,
+          it's just a matter of consistency.
+
 Thu Nov 18 16:31:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * protocols/protocols.mwc:
diff --git a/bin/MakeProjectCreator/config/ciao_servant.mpb b/bin/MakeProjectCreator/config/ciao_servant.mpb
index 54c71d843f6..5e25e6c52a6 100644
--- a/bin/MakeProjectCreator/config/ciao_servant.mpb
+++ b/bin/MakeProjectCreator/config/ciao_servant.mpb
@@ -7,7 +7,7 @@ project : ciao_component {
 
   Define_Custom(CIDL) {
     automatic         = 0
-    dependent         = 1
+    dependent         = $(CIAO_ROOT)/bin/cidlc
     command           = $(CIAO_ROOT)/bin/cidlc
     commandflags      = -I$(CIAO_ROOT) -I$(CIAO_ROOT)/ciao -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -I$(TAO_ROOT)/orbsvcs --
     inputext          = .cidl
diff --git a/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb b/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb
index c4d66b64e3c..180b8d873a2 100644
--- a/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb
+++ b/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb
@@ -7,7 +7,7 @@ project : ciao_component_dnc {
 
   Define_Custom(CIDL) {
     automatic         = 0
-    dependent         = 1
+    dependent         = $(CIAO_ROOT)/bin/cidlc
     command           = $(CIAO_ROOT)/bin/cidlc
     commandflags      = -I$(CIAO_ROOT)/DAnCE -I$(CIAO_ROOT)/DAnCE/ciao -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -I$(TAO_ROOT)/orbsvcs --
     inputext          = .cidl
diff --git a/bin/MakeProjectCreator/config/psdl.mpb b/bin/MakeProjectCreator/config/psdl.mpb
index f6876000d00..fcc0e4edaa2 100644
--- a/bin/MakeProjectCreator/config/psdl.mpb
+++ b/bin/MakeProjectCreator/config/psdl.mpb
@@ -6,7 +6,7 @@ project {
   libs  += TAO_PSDL TAO_PSDL_Datastore
 
   Define_Custom(PSDL) {
-    dependent        = 1
+    dependent        = $(TAO_ROOT)/orbsvcs/PSS/psdl_tao
     command          = $(TAO_ROOT)/orbsvcs/PSS/psdl_tao
     libpath          = $(ACE_ROOT)/lib
     inputext         = .psdl
diff --git a/bin/MakeProjectCreator/config/taoidldefaults.mpb b/bin/MakeProjectCreator/config/taoidldefaults.mpb
index 0bde5a6f07b..c00a576b4de 100644
--- a/bin/MakeProjectCreator/config/taoidldefaults.mpb
+++ b/bin/MakeProjectCreator/config/taoidldefaults.mpb
@@ -5,13 +5,14 @@ project {
   // Set the idl compiler and flags as template values
   specific {
     tao_idl      = $(ACE_ROOT)/bin/tao_idl
+    tao_idl_dep  = $(ACE_ROOT)/bin/tao_idl
     tao_idlflags = -Ge 1 -Wb,pre_include=ace/pre.h \
                    -Wb,post_include=ace/post.h -I$(TAO_ROOT)
   }
 
   Define_Custom(IDL) {
     automatic            = 1
-    dependent            = 1
+    dependent            = $(TAO_IDL_DEP)
     command              = $(TAO_IDL)
     libpath              = $(ACE_ROOT)/lib
     inputext             = .idl
diff --git a/bin/MakeProjectCreator/config/trading_serv.mpc b/bin/MakeProjectCreator/config/trading_serv.mpb
index 1cb8109e4b8..1cb8109e4b8 100644
--- a/bin/MakeProjectCreator/config/trading_serv.mpc
+++ b/bin/MakeProjectCreator/config/trading_serv.mpb
diff --git a/bin/MakeProjectCreator/config/trading_skel.mpc b/bin/MakeProjectCreator/config/trading_skel.mpb
index ee926a85d59..ee926a85d59 100644
--- a/bin/MakeProjectCreator/config/trading_skel.mpc
+++ b/bin/MakeProjectCreator/config/trading_skel.mpb
diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd
index 667006fecf2..c1a0003922c 100644
--- a/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/bin/MakeProjectCreator/templates/gnu.mpd
@@ -83,6 +83,9 @@ ACE_SHLIBS =<%foreach(libs)%> -l<%lib%><%endfor%><%foreach(pure_libs)%> <%pure_l
 <%if(tao_idl)%>
 TAO_IDL = <%tao_idl%>
 <%endif%>
+<%if(tao_idl_dep)
+TAO_IDL_DEP = <%tao_idl%>
+<%endif%>
 <%if(tao_idlflags)%>
 TAO_IDLFLAGS = <%tao_idlflags%>
 <%endif%>
@@ -419,7 +422,7 @@ ifeq ($(wildcard $(GENERATED_DIRTY)), $(GENERATED_DIRTY))
       ## with respect to the source file.  Now we need to make sure that
       ## they are up-to-date with respect to the generation tool.  If the tool
       ## is newer than the generated files, then we need the special rule.
-      ifneq ($(shell<%foreach(custom_type->input_file->output_files)%> /bin/test <%custom_type->command%>$(EXEEXT) -nt <%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%> 2> /dev/null &&<%endfor%> echo 0),)
+      ifneq ($(shell<%foreach(custom_type->input_file->output_files)%> /bin/test <%custom_type->dependent%> -nt <%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%> 2> /dev/null &&<%endfor%> echo 0),)
         .NOTPARALLEL:
       endif
 <%endif%>
@@ -432,7 +435,7 @@ else
 endif
 <%endif%>
 <%endfor%>
-<%foreach(custom_type->input_file->output_files)%><%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%><%fornotlast(" ")%><%endfor%>: <%custom_type->input_file%><%if(custom_type->dependent)%> <%custom_type->command%>$(EXEEXT)<%endif%>
+<%foreach(custom_type->input_file->output_files)%><%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%><%fornotlast(" ")%><%endfor%>: <%custom_type->input_file%><%if(custom_type->dependent)%> <%custom_type->dependent%><%endif%>
 	<%custom_type->command%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> <%custom_type->input_file%> <%if(custom_type->output_option)%><%custom_type->output_option%> $@<%endif%>
 <%if(flag_overrides(custom_type->input_file, postcommand))%>
 <%foreach(custom_type->input_file->output_files)%>