ChangeLogTag: Tue Feb 1 13:39:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

18 files changed, 35 insertions, 32 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 018d2d3e281..f1054f1063a 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,12 @@
+Tue Feb  1 13:41:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/CCM_Core.mpc:
+        * DAnCE/ciao/CCM_Core.mpc:
+          Removed ciaoversion as base project. This will be removed because it
+          results in the fact that each generated GNU makefile will get the
+          version number generated. We want that the GNU make rules get the
+          version number from Version.h
+
 Mon Jan 31 21:00:12 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
 	* CIDLC/ServantSourceGenerator.cpp (pre):
diff --git a/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc b/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc
index faf5b489945..ac8e24ef6ad 100644
--- a/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc
+++ b/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project (CIAO_DnC_Client) : taolib_with_idl, valuetype, ifr_client, ciaoversion {
+project (CIAO_DnC_Client) : taolib_with_idl, valuetype, ifr_client {
   sharedname  = CIAO_DnC_Client
   idlflags  += -Wb,stub_export_include=CIAO_Client_Export.h
   idlflags  += -Wb,stub_export_macro=CIAO_CLIENT_Export
diff --git a/TAO/CIAO/ciao/CCM_Core.mpc b/TAO/CIAO/ciao/CCM_Core.mpc
index 8423a05a343..0384776906e 100644
--- a/TAO/CIAO/ciao/CCM_Core.mpc
+++ b/TAO/CIAO/ciao/CCM_Core.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project (CIAO_Client) : taolib_with_idl, valuetype, ifr_client, ciaoversion {
+project (CIAO_Client) : taolib_with_idl, valuetype, ifr_client {
   sharedname  = CIAO_Client
   idlflags  += -Sc -Wb,stub_export_include=CIAO_Client_Export.h -Wb,stub_export_macro=CIAO_CLIENT_Export -Wb,skel_export_include=CIAO_Container_Export.h -Wb,skel_export_macro=CIAO_CONTAINER_Export
   dynamicflags    = CIAO_CLIENT_BUILD_DLL
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 67877445b3a..d4a92784cf5 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,15 @@
+Tue Feb  1 13:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/FlResource.mpc:
+        * tao/QtResource.mpc:
+        * tao/tao.mpc:
+        * tao/TkResource.mpc:
+        * tao/XtResource.mpc:
+          Removed taoversion as base project. This will be removed because it
+          results in the fact that each generated GNU makefile will get the
+          version number generated. We want that the GNU make rules get the
+          version number from Version.h
+
 Tue Feb  1 13:24:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/diffs/IOP.diff:
diff --git a/ace/ace.mpc b/ace/ace.mpc
index cd4686e0d70..1959cb09e44 100644
--- a/ace/ace.mpc
+++ b/ace/ace.mpc
@@ -1,7 +1,7 @@
 //  -*- MPC -*- now wouldn't this be cool...
 // $Id$
 
-project(ACE) : acedefaults, aceversion, core, other, codecs, token, svcconf, uuid, filecache {
+project(ACE) : acedefaults, core, other, codecs, token, svcconf, uuid, filecache {
   libout       = $(ACE_ROOT)/lib
   sharedname   = ACE
   dynamicflags = ACE_BUILD_DLL
diff --git a/ace/ace_flreactor.mpc b/ace/ace_flreactor.mpc
index 61e0e53878e..af3f7afaf9c 100644
--- a/ace/ace_flreactor.mpc
+++ b/ace/ace_flreactor.mpc
@@ -1,7 +1,7 @@
 //  -*- MPC -*- now wouldn't this be cool...
 // $Id$
 
-project(ACE_FlReactor) : acedefaults, aceversion, core, acelib, ace_fl{
+project(ACE_FlReactor) : acedefaults, core, acelib, ace_fl{
 
   sharedname   = ACE_FlReactor
   dynamicflags = ACE_FLREACTOR_BUILD_DLL
diff --git a/ace/ace_qtreactor.mpc b/ace/ace_qtreactor.mpc
index d53f0e4eef9..549181b1348 100644
--- a/ace/ace_qtreactor.mpc
+++ b/ace/ace_qtreactor.mpc
@@ -1,7 +1,7 @@
 //  -*- MPC -*- now wouldn't this be cool...
 // $Id$
 
-project(ACE_QtReactor) : acedefaults, aceversion, core, acelib, ace_qt {
+project(ACE_QtReactor) : acedefaults, core, acelib, ace_qt {
 
   sharedname   = ACE_QtReactor
   dynamicflags = ACE_QTREACTOR_BUILD_DLL
diff --git a/ace/ace_tkreactor.mpc b/ace/ace_tkreactor.mpc
index 0d39c15a39a..fbbda18160c 100644
--- a/ace/ace_tkreactor.mpc
+++ b/ace/ace_tkreactor.mpc
@@ -1,7 +1,7 @@
 //  -*- MPC -*- now wouldn't this be cool...
 // $Id$
 
-project(ACE_TkReactor) : acedefaults, aceversion, core, acelib, ace_tk {
+project(ACE_TkReactor) : acedefaults, core, acelib, ace_tk {
 
   sharedname   = ACE_TkReactor
   dynamicflags = ACE_TKREACTOR_BUILD_DLL
diff --git a/ace/ace_xtreactor.mpc b/ace/ace_xtreactor.mpc
index 96fdb154b82..9d8c44e666f 100644
--- a/ace/ace_xtreactor.mpc
+++ b/ace/ace_xtreactor.mpc
@@ -1,7 +1,7 @@
 //  -*- MPC -*- now wouldn't this be cool...
 // $Id$
 
-project(ACE_XtReactor) : acedefaults, aceversion, core, acelib, ace_xt {
+project(ACE_XtReactor) : acedefaults, core, acelib, ace_xt {
 
   sharedname   = ACE_XtReactor
   dynamicflags = ACE_XTREACTOR_BUILD_DLL
diff --git a/bin/MakeProjectCreator/config/aceexe.mpb b/bin/MakeProjectCreator/config/aceexe.mpb
index 42615038802..f4d01056653 100644
--- a/bin/MakeProjectCreator/config/aceexe.mpb
+++ b/bin/MakeProjectCreator/config/aceexe.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: acedefaults, aceversion {
+project: acedefaults {
   after    += ACE
   libs     += ACE
 }
diff --git a/bin/MakeProjectCreator/config/acelib.mpb b/bin/MakeProjectCreator/config/acelib.mpb
index d008368c4dc..c7b18701fd1 100644
--- a/bin/MakeProjectCreator/config/acelib.mpb
+++ b/bin/MakeProjectCreator/config/acelib.mpb
@@ -1,10 +1,10 @@
 // -*- MPC -*-
 // $Id$
 
-project: acedefaults, aceversion, pkgconfig {
+project: acedefaults, pkgconfig {
   after    += ACE
   libs     += ACE
-  libout    = $(ACE_ROOT)/lib 
+  libout    = $(ACE_ROOT)/lib
 
   specific(automake) {
     libout -= $(ACE_ROOT)/lib
diff --git a/bin/MakeProjectCreator/config/aceversion.mpb b/bin/MakeProjectCreator/config/aceversion.mpb
deleted file mode 100644
index 2287260b7ca..00000000000
--- a/bin/MakeProjectCreator/config/aceversion.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project {
-  version = 5.4.3
-}
diff --git a/bin/MakeProjectCreator/config/ciao_client.mpb b/bin/MakeProjectCreator/config/ciao_client.mpb
index 0b423d8808b..065a163bf2d 100644
--- a/bin/MakeProjectCreator/config/ciao_client.mpb
+++ b/bin/MakeProjectCreator/config/ciao_client.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcslib, ifr_client, valuetype, security, taoidldefaults, ciaoversion {
+project : orbsvcslib, ifr_client, valuetype, security, taoidldefaults {
   after    += CIAO_Client
   includes   += $(CIAO_ROOT) $(CIAO_ROOT)/ciao
   idlflags += -I$(CIAO_ROOT) -I$(CIAO_ROOT)/ciao
diff --git a/bin/MakeProjectCreator/config/ciao_client_dnc.mpb b/bin/MakeProjectCreator/config/ciao_client_dnc.mpb
index 58fec059cbf..0e36740bdb8 100644
--- a/bin/MakeProjectCreator/config/ciao_client_dnc.mpb
+++ b/bin/MakeProjectCreator/config/ciao_client_dnc.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : security, ifr_client, valuetype, ciaoversion {
+project : security, ifr_client, valuetype {
   after    += CIAO_DnC_Client
   includes   += $(CIAO_ROOT)/DAnCE $(CIAO_ROOT)/DAnCE/ciao
   idlflags += -I$(CIAO_ROOT)/DAnCE -I$(CIAO_ROOT)/DAnCE/ciao -Sc
diff --git a/bin/MakeProjectCreator/config/ciaoversion.mpb b/bin/MakeProjectCreator/config/ciaoversion.mpb
deleted file mode 100644
index 81c9417893b..00000000000
--- a/bin/MakeProjectCreator/config/ciaoversion.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project {
-  version = 0.4.3
-}
diff --git a/bin/MakeProjectCreator/config/taoexe.mpb b/bin/MakeProjectCreator/config/taoexe.mpb
index f8519f19b41..0fa75b85198 100644
--- a/bin/MakeProjectCreator/config/taoexe.mpb
+++ b/bin/MakeProjectCreator/config/taoexe.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : aceexe, taoversion, taodefaults, taoidldefaults {
+project : aceexe, taodefaults, taoidldefaults {
   after += TAO
   libs  += TAO
 }
diff --git a/bin/MakeProjectCreator/config/taolib.mpb b/bin/MakeProjectCreator/config/taolib.mpb
index ae9910d4e14..8898660cd8c 100644
--- a/bin/MakeProjectCreator/config/taolib.mpb
+++ b/bin/MakeProjectCreator/config/taolib.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : acelib, taoversion, tao_output, taodefaults, pidl {
+project : acelib, tao_output, taodefaults, pidl {
   after += TAO
   libs  += TAO
 }
diff --git a/bin/MakeProjectCreator/config/taoversion.mpb b/bin/MakeProjectCreator/config/taoversion.mpb
deleted file mode 100644
index 75820a61db3..00000000000
--- a/bin/MakeProjectCreator/config/taoversion.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project {
-  version = 1.4.3
-}