*** empty log message ***

4 files changed, 52 insertions, 4 deletions

diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayEI.idl b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayEI.idl
new file mode 100644
index 00000000000..e82e48244cd
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayEI.idl
@@ -0,0 +1,32 @@
+// $Id$
+
+/**
+ * @file NavDisplayEI.idl
+ *
+ * Definition of the NavDisplay (navigation display) component implementation.
+ *
+ * @author Nanbor Wang <nanbor@cs.wustl.edu>
+ */
+
+#ifndef NAVDISPLAYEI_IDL
+#define NAVDISPLAYEI_IDL
+
+#include "NavDisplayE.idl"
+
+module HUDisplay
+{
+  /**
+   * @interface NavDisplay_Exec
+   *
+   * The actually GPS executor inherits from both CCM_GPS and
+   * CCM_position interfaces as a monolithic implementation.
+   */
+  local interface NavDisplay_Exec :
+    CCM_NavDisplay,
+    Components::SessionComponent
+  {
+  };
+
+};
+
+#endif /* NAVDISPLAYEI_IDL */
diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
index 61350c1e70e..4f5770f1ed3 100644
--- a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
+++ b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
@@ -2,17 +2,19 @@
 project(NavDisplayGUI_exec) : ciao_server {
   depends   += NavDisplay_exec
   sharedname = NavDisplayGUI_exec
-  lit_libs  += qtmain qt-mt230nc
+  lit_libs  += qt-mt
   libs      += NavDisplay_stub NavDisplay_svnt HUDisplay_stub HUDisplay_svnt
   libpaths  += .. ../NavDisplay $(QTDIR)/lib
   dllflags   = NAVDISPLAY_EXEC_BUILD_DLL QT_DLL QT_THREAD_SUPPORT
   includes  += ../NavDisplay $(QTDIR)/include
+  idlflags  +=  -I ../NavDisplay -Wb,export_macro=NAVDISPLAY_EXEC_Export -Wb,export_include=NavDisplay_exec_export.h
 
   IDL_Files {
+    NavDisplayEI.idl
   }
 
   Source_Files {
-        ../NavDisplay/NavDisplayEIC.cpp
+        NavDisplayEIC.cpp
         AddNavUnitCmd.cpp
         DetailView.cpp
         MapView.cpp
@@ -28,4 +30,19 @@ project(NavDisplayGUI_exec) : ciao_server {
         Worker.cpp
         NavDisplayGUI_exec.cpp
   }
+
+  verbatim(gnuace, local) {
+    moc_DetailView.cpp: DetailView.h
+     "	$(QTDIR)/bin/moc DetailView.h -o moc_DetailView.cpp"
+
+    moc_MapView.cpp: MapView.h
+     "	$(QTDIR)/bin/moc MapView.h -o moc_MapView.cpp"
+
+    moc_NodeItem.cpp: NodeItem.h
+     "	$(QTDIR)/bin/moc NodeItem.h -o moc_NodeItem.cpp"
+
+    moc_RootPanel.cpp: RootPanel.h
+     "	$(QTDIR)/bin/moc RootPanel.h -o moc_RootPanel.cpp"
+  }
+
 }
diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp
index 680e765181c..b422260940a 100644
--- a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp
+++ b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "NavDisplayGUI_exec.h"
-#include "CIAO/CIAO_common.h"
+#include "ciao/CIAO_common.h"
 #include <qapplication.h>
 #include <qevent.h>
 
diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/Worker.h b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/Worker.h
index 6005b88e775..a3d28f4fc56 100644
--- a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/Worker.h
+++ b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/Worker.h
@@ -4,7 +4,6 @@
 #define __WORKER_H
 
 #include "ace/Task.h"
-#include "tao/CORBA.h"
 #include "ace/Synch.h"
 #include "RootPanel.h"