11 files changed, 41 insertions, 210 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 88ab7cafe06..84c1c4baf68 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,23 @@
+Mon Sep 13 13:38:38 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Compression/bzip2/Bzip2Compressor.mpc:
+        * tao/Compression/lzo/LzoCompressor.mpc:
+        * tao/Compression/zlib/ZlibCompressor.mpc:
+        * tao/FlResource/FlResource.mpc:
+        * tao/FoxResource/FoxResource.mpc:
+        * tao/QtResource/QtResource.mpc:
+        * tao/TkResource/TkResource.mpc:
+          Moved these mpc files to their own directory
+
+        * tao/Bzip2Compressor.mpc:
+        * tao/FlResource.mpc:
+        * tao/FoxResource.mpc:
+        * tao/LzoCompressor.mpc:
+        * tao/QtResource.mpc:
+        * tao/TkResource.mpc:
+        * tao/ZlibCompressor.mpc:
+          Removed these files.
+
 Mon Sep 13 13:29:02 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * docs/PP_Memory_Management.txt:
diff --git a/TAO/tao/Bzip2Compressor.mpc b/TAO/tao/Bzip2Compressor.mpc
deleted file mode 100644
index 878c6828ec1..00000000000
--- a/TAO/tao/Bzip2Compressor.mpc
+++ /dev/null
@@ -1,38 +0,0 @@
-//$Id$
-project(Bzip2Compressor) : taolib, tao_output, install, compression, taoidldefaults, ace_bzip2 {
-  requires += bzip2
-  sharedname   = TAO_Bzip2Compressor
-  dynamicflags += TAO_BZIP2COMPRESSOR_BUILD_DLL
-
-  Source_Files {
-    Compression/bzip2
-  }
-
-  Header_Files {
-    Compression/bzip2
-  }
-
-  Inline_Files {
-    Compression/bzip2
-  }
-
-  Template_Files {
-    Compression/bzip2
-  }
-
-  Resource_Files {
-    Compression/bzip2
-  }
-
-  PIDL_Files {
-    Compression/bzip2
-  }
-
-  IDL_Files {
-    Compression/bzip2
-  }
-
-  Pkgconfig_Files {
-    Compression/bzip2/TAO_Bzip2Compressor.pc.in
-  }
-}
diff --git a/TAO/tao/Compression/bzip2/Bzip2Compressor.mpc b/TAO/tao/Compression/bzip2/Bzip2Compressor.mpc
new file mode 100644
index 00000000000..f85d9a8fad3
--- /dev/null
+++ b/TAO/tao/Compression/bzip2/Bzip2Compressor.mpc
@@ -0,0 +1,7 @@
+//$Id$
+
+project(Bzip2Compressor) : taolib, tao_output, install, compression, taoidldefaults, ace_bzip2 {
+  requires += bzip2
+  sharedname   = TAO_Bzip2Compressor
+  dynamicflags += TAO_BZIP2COMPRESSOR_BUILD_DLL
+}
diff --git a/TAO/tao/Compression/lzo/LzoCompressor.mpc b/TAO/tao/Compression/lzo/LzoCompressor.mpc
new file mode 100644
index 00000000000..afae97b90c0
--- /dev/null
+++ b/TAO/tao/Compression/lzo/LzoCompressor.mpc
@@ -0,0 +1,7 @@
+//$Id$
+
+project(LzoCompressor) : taolib, tao_output, install, compression, taoidldefaults, lzo1 {
+  requires += lzo1
+  sharedname   = TAO_LzoCompressor
+  dynamicflags += TAO_LZOCOMPRESSOR_BUILD_DLL
+}
diff --git a/TAO/tao/Compression/zlib/ZlibCompressor.mpc b/TAO/tao/Compression/zlib/ZlibCompressor.mpc
new file mode 100644
index 00000000000..23861580029
--- /dev/null
+++ b/TAO/tao/Compression/zlib/ZlibCompressor.mpc
@@ -0,0 +1,7 @@
+//$Id$
+
+project(ZlibCompressor) : taolib, tao_output, install, compression, taoidldefaults, ace_zlib {
+  requires += zlib
+  sharedname   = TAO_ZlibCompressor
+  dynamicflags += TAO_ZLIBCOMPRESSOR_BUILD_DLL
+}
diff --git a/TAO/tao/FlResource.mpc b/TAO/tao/FlResource/FlResource.mpc
index 2ea160ffee7..87cb3e89779 100644
--- a/TAO/tao/FlResource.mpc
+++ b/TAO/tao/FlResource/FlResource.mpc
@@ -2,30 +2,6 @@
 // $Id$
 
 project(TAO_FlResource) : acelib, taolib, install, tao_output, taodefaults, ace_flreactor, taoidldefaults {
-
   sharedname   = TAO_FlResource
   dynamicflags += TAO_FLRESOURCE_BUILD_DLL
-
-  Source_Files {
-    FlResource
-  }
-
-  Header_Files {
-    FlResource
-  }
-
-  Inline_Files {
-  }
-
-  Template_Files {
-  }
-
-  Resource_Files {
-  }
-
-  PIDL_Files {
-  }
-
-  IDL_Files {
-  }
 }
diff --git a/TAO/tao/FoxResource.mpc b/TAO/tao/FoxResource/FoxResource.mpc
index 003be73e201..06d4b0fdec5 100644
--- a/TAO/tao/FoxResource.mpc
+++ b/TAO/tao/FoxResource/FoxResource.mpc
@@ -2,30 +2,6 @@
 // $Id$
 
 project(TAO_FoxResource) : acelib, taolib, install, tao_output, taodefaults, ace_foxreactor, taoidldefaults {
-
   sharedname   = TAO_FoxResource
   dynamicflags += TAO_FOCRESOURCE_BUILD_DLL
-
-  Source_Files {
-    FoxResource
-  }
-
-  Header_Files {
-    FoxResource
-  }
-
-  Inline_Files {
-  }
-
-  Template_Files {
-  }
-
-  Resource_Files {
-  }
-
-  PIDL_Files {
-  }
-
-  IDL_Files {
-  }
 }
diff --git a/TAO/tao/LzoCompressor.mpc b/TAO/tao/LzoCompressor.mpc
deleted file mode 100644
index 4e3c765e965..00000000000
--- a/TAO/tao/LzoCompressor.mpc
+++ /dev/null
@@ -1,38 +0,0 @@
-//$Id$
-project(LzoCompressor) : taolib, tao_output, install, compression, taoidldefaults, lzo1 {
-  requires += lzo1
-  sharedname   = TAO_LzoCompressor
-  dynamicflags += TAO_LZOCOMPRESSOR_BUILD_DLL
-
-  Source_Files {
-    Compression/lzo
-  }
-
-  Header_Files {
-    Compression/lzo
-  }
-
-  Inline_Files {
-    Compression/lzo
-  }
-
-  Template_Files {
-    Compression/lzo
-  }
-
-  Resource_Files {
-    Compression/lzo
-  }
-
-  PIDL_Files {
-    Compression/lzo
-  }
-
-  IDL_Files {
-    Compression/lzo
-  }
-
-  Pkgconfig_Files {
-    Compression/lzo/TAO_Lzo2Compressor.pc.in
-  }
-}
diff --git a/TAO/tao/QtResource.mpc b/TAO/tao/QtResource/QtResource.mpc
index 639208dd94d..688e3748c01 100644
--- a/TAO/tao/QtResource.mpc
+++ b/TAO/tao/QtResource/QtResource.mpc
@@ -2,30 +2,6 @@
 // $Id$
 
 project(TAO_QtResource) : acelib, taolib, install, tao_output, taodefaults, ace_qtreactor, taoidldefaults {
-
   sharedname   = TAO_QtResource
   dynamicflags += TAO_QTRESOURCE_BUILD_DLL
-
-  Source_Files {
-    QtResource
-  }
-
-  Header_Files {
-    QtResource
-  }
-
-  Inline_Files {
-  }
-
-  Template_Files {
-  }
-
-  Resource_Files {
-  }
-
-  PIDL_Files {
-  }
-
-  IDL_Files {
-  }
 }
diff --git a/TAO/tao/TkResource.mpc b/TAO/tao/TkResource/TkResource.mpc
index e55608ccc7a..a6b88a66961 100644
--- a/TAO/tao/TkResource.mpc
+++ b/TAO/tao/TkResource/TkResource.mpc
@@ -2,30 +2,6 @@
 // $Id$
 
 project(TAO_TkResource) : acelib, taolib, install, tao_output, taodefaults, ace_tkreactor, taoidldefaults {
-
   sharedname   = TAO_TkResource
   dynamicflags += TAO_TKRESOURCE_BUILD_DLL
-
-  Source_Files {
-    TkResource
-  }
-
-  Header_Files {
-    TkResource
-  }
-
-  Inline_Files {
-  }
-
-  Template_Files {
-  }
-
-  Resource_Files {
-  }
-
-  PIDL_Files {
-  }
-
-  IDL_Files {
-  }
 }
diff --git a/TAO/tao/ZlibCompressor.mpc b/TAO/tao/ZlibCompressor.mpc
deleted file mode 100644
index a00f873ecba..00000000000
--- a/TAO/tao/ZlibCompressor.mpc
+++ /dev/null
@@ -1,38 +0,0 @@
-//$Id$
-project(ZlibCompressor) : taolib, tao_output, install, compression, taoidldefaults, ace_zlib {
-  requires += zlib
-  sharedname   = TAO_ZlibCompressor
-  dynamicflags += TAO_ZLIBCOMPRESSOR_BUILD_DLL
-
-  Source_Files {
-    Compression/zlib
-  }
-
-  Header_Files {
-    Compression/zlib
-  }
-
-  Inline_Files {
-    Compression/zlib
-  }
-
-  Template_Files {
-    Compression/zlib
-  }
-
-  Resource_Files {
-    Compression/zlib
-  }
-
-  PIDL_Files {
-    Compression/zlib
-  }
-
-  IDL_Files {
-    Compression/zlib
-  }
-
-  Pkgconfig_Files {
-    Compression/zlib/TAO_ZlibCompressor.pc.in
-  }
-}