1 files changed, 17 insertions, 6 deletions
diff --git a/TAO/tao/Codeset.mpc b/TAO/tao/Codeset.mpc
index f57a6cee265..27fa1c45d22 100644
--- a/TAO/tao/Codeset.mpc
+++ b/TAO/tao/Codeset.mpc
@@ -1,19 +1,30 @@
 //$Id$
+project(*idl) : tao_versioning_idl_defaults {
+  custom_only = 1
+  idlflags += -SS -Sci -Sorb \
+              -Wb,export_macro=TAO_Codeset_Export \
+              -Wb,export_include=tao/Codeset/codeset_export.h \
+              -o Codeset
+  IDL_Files {
+    Codeset/CodeSetContext.pidl
+  }
+}
 
-project(Codeset) : taolib, tao_output, install, tao_versioning_idl_defaults, nolink_codecfactory {
+project(Codeset) : taolib, tao_output, install, taoidldefaults, nolink_codecfactory {
   sharedname   = TAO_Codeset
+  after       += *idl
   dynamicflags = TAO_CODESET_BUILD_DLL
   pch_header   =
   pch_source   =
-  idlflags += -SS -Sci -Sorb \
-              -Wb,export_macro=TAO_Codeset_Export \
-              -Wb,export_include=tao/Codeset/codeset_export.h \
-              -o Codeset
 
   Source_Files {
     Codeset
   }
 
+  Source_Files {
+    Codeset/CodeSetContextC.cpp
+  }
+
   Header_Files {
     Codeset
   }
@@ -30,9 +41,9 @@ project(Codeset) : taolib, tao_output, install, tao_versioning_idl_defaults, nol
   }
 
   PIDL_Files {
+    Codeset
   }
 
   IDL_Files {
-    Codeset/CodeSetContext.pidl
   }
 }