1 files changed, 11 insertions, 87 deletions
diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
index 99fab62e680..3f313dae277 100644
--- a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
@@ -1,106 +1,30 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosConcurrency_IDL): orbsvcslib, core, tao_versioning_idl_defaults {
-  custom_only = 1
-  idlflags   += -Wb,stub_export_macro=TAO_Concurrency_Export -Wb,stub_export_include=orbsvcs/Concurrency/concurrency_export.h -Wb,skel_export_macro=TAO_Concurrency_Skel_Export -Wb,skel_export_include=orbsvcs/Concurrency/concurrency_skel_export.h
-
-  IDL_Files {
-    CosConcurrencyControl.idl
-  }
-}
-
-project(CosConcurrency) : orbsvcslib, core {
+project(CosConcurrency) : orbsvcslib, core, portableserver {
   sharedname   = TAO_CosConcurrency
+  idlflags    += -Wb,export_macro=TAO_Concurrency_Export -Wb,export_include=orbsvcs/Concurrency/concurrency_export.h
   dynamicflags = TAO_CONCURRENCY_BUILD_DLL
   tagchecks   += Concurrency
-  after       += CosConcurrency_IDL
+  pch_header   =
+  pch_source   =
 
   IDL_Files {
+    CosConcurrencyControl.idl
   }
 
-  Source_Files {
-    CosConcurrencyControlC.cpp
-  }
-
-  Header_Files {
-    CosConcurrencyControlC.h
-    Concurrency/concurrency_export.h
-  }
-
-  Inline_Files {
-    CosConcurrencyControlC.inl
+  Source_Files(ORBSVCS_COMPONENTS) {
+    Concurrency {
+      CosConcurrencyControlC.cpp
+      CosConcurrencyControlS.cpp
+      Concurrency
+    }
   }
 
   Template_Files {
   }
 
-  // explicit Resource_Files to avoid including _Skel & _Serv rc files.
-  Resource_Files {
-  }
-
   Pkgconfig_Files {
     TAO_CosConcurrency.pc.in
   }
 }
-
-project(CosConcurrency_Skel): orbsvcslib, core, concurrency, portableserver {
-  sharedname   = TAO_CosConcurrency_Skel
-  dynamicflags = TAO_CONCURRENCY_SKEL_BUILD_DLL
-  tagchecks   += Concurrency
-  after       += CosConcurrency_IDL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CosConcurrencyControlS.cpp
-  }
-
-  Header_Files {
-    CosConcurrencyControlS.h
-    Concurrency/concurrency_skel_export.h
-  }
-
-  Inline_Files {
-    CosConcurrencyControlS.inl
-  }
-
-  Template_Files {
-  }
-
-  Pkgconfig_Files {
-    TAO_CosConcurrency_Skel.pc.in
-  }
-}
-
-project(CosConcurrency_Serv) : orbsvcslib, core, concurrency_skel {
-  sharedname   = TAO_CosConcurrency_Serv
-  dynamicflags = TAO_CONCURRENCY_SERV_BUILD_DLL
-  tagchecks   += Concurrency
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Concurrency
-  }
-
-  Header_Files {
-    Concurrency
-    ^Concurrency/concurrency_export.h
-    ^Concurrency/concurrency_skel_export.h
-  }
-
-  Inline_Files {
-    Concurrency
-  }
-
-  Template_Files {
-    Concurrency
-  }
-
-  Pkgconfig_Files {
-    TAO_CosConcurrency_Serv.pc.in
-  }
-}