Pui -> PUI, Gui -> GUI.

diff --git a/GUI/Makefile.am b/GUI/Makefile.am
index 309f5c866c70a31b436de8bcdd4ee29a702b0447..890aea000f53cad30753489421c6759695a08115 100644 (file)
--- a/GUI/Makefile.am
+++ b/GUI/Makefile.am
@@ -1,5 +1,5 @@
-noinst_LIBRARIES = libGui.a
+noinst_LIBRARIES = libGUI.a
 
-libGui_a_SOURCES = gui.cxx gui.h
+libGUI_a_SOURCES = gui.cxx gui.h
 
 INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator

diff --git a/GUI/gui.h b/GUI/gui.h
index 1335408c00958759049017640ffda08b7820bb4e..f642a281a10463d13098a1680707e86bc2ea8128 100644 (file)
--- a/GUI/gui.h
+++ b/GUI/gui.h
@@ -26,7 +26,7 @@
 #ifndef _GUI_H_
 #define _GUI_H_
 
-#include "Pui/pu.h"
+#include "PUI/pu.h"
 
 extern puMenuBar    *mainMenuBar;
 extern puButton     *hideMenuButton;

diff --git a/Main/GLUTkey.cxx b/Main/GLUTkey.cxx
index 824217dd645cb1d422b5577ce0927ed62eff9f2c..410222b4bd1163ee0818f38dca3cd55d67289b9b 100644 (file)
--- a/Main/GLUTkey.cxx
+++ b/Main/GLUTkey.cxx
@@ -40,9 +40,9 @@
 #include <Aircraft/aircraft.h>
 #include <Autopilot/autopilot.h> // Added autopilot.h to list, Jeff Goeke-Smith
 #include <Debug/fg_debug.h>
-#include <Gui/gui.h>
+#include <GUI/gui.h>
 #include <Include/fg_constants.h>
-#include <Pui/pu.h>
+#include <PUI/pu.h>
 #include <Weather/weather.h>
 
 #include "GLUTkey.hxx"
@@ -290,12 +290,15 @@ void GLUTspecialkey(int k, int x, int y) {
 
 
 /* $Log$
-/* Revision 1.11  1998/06/12 00:57:38  curt
-/* Added support for Pui/Gui.
-/* Converted fog to GL_FOG_EXP2.
-/* Link to static simulator parts.
-/* Update runfg.bat to try to be a little smarter.
+/* Revision 1.12  1998/06/12 14:27:26  curt
+/* Pui -> PUI, Gui -> GUI.
 /*
+ * Revision 1.11  1998/06/12 00:57:38  curt
+ * Added support for Pui/Gui.
+ * Converted fog to GL_FOG_EXP2.
+ * Link to static simulator parts.
+ * Update runfg.bat to try to be a little smarter.
+ *
  * Revision 1.10  1998/05/27 02:24:05  curt
  * View optimizations by Norman Vine.
  *

diff --git a/Main/GLUTmain.cxx b/Main/GLUTmain.cxx
index c6cb8699ec5a7b1d4008e677f4296e8743c8dba5..5ffe464e1784e95a789b352920303c33b5e3db8c 100644 (file)
--- a/Main/GLUTmain.cxx
+++ b/Main/GLUTmain.cxx
@@ -58,12 +58,12 @@
 
 #include <Cockpit/cockpit.hxx>
 #include <Debug/fg_debug.h>
-#include <Gui/gui.h>
+#include <GUI/gui.h>
 #include <Joystick/joystick.h>
 #include <Math/fg_geodesy.h>
 #include <Math/mat3.h>
 #include <Math/polar3d.h>
-#include <Pui/pu.h>
+#include <PUI/pu.h>
 #include <Scenery/scenery.hxx>
 #include <Scenery/tilemgr.hxx>
 #include <Time/event.hxx>
@@ -750,6 +750,9 @@ int main( int argc, char **argv ) {
 
 
 // $Log$
+// Revision 1.25  1998/06/12 14:27:26  curt
+// Pui -> PUI, Gui -> GUI.
+//
 // Revision 1.24  1998/06/12 00:57:39  curt
 // Added support for Pui/Gui.
 // Converted fog to GL_FOG_EXP2.

diff --git a/Main/Makefile.am b/Main/Makefile.am
index a3c07746e14a5bc293e0175255c9b9b85356891f..a63b60482d50f107b6af1997487a6fcdb9262d4f 100644 (file)
--- a/Main/Makefile.am
+++ b/Main/Makefile.am
@@ -27,7 +27,7 @@ fg_LDADD = \
        $(top_builddir)/Simulator/Flight/libFlight.a \
        $(top_builddir)/Simulator/Flight/LaRCsim/libLaRCsim.a \
        $(top_builddir)/Simulator/Flight/Slew/libSlew.a \
-       $(top_builddir)/Simulator/Gui/libGui.a \
+       $(top_builddir)/Simulator/GUI/libGUI.a \
        $(top_builddir)/Simulator/Scenery/libScenery.a \
        $(top_builddir)/Simulator/Time/libTime.a \
        $(top_builddir)/Simulator/Weather/libWeather.a \
@@ -36,7 +36,7 @@ fg_LDADD = \
        $(top_builddir)/Lib/Math/libMath.la \
        $(top_builddir)/Lib/Bucket/libBucket.la \
        $(top_builddir)/Lib/Debug/libDebug.la \
-       $(top_builddir)/Lib/Pui/libPui.la \
+       $(top_builddir)/Lib/PUI/libPUI.la \
        $(top_builddir)/Lib/zlib/libz.la
 
 INCLUDES += \

diff --git a/Simulator/Makefile.am b/Simulator/Makefile.am
index 84ebd8dc3b5124a4b891240cbe523106a51179c8..a7a8045046bdaf44fc3bd1be4d97ba95076d317d 100644 (file)
--- a/Simulator/Makefile.am
+++ b/Simulator/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = \
        Cockpit \
        Controls \
        Flight \
-       Gui \
+       GUI \
        Joystick \
        Scenery \
        Time \