ChangeLogTag: Tue May 24 00:23:26 2005 Emre Turkay <turkaye@dre.vanderbilt.edu>

6 files changed, 24 insertions, 62 deletions

diff --git a/TAO/CIAO/CCF/CCF/CIDL/CIDL.mpc b/TAO/CIAO/CCF/CCF/CIDL/CIDL.mpc
index 2282230c383..833f3979582 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/CIDL.mpc
+++ b/TAO/CIAO/CCF/CCF/CIDL/CIDL.mpc
@@ -1,11 +1,10 @@
 //$Id$
 
-project(CIDL) {
-  requires += cidl exceptions
+project(CIDL): cidlc {
   sharedname =
   staticname = CIDL
-  includes += $(CIAO_ROOT)/CCF
   libout = ..
+
   Source_Files {
  	.
 	./SemanticGraph
@@ -13,12 +12,4 @@ project(CIDL) {
         ./SemanticAction
         ./SemanticAction/Impl
   }
-  
-  specific(vc71) {
-    libs += boost_regex_debug boost_filesystem_debug
-  }
-
-  verbatim(gnuace, top) {
-    include ../../Config.rules
-  }
 }
diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/CodeGenerationKit.mpc b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CodeGenerationKit.mpc
index 23e1e308ebd..e978244e1ae 100644
--- a/TAO/CIAO/CCF/CCF/CodeGenerationKit/CodeGenerationKit.mpc
+++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CodeGenerationKit.mpc
@@ -1,17 +1,7 @@
 //$Id$
 
-project(CodeGenerationKit) {
-  requires += cidl exceptions
+project(CodeGenerationKit): cidlc {
   sharedname =
   staticname = CodeGenerationKit
-  includes += $(CIAO_ROOT)/CCF
   libout = ..
-  
-  specific(vc71) {
-    libs += boost_regex_debug boost_filesystem_debug
-  }
-
-  verbatim(gnuace, top) {
-    include ../../Config.rules
-  }
 }
diff --git a/TAO/CIAO/CCF/CCF/CompilerElements/CompilerElements.mpc b/TAO/CIAO/CCF/CCF/CompilerElements/CompilerElements.mpc
index 037d97e2301..54b81f8c557 100644
--- a/TAO/CIAO/CCF/CCF/CompilerElements/CompilerElements.mpc
+++ b/TAO/CIAO/CCF/CCF/CompilerElements/CompilerElements.mpc
@@ -1,17 +1,7 @@
 //$Id$
 
-project(CompilerElements) {
-  requires += cidl exceptions
+project(CompilerElements): cidlc {
   sharedname =
   staticname = CompilerElements
-  includes += $(CIAO_ROOT)/CCF
   libout = ..
-  
-  specific(vc71) {
-    libs += boost_regex_debug boost_filesystem_debug
-  }
-
-  verbatim(gnuace, top) {
-    include ../../Config.rules
-  }
 }
diff --git a/TAO/CIAO/CCF/CCF/IDL2/IDL2.mpc b/TAO/CIAO/CCF/CCF/IDL2/IDL2.mpc
index c56319af393..74273a71a7f 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/IDL2.mpc
+++ b/TAO/CIAO/CCF/CCF/IDL2/IDL2.mpc
@@ -1,25 +1,16 @@
 //$Id$
 
-project(IDL2) {
-  requires += cidl exceptions
+project(IDL2): cidlc {
   sharedname =
   staticname = IDL2
-  includes += $(CIAO_ROOT)/CCF
   libout = ..
-  Source_Files {
-	.
-	./SemanticGraph
-	./Traversal
-        ./SemanticAction
-        ./SemanticAction/Impl
 
-  }
-  
-  specific(vc71) {
-    libs += boost_regex_debug boost_filesystem_debug
-  }
+  Source_Files {
+    .
+    ./SemanticGraph
+    ./Traversal
+    ./SemanticAction
+    ./SemanticAction/Impl
 
-  verbatim(gnuace, top) {
-    include ../../Config.rules
   }
 }
diff --git a/TAO/CIAO/CCF/CCF/IDL3/IDL3.mpc b/TAO/CIAO/CCF/CCF/IDL3/IDL3.mpc
index d6cd8bfe316..593cc40c098 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/IDL3.mpc
+++ b/TAO/CIAO/CCF/CCF/IDL3/IDL3.mpc
@@ -1,11 +1,10 @@
 //$Id$
 
-project(IDL3) {
-  requires += cidl exceptions
+project(IDL3): cidlc {
   sharedname =
   staticname = IDL3
-  includes += $(CIAO_ROOT)/CCF
   libout = ..
+
   Source_Files {
         .
 	./SemanticGraph
@@ -13,13 +12,4 @@ project(IDL3) {
         ./SemanticAction/Impl
 
   }
-
-  specific(vc71) {
-    libs += boost_regex_debug boost_filesystem_debug
-  }
-
-  verbatim(gnuace, top) {
-    include ../../Config.rules
-  }
-
 }
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 5667c725225..81884c0f2a5 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,13 @@
+Tue May 24 00:23:26 2005  Emre Turkay  <turkaye@dre.vanderbilt.edu>
+
+        * CCF/CCF/CIDL/CIDL.mpc:
+        * CCF/CCF/CodeGenerationKit/CodeGenerationKit.mpc:
+        * CCF/CCF/CompilerElements/CompilerElements.mpc:
+        * CCF/CCF/IDL2/IDL2.mpc:
+        * CCF/CCF/IDL3/IDL3.mpc:
+
+          Changed the mpc files to use the cidlc.mpb.
+
 Sun May 22 21:23:48 2005  Gan Deng <gan.deng@vanderbilt.edu>
 
 	* DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
@@ -98,7 +108,7 @@ Tue May 17 20:49:48 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
         * CIAO/tests/IDL3/ImpliedIDL/All/pass_through.idl:
         * CIAO/tests/IDL3/ImpliedIDL/All/include.idl:
         * CIAO/tests/IDL3/ImpliedIDL/All/README:
-        
+
           New files comprising a test for the tao_idl3_to_idl2
           executable. The test executes tao_idl3_to_idl2 on the
           listed IDL files, then executes the TAO IDL compiler on