ChangeLogTag: Wed Feb 4 14:21:46 2004 Jeff Parsons <j.parsons@vanderbilt.edu>

8 files changed, 20 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 3bb57434290..b4b07211fd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Wed Feb  4 14:21:46 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * bin/MakeProjectCreator/config/ciao_client.mpb:
+        * bin/MakeProjectCreator/config/ciao_servant.mpb:
+        * bin/MakeProjectCreator/config/orbsvcsexe.mpb:
+        * bin/MakeProjectCreator/config/orbsvcslib.mpb:
+        * bin/MakeProjectCreator/config/taodefaults.mpb:
+        * bin/MakeProjectCreator/config/taoidldefaults.mpb:
+        * bin/MakeProjectCreator/config/valuetype.mpb:
+        
+          Removed all path includes except TAO_ROOT and CIAO_ROOT,
+          for IDL, CIDL and C++ compilers.
+
 Wed Feb  4 18:15:16 UTC 2004  Craig Rodrigues <crodrigu@bbn.com>
 
         * include/makeinclude/platform_linux.GNU: Allow
diff --git a/bin/MakeProjectCreator/config/ciao_client.mpb b/bin/MakeProjectCreator/config/ciao_client.mpb
index 77beea1fcd4..c63fd23c770 100644
--- a/bin/MakeProjectCreator/config/ciao_client.mpb
+++ b/bin/MakeProjectCreator/config/ciao_client.mpb
@@ -3,8 +3,8 @@
 
 project : orbsvcslib, ifr_client, valuetype, security, taoidldefaults {
   after    += CIAO_Client
-  includes   += $(TAO_ROOT)/orbsvcs/orbsvcs
-  idlflags += -I$(CIAO_ROOT) -I$(TAO_ROOT)/CIAO/ciao -I$(TAO_ROOT)/orbsvcs/orbsvcs
+  includes   += $(CIAO_ROOT)
+  idlflags += -I$(CIAO_ROOT)
   libs     += CIAO_Client
-  includes += $(CIAO_ROOT) $(CIAO_ROOT)/ciao
+  includes += $(CIAO_ROOT)
 }
diff --git a/bin/MakeProjectCreator/config/ciao_servant.mpb b/bin/MakeProjectCreator/config/ciao_servant.mpb
index 47f0ac86a68..c80fda74c89 100644
--- a/bin/MakeProjectCreator/config/ciao_servant.mpb
+++ b/bin/MakeProjectCreator/config/ciao_servant.mpb
@@ -8,7 +8,7 @@ project : ciao_component {
   Define_Custom(CIDL) {
     automatic         = 0
     command           = $(CIAO_ROOT)/bin/cidlc
-    commandflags      = -I$(CIAO_ROOT)/ciao -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -I$(TAO_ROOT)/orbsvcs/orbsvcs --
+    commandflags      = -I$(CIAO_ROOT) -I$(TAO_ROOT) --
     inputext          = .cidl
     source_outputext  = _svnt.cpp
     generic_outputext = E.idl
diff --git a/bin/MakeProjectCreator/config/orbsvcsexe.mpb b/bin/MakeProjectCreator/config/orbsvcsexe.mpb
index e61b737ac10..02e945a6bc2 100644
--- a/bin/MakeProjectCreator/config/orbsvcsexe.mpb
+++ b/bin/MakeProjectCreator/config/orbsvcsexe.mpb
@@ -2,6 +2,4 @@
 // $Id$
 
 project : taoexe {
-  includes += $(TAO_ROOT)/orbsvcs
-  idlflags += -I$(TAO_ROOT)/orbsvcs
 }
diff --git a/bin/MakeProjectCreator/config/orbsvcslib.mpb b/bin/MakeProjectCreator/config/orbsvcslib.mpb
index bf0e18860f5..5a7b2faf814 100644
--- a/bin/MakeProjectCreator/config/orbsvcslib.mpb
+++ b/bin/MakeProjectCreator/config/orbsvcslib.mpb
@@ -2,7 +2,5 @@
 // $Id$
 
 project : taolib_with_idl, orbsvcs_output {
-  includes   += $(TAO_ROOT)/orbsvcs
-  idlflags   += -I$(TAO_ROOT)/orbsvcs
   tagname     = TAO_ORBSVCS
 }
diff --git a/bin/MakeProjectCreator/config/taodefaults.mpb b/bin/MakeProjectCreator/config/taodefaults.mpb
index 83fc64b36d1..cc3b876c7e6 100644
--- a/bin/MakeProjectCreator/config/taodefaults.mpb
+++ b/bin/MakeProjectCreator/config/taodefaults.mpb
@@ -3,6 +3,6 @@
 
 project {
   staticflags += TAO_AS_STATIC_LIBS
-  includes    += $(TAO_ROOT) $(TAO_ROOT)/tao
+  includes    += $(TAO_ROOT)
   libpaths    += $(ACE_ROOT)/lib
 }
diff --git a/bin/MakeProjectCreator/config/taoidldefaults.mpb b/bin/MakeProjectCreator/config/taoidldefaults.mpb
index f26b10b8a01..d8a3955baa1 100644
--- a/bin/MakeProjectCreator/config/taoidldefaults.mpb
+++ b/bin/MakeProjectCreator/config/taoidldefaults.mpb
@@ -16,5 +16,5 @@ 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
+              -I$(TAO_ROOT)
 }
diff --git a/bin/MakeProjectCreator/config/valuetype.mpb b/bin/MakeProjectCreator/config/valuetype.mpb
index 6d5f4505cbe..482663c9148 100644
--- a/bin/MakeProjectCreator/config/valuetype.mpb
+++ b/bin/MakeProjectCreator/config/valuetype.mpb
@@ -1,8 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: taolib_with_idl {
-  idlflags += -Gv
+project: taolib {
   after    += Valuetype
   libs     += TAO_Valuetype
 }