1 files changed, 7 insertions, 13 deletions
diff --git a/modules/CIAO/examples/Display/NavDisplay/NavDisplay.mpc b/modules/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
index 5b5b455309c..4bb067e506c 100644
--- a/modules/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
+++ b/modules/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
@@ -1,30 +1,27 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Display_Base -u Display NavDisplay"
 
-project(Display_NavDisplay_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
+project(Display_NavDisplay_idl_gen) : componentidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=NAVDISPLAY_STUB_Export \
               -Wb,stub_export_include=NavDisplay_stub_export.h \
               -Wb,skel_export_macro=NAVDISPLAY_SVNT_Export \
-              -Wb,skel_export_include=NavDisplay_svnt_export.h
+              -Wb,skel_export_include=NavDisplay_svnt_export.h \
+              -Wb,exec_export_macro=NAVDISPLAY_EXEC_Export \
+              -Wb,exec_export_include=NavDisplay_exec_export.h \
 
   IDL_Files {
     NavDisplay.idl
   }
 }
 
-project(Display_NavDisplay_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
+project(Display_NavDisplay_idle_gen) : ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
-  cidlflags += --svnt-export-macro NAVDISPLAY_SVNT_Export \
-               --svnt-export-include NavDisplay_svnt_export.h
+  after += Display_NavDisplay_idl_gen
   idlflags += -Wb,export_macro=NAVDISPLAY_EXEC_Export \
               -Wb,export_include=NavDisplay_exec_export.h \
               -SS
 
-  CIDL_Files {
-    NavDisplay.cidl
-  }
-
   IDL_Files {
     NavDisplayE.idl
   }
@@ -57,7 +54,7 @@ project(Display_NavDisplay_stub) : ccm_stub, avoids_ace_for_tao {
 }
 
 project(Display_NavDisplay_exec) : ciao_executor, avoids_ace_for_tao {
-  after   += Display_NavDisplay_cidl_gen Display_NavDisplay_stub
+  after   += Display_NavDisplay_idle_gen Display_NavDisplay_stub
   sharedname = NavDisplay_exec
   libs += NavDisplay_stub Display_Base_stub
   libout = ../lib
@@ -97,9 +94,6 @@ project(Display_NavDisplay_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = NAVDISPLAY_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }