ChangeLogTag: Fri Jun 23 18:39:21 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

2 files changed, 9 insertions, 9 deletions

diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
index de27cdf0894..2eb932386ab 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
@@ -5,10 +5,10 @@
 // necessary to add minimum_corba to 'avoids' here.
 project(IFR_Service) : orbsvcsexe, core, ifrservice, ifr_client, imr_client, crosscompile {
   exename = IFR_Service
-  
+
   IDL_Files {
   }
-  
+
   Source_Files {
     IFR_Server.cpp
     IFR_Service.cpp
@@ -35,7 +35,7 @@ project(TAO_IFR_BE) : taolib, conv_lib, ifr_client, crosscompile, minimum_corba
     ifr_removing_visitor.cpp
     ifr_visitor.cpp
   }
-  
+
   Header_Files {
     be_extern.h
   }
@@ -48,7 +48,7 @@ project(TAO_IFR_EXE) : aceexe, core, ifr_client, crosscompile, minimum_corba {
   libs           += TAO_IFR_BE TAO TAO_IDL_FE
   includes       += $(TAO_ROOT)/orbsvcs/IFR_Service \
                     $(TAO_ROOT)/TAO_IDL/include \
-                    $(TAO_ROOT)/TAO_IDL/fe
+                    $(TAO_ROOT)/TAO_IDL/fe \
                     $(TAO_ROOT)
   install         = $(ACE_ROOT)/bin
 
@@ -69,7 +69,7 @@ project(TAO_IFR_EXE) : aceexe, core, ifr_client, crosscompile, minimum_corba {
     drv_preproc.cpp
     tao_idl.cpp
   }
-  
+
   Header_Files {
     $(TAO_ROOT)/TAO_IDL/include/drv_extern.h
   }
diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc
index 4723b826b84..7aa20c5c0c0 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -1,12 +1,9 @@
 //$Id$
 
-project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
+project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_versioning_idl_defaults {
   sharedname   = TAO
   dynamicflags = TAO_BUILD_DLL
 
-  // It is no longer necessary to override IDL_Files since it is a
-  // custom build type and comes from the taoidldefaults base project.
-
   Source_Files(TAO_COMPONENTS) {
     Abstract_Servant_Base.cpp
     Acceptor_Filter.cpp
@@ -583,6 +580,9 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     orb.idl
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     TAO.pc.in
   }