1 files changed, 16 insertions, 85 deletions

diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.mpc b/TAO/orbsvcs/orbsvcs/CosProperty.mpc
index cc73a0a5fc8..e4aa9fbbfde 100644
--- a/TAO/orbsvcs/orbsvcs/CosProperty.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosProperty.mpc
@@ -1,9 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosProperty_IDL) : orbsvcslib, core, tao_versioning_idl_defaults {
-  custom_only = 1
-  idlflags   += -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h
+project(CosProperty) : orbsvcslib, core, portableserver {
+  sharedname   = TAO_CosProperty
+  idlflags    += -Wb,export_macro=TAO_Property_Export -Wb,export_include=orbsvcs/Property/property_export.h
+  dynamicflags = TAO_PROPERTY_BUILD_DLL
+  tagchecks   += Property
+  pch_header   =
+  pch_source   =
 
   IDL_Files {
     CosProperty.idl
@@ -11,71 +15,29 @@ project(CosProperty_IDL) : orbsvcslib, core, tao_versioning_idl_defaults {
     // This is a wrappper for backwards compatibility
     CosPropertyService.idl
   }
-}
-
-project(CosProperty) : orbsvcslib, core {
-  sharedname   = TAO_CosProperty
-  dynamicflags = TAO_PROPERTY_BUILD_DLL
-  tagchecks   += Property
-  after       += CosProperty_IDL
-
-  IDL_Files {
-  }
 
   Source_Files {
     CosPropertyC.cpp
-    CosPropertyServiceC.cpp
-  }
-
-  Header_Files {
-    CosPropertyC.h
-    CosPropertyServiceC.h
-    Property/property_export.h
-  }
-
-  Inline_Files {
-    CosPropertyC.inl
-    CosPropertyServiceC.inl
-  }
-
-  Template_Files {
-  }
-
-  // explicit Resource_Files to avoid including _Skel and _Serv rc files.
-  Resource_Files {
-  }
-
-  Pkgconfig_Files {
-    TAO_CosProperty.pc.in
-  }
-}
-
-project(CosProperty_Skel) : orbsvcslib, core, property, portableserver {
-  sharedname   = TAO_CosProperty_Skel
-  dynamicflags = TAO_PROPERTY_SKEL_BUILD_DLL
-  tagchecks   += Property
-
-  IDL_Files {
-  }
-
-  Source_Files {
     CosPropertyS.cpp
+    CosPropertyServiceC.cpp
     CosPropertyServiceS.cpp
+    Property
   }
 
   Header_Files {
+    CosPropertyC.h
     CosPropertyS.h
-    CosPropertyS_T.h
+    CosPropertyServiceC.h
     CosPropertyServiceS.h
-    CosPropertyServiceS_T.h
-    Property/property_skel_export.h
+    Property
   }
 
   Inline_Files {
+    CosPropertyC.inl
     CosPropertyS.inl
-    CosPropertyS_T.inl
+    CosPropertyServiceC.inl
     CosPropertyServiceS.inl
-    CosPropertyServiceS_T.inl
+    Property
   }
 
   Template_Files {
@@ -84,37 +46,6 @@ project(CosProperty_Skel) : orbsvcslib, core, property, portableserver {
   }
 
   Pkgconfig_Files {
-    TAO_CosProperty_Skel.pc.in
-  }
-}
-
-project(CosProperty_Serv) : orbsvcslib, core, property_skel {
-  sharedname   = TAO_CosProperty_Serv
-  dynamicflags = TAO_PROPERTY_SERV_BUILD_DLL
-  tagchecks   += Property
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Property
-  }
-
-  Header_Files {
-    Property
-    ^Property/property_export.h
-    ^Property/property_skel_export.h
-  }
-
-  Inline_Files {
-    Property
-  }
-
-  Template_Files {
-    Property
-  }
-
-  Pkgconfig_Files {
-    TAO_CosProperty_Serv.pc.in
+    TAO_CosProperty.pc.in
   }
 }