ChangeLogTag: Wed Jan 7 12:13:12 2004 Chad Elliott <elliott_c@ociweb.com>

10 files changed, 61 insertions, 38 deletions

diff --git a/ChangeLog b/ChangeLog
index 6c2d8a5c715..bff50a6470e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,17 +1,37 @@
+Wed Jan  7 12:13:12 2004  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/config/orbsvcs_output.mpb:
+        * bin/MakeProjectCreator/config/orbsvcsexe.mpb:
+        * bin/MakeProjectCreator/config/tao_output.mpb:
+        * bin/MakeProjectCreator/config/taodefaults.mpb:
+        * bin/MakeProjectCreator/config/taoexe.mpb:
+        * bin/MakeProjectCreator/config/taolib.mpb:
+
+          Factored staticflags, includes and libpaths common to TAO based   
+          projects into a taodefaults base project and modified other base  
+          projects in accordance.
+
+        * bin/MakeProjectCreator/config/orbsvcslib.mpb:
+        * bin/MakeProjectCreator/config/taoidldefaults.mpb: 
+        * bin/MakeProjectCreator/config/taolib_with_idl.mpb:
+
+          Factored common idlflags and after settings into a taoidldefaults 
+          base project and modified other base projects in accordance.
+
 Wed Jan  7 17:50:13 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-	* apps/gperf/tests/c++-res.exp:
-	* apps/gperf/tests/c++.gperf:
-	* apps/gperf/tests/cpp-res.exp:
-	* apps/gperf/tests/cpp.gperf:
-	  Removed the c++ files and added them with cpp again. The BCB makefile
-	  environment can't handle files with a + in the name. Because we are
-	  using MPC this test is now also build with Borland.
-
-	* apps/gperf/tests/Makefile:
-	* apps/gperf/tests/Makefile.am:
-	* apps/gperf/tests/tests.mpc:
-	  Updated these files to reflect the change above.
+        * apps/gperf/tests/c++-res.exp:
+        * apps/gperf/tests/c++.gperf:
+        * apps/gperf/tests/cpp-res.exp:
+        * apps/gperf/tests/cpp.gperf:
+          Removed the c++ files and added them with cpp again. The BCB makefile
+          environment can't handle files with a + in the name. Because we are
+          using MPC this test is now also build with Borland.
+
+        * apps/gperf/tests/Makefile:
+        * apps/gperf/tests/Makefile.am:
+        * apps/gperf/tests/tests.mpc:
+          Updated these files to reflect the change above.
 
 Wed Jan  7 10:34:29 2004  Chad Elliott  <elliott_c@ociweb.com>
 
diff --git a/bin/MakeProjectCreator/config/orbsvcs_output.mpb b/bin/MakeProjectCreator/config/orbsvcs_output.mpb
index e4a8f72df72..95d1feb1d9c 100644
--- a/bin/MakeProjectCreator/config/orbsvcs_output.mpb
+++ b/bin/MakeProjectCreator/config/orbsvcs_output.mpb
@@ -2,9 +2,7 @@
 // $Id$
 
 project {
-  staticflags += TAO_AS_STATIC_LIBS
   // We tested with all orbsvcs libs going to $(TAO_ROOT)/orbsvcs/lib, but
-  // decided that it was easier to deal with all libs in one place. 
-  libpaths    += $(ACE_ROOT)/lib
-  libout       = $(ACE_ROOT)/lib 
-}
\ No newline at end of file
+  // decided that it was easier to deal with all libs in one place.
+  libout = $(ACE_ROOT)/lib
+}
diff --git a/bin/MakeProjectCreator/config/orbsvcsexe.mpb b/bin/MakeProjectCreator/config/orbsvcsexe.mpb
index a7e7526c98f..89c5beb946c 100644
--- a/bin/MakeProjectCreator/config/orbsvcsexe.mpb
+++ b/bin/MakeProjectCreator/config/orbsvcsexe.mpb
@@ -4,6 +4,5 @@
 project : taoexe {
   includes += $(TAO_ROOT)/orbsvcs
   idlflags += -I$(TAO_ROOT)/orbsvcs
-  libpaths += $(ACE_ROOT)/lib
   compname  = --orbsvcs
 }
diff --git a/bin/MakeProjectCreator/config/orbsvcslib.mpb b/bin/MakeProjectCreator/config/orbsvcslib.mpb
index ea9b15ba650..312728f1bc8 100644
--- a/bin/MakeProjectCreator/config/orbsvcslib.mpb
+++ b/bin/MakeProjectCreator/config/orbsvcslib.mpb
@@ -3,7 +3,7 @@
 
 project : taolib_with_idl, orbsvcs_output {
   includes   += $(TAO_ROOT)/orbsvcs
-  idlflags   += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
+  idlflags   += -I$(TAO_ROOT)/orbsvcs
   compname    = --orbsvcs
   tagname     = TAO_ORBSVCS
   include_dir = orbsvcs
diff --git a/bin/MakeProjectCreator/config/tao_output.mpb b/bin/MakeProjectCreator/config/tao_output.mpb
index 0c184cc3811..12124d9eb31 100644
--- a/bin/MakeProjectCreator/config/tao_output.mpb
+++ b/bin/MakeProjectCreator/config/tao_output.mpb
@@ -3,9 +3,7 @@
 
 project {
   // We tested with all tao libs going to $(TAO_ROOT)/lib, but
-  // decided that it was easier to deal with all libs in one place. 
-  libout        = $(ACE_ROOT)/lib 
-  libpaths     += $(ACE_ROOT)/lib
-  staticflags  += TAO_AS_STATIC_LIBS
+  // decided that it was easier to deal with all libs in one place.
+  libout = $(ACE_ROOT)/lib
 }
 
diff --git a/bin/MakeProjectCreator/config/taodefaults.mpb b/bin/MakeProjectCreator/config/taodefaults.mpb
new file mode 100644
index 00000000000..83fc64b36d1
--- /dev/null
+++ b/bin/MakeProjectCreator/config/taodefaults.mpb
@@ -0,0 +1,8 @@
+// -*- MPC -*-
+// $Id$
+
+project {
+  staticflags += TAO_AS_STATIC_LIBS
+  includes    += $(TAO_ROOT) $(TAO_ROOT)/tao
+  libpaths    += $(ACE_ROOT)/lib
+}
diff --git a/bin/MakeProjectCreator/config/taoexe.mpb b/bin/MakeProjectCreator/config/taoexe.mpb
index 93792f8c526..f8519f19b41 100644
--- a/bin/MakeProjectCreator/config/taoexe.mpb
+++ b/bin/MakeProjectCreator/config/taoexe.mpb
@@ -1,12 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : aceexe, taoversion {
-  after       += TAO TAO_IDL_EXE
-  includes    += $(TAO_ROOT) $(TAO_ROOT)/tao
-  libpaths    += $(ACE_ROOT)/lib
-  idlflags    += -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h 
-  idlflags    += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao
-  staticflags += TAO_AS_STATIC_LIBS
-  libs        += TAO
+project : aceexe, taoversion, taodefaults, taoidldefaults {
+  after += TAO
+  libs  += TAO
 }
diff --git a/bin/MakeProjectCreator/config/taoidldefaults.mpb b/bin/MakeProjectCreator/config/taoidldefaults.mpb
new file mode 100644
index 00000000000..12fc0a87e11
--- /dev/null
+++ b/bin/MakeProjectCreator/config/taoidldefaults.mpb
@@ -0,0 +1,8 @@
+// -*- MPC -*-
+// $Id$
+
+project {
+  after    += TAO_IDL_EXE
+  idlflags += -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h \
+              -I$(TAO_ROOT) -I$(TAO_ROOT)/tao
+}
diff --git a/bin/MakeProjectCreator/config/taolib.mpb b/bin/MakeProjectCreator/config/taolib.mpb
index 8e507d3c423..7a0a92a034f 100644
--- a/bin/MakeProjectCreator/config/taolib.mpb
+++ b/bin/MakeProjectCreator/config/taolib.mpb
@@ -1,8 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : acelib, taoversion, tao_output {
-  after    += TAO
-  libs     += TAO
-  includes += $(TAO_ROOT) $(TAO_ROOT)/tao
+project : acelib, taoversion, tao_output, taodefaults {
+  after += TAO
+  libs  += TAO
 }
diff --git a/bin/MakeProjectCreator/config/taolib_with_idl.mpb b/bin/MakeProjectCreator/config/taolib_with_idl.mpb
index 75f94a949aa..cc36293c909 100644
--- a/bin/MakeProjectCreator/config/taolib_with_idl.mpb
+++ b/bin/MakeProjectCreator/config/taolib_with_idl.mpb
@@ -1,7 +1,5 @@
 // -*- MPC -*-
 // $Id$
 
-project : taolib {
-  after    += TAO_IDL_EXE
-  idlflags += -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h 
+project : taolib, taoidldefaults {
 }