From 7d39aa3777a0028ff7e27805156448e9ab0398cf Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Sat, 18 Apr 1998 04:13:51 +0000
Subject: [PATCH] Moved fg_debug.c to it's own library.

---
 Aircraft/Makefile.am  |  2 +-
 Aircraft/Makefile.in  |  2 +-
 Aircraft/aircraft.c   | 11 ++++++----
 Astro/moon.c          |  9 +++++---
 Astro/orbits.c        |  9 +++++---
 Astro/planets.c       | 11 ++++++----
 Astro/stars.c         | 11 ++++++----
 Astro/sun.c           |  9 +++++---
 Autopilot/Makefile.am |  2 +-
 Autopilot/Makefile.in |  2 +-
 Autopilot/autopilot.c | 51 ++++++++++++++-----------------------------
 Cockpit/Makefile.am   |  2 +-
 Cockpit/Makefile.in   |  2 +-
 Cockpit/cockpit.c     | 13 ++++++-----
 Cockpit/hud.c         | 13 ++++++-----
 FDM/Makefile.am       |  2 +-
 FDM/Makefile.in       |  2 +-
 FDM/flight.c          | 12 ++++++----
 Joystick/Makefile.am  |  2 +-
 Joystick/Makefile.in  |  2 +-
 Joystick/joystick.c   | 11 ++++++----
 Scenery/scenery.c     |  9 +++++---
 Scenery/tilecache.c   |  9 +++++---
 Scenery/tilemgr.c     |  9 +++++---
 Simulator/Makefile.am |  1 -
 Simulator/Makefile.in |  1 -
 Time/Makefile.am      |  2 +-
 Time/Makefile.in      |  2 +-
 Time/event.c          | 19 +++++++++-------
 Time/fg_time.c        | 24 ++++++++++----------
 Weather/Makefile.am   |  2 +-
 Weather/Makefile.in   |  2 +-
 32 files changed, 142 insertions(+), 118 deletions(-)

diff --git a/Aircraft/Makefile.am b/Aircraft/Makefile.am
index 39f53eb02..8da66cc30 100644
--- a/Aircraft/Makefile.am
+++ b/Aircraft/Makefile.am
@@ -3,4 +3,4 @@ libdir	= ${exec_prefix}/lib
 lib_LTLIBRARIES = libAircraft.la
 libAircraft_la_SOURCES = aircraft.c aircraft.h
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator
+INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator
diff --git a/Aircraft/Makefile.in b/Aircraft/Makefile.in
index 9e17dcef7..f2cc2fd2d 100644
--- a/Aircraft/Makefile.in
+++ b/Aircraft/Makefile.in
@@ -311,7 +311,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator
+INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Aircraft/aircraft.c b/Aircraft/aircraft.c
index edd8cd332..97bf38a33 100644
--- a/Aircraft/aircraft.c
+++ b/Aircraft/aircraft.c
@@ -27,8 +27,8 @@
 #include <stdio.h>
 
 #include <Aircraft/aircraft.h>
+#include <Debug/fg_debug.h>
 #include <Include/fg_constants.h>
-#include <Main/fg_debug.h>
 
 /* This is a record containing all the info for the aircraft currently
    being operated */
@@ -64,10 +64,13 @@ void fgAircraftOutputCurrent(fgAIRCRAFT *a) {
 
 
 /* $Log$
-/* Revision 1.17  1998/02/12 21:59:31  curt
-/* Incorporated code changes contributed by Charlie Hotchkiss
-/* <chotchkiss@namg.us.anritsu.com>
+/* Revision 1.18  1998/04/18 04:13:56  curt
+/* Moved fg_debug.c to it's own library.
 /*
+ * Revision 1.17  1998/02/12 21:59:31  curt
+ * Incorporated code changes contributed by Charlie Hotchkiss
+ * <chotchkiss@namg.us.anritsu.com>
+ *
  * Revision 1.16  1998/02/07 15:29:31  curt
  * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
  * <chotchkiss@namg.us.anritsu.com>
diff --git a/Astro/moon.c b/Astro/moon.c
index 77be2f4ca..f5480dd68 100644
--- a/Astro/moon.c
+++ b/Astro/moon.c
@@ -35,11 +35,11 @@
 #include <Astro/moon.h>
 
 #include <Aircraft/aircraft.h>
+#include <Debug/fg_debug.h>
 #include <Include/fg_constants.h>
 #include <Include/general.h>
 #include <Main/views.h>
 #include <Time/fg_time.h>
-#include <Main/fg_debug.h>
 
 struct CelestialCoord moonPos;
 
@@ -213,9 +213,12 @@ void fgMoonRender( void ) {
 
 
 /* $Log$
-/* Revision 1.8  1998/04/03 21:52:49  curt
-/* Converting to Gnu autoconf system.
+/* Revision 1.9  1998/04/18 04:13:56  curt
+/* Moved fg_debug.c to it's own library.
 /*
+ * Revision 1.8  1998/04/03 21:52:49  curt
+ * Converting to Gnu autoconf system.
+ *
  * Revision 1.7  1998/02/23 19:07:54  curt
  * Incorporated Durk's Astro/ tweaks.  Includes unifying the sun position
  * calculation code between sun display, and other FG sections that use this
diff --git a/Astro/orbits.c b/Astro/orbits.c
index ed55d7d74..97619eff5 100644
--- a/Astro/orbits.c
+++ b/Astro/orbits.c
@@ -28,10 +28,10 @@
 
 #include <Astro/orbits.h>
 
+#include <Debug/fg_debug.h>
 #include <Include/fg_constants.h>
 #include <Include/general.h>
 #include <Time/fg_time.h>
-#include <Main/fg_debug.h>
 
 struct OrbElements pltOrbElements[9];
 
@@ -165,9 +165,12 @@ void fgSolarSystemUpdate(struct OrbElements *planet, struct fgTIME t)
 
 
 /* $Log$
-/* Revision 1.9  1998/03/14 00:27:12  curt
-/* Updated fgGENERAL to a "type" of struct.
+/* Revision 1.10  1998/04/18 04:13:57  curt
+/* Moved fg_debug.c to it's own library.
 /*
+ * Revision 1.9  1998/03/14 00:27:12  curt
+ * Updated fgGENERAL to a "type" of struct.
+ *
  * Revision 1.8  1998/02/23 19:07:55  curt
  * Incorporated Durk's Astro/ tweaks.  Includes unifying the sun position
  * calculation code between sun display, and other FG sections that use this
diff --git a/Astro/planets.c b/Astro/planets.c
index 50ff7cdf2..8f99ba032 100644
--- a/Astro/planets.c
+++ b/Astro/planets.c
@@ -32,12 +32,12 @@
 #include <GL/glut.h>
 #include <XGL/xgl.h>
 
-#include <Time/fg_time.h>
 #include <Astro/orbits.h>
 #include <Astro/planets.h>
 #include <Astro/sun.h>
+#include <Debug/fg_debug.h>
 #include <Include/fg_constants.h>
-#include <Main/fg_debug.h>
+#include <Time/fg_time.h>
 
 GLint planets = 0;
 
@@ -206,9 +206,12 @@ void fgPlanetsRender( void ) {
 
 
 /* $Log$
-/* Revision 1.8  1998/04/03 21:52:50  curt
-/* Converting to Gnu autoconf system.
+/* Revision 1.9  1998/04/18 04:13:57  curt
+/* Moved fg_debug.c to it's own library.
 /*
+ * Revision 1.8  1998/04/03 21:52:50  curt
+ * Converting to Gnu autoconf system.
+ *
  * Revision 1.7  1998/02/23 19:07:55  curt
  * Incorporated Durk's Astro/ tweaks.  Includes unifying the sun position
  * calculation code between sun display, and other FG sections that use this
diff --git a/Astro/stars.c b/Astro/stars.c
index b7bbe1bda..a71f30e00 100644
--- a/Astro/stars.c
+++ b/Astro/stars.c
@@ -42,12 +42,12 @@
 #include <Astro/planets.h>
 #include <Astro/stars.h>
 
+#include <Aircraft/aircraft.h>
+#include <Debug/fg_debug.h>
 #include <Include/fg_constants.h>
 #include <Include/general.h>
-#include <Aircraft/aircraft.h>
 #include <Main/views.h>
 #include <Time/fg_time.h>
-#include <Main/fg_debug.h>
 
 #define EpochStart           (631065600)
 #define DaysSinceEpoch(secs) (((secs)-EpochStart)*(1.0/(24*3600)))
@@ -257,9 +257,12 @@ void fgStarsRender( void ) {
 
 
 /* $Log$
-/* Revision 1.10  1998/04/03 21:52:51  curt
-/* Converting to Gnu autoconf system.
+/* Revision 1.11  1998/04/18 04:13:58  curt
+/* Moved fg_debug.c to it's own library.
 /*
+ * Revision 1.10  1998/04/03 21:52:51  curt
+ * Converting to Gnu autoconf system.
+ *
  * Revision 1.9  1998/03/14 00:27:12  curt
  * Updated fgGENERAL to a "type" of struct.
  *
diff --git a/Astro/sun.c b/Astro/sun.c
index b59df6868..645a7d6b3 100644
--- a/Astro/sun.c
+++ b/Astro/sun.c
@@ -34,8 +34,8 @@
 
 #include <Astro/orbits.h>
 #include <Astro/sun.h>
+#include <Debug/fg_debug.h>
 #include <Include/fg_constants.h>
-#include <Main/fg_debug.h>
 #include <Main/views.h>
 #include <Time/fg_time.h>
 #include <Time/sunpos.h>
@@ -188,9 +188,12 @@ void fgSunRender( void ) {
 
 
 /* $Log$
-/* Revision 1.9  1998/04/03 21:52:51  curt
-/* Converting to Gnu autoconf system.
+/* Revision 1.10  1998/04/18 04:13:58  curt
+/* Moved fg_debug.c to it's own library.
 /*
+ * Revision 1.9  1998/04/03 21:52:51  curt
+ * Converting to Gnu autoconf system.
+ *
  * Revision 1.8  1998/03/09 22:47:25  curt
  * Incorporated Durk's updates.
  *
diff --git a/Autopilot/Makefile.am b/Autopilot/Makefile.am
index b5e8dc47a..5ec208b05 100644
--- a/Autopilot/Makefile.am
+++ b/Autopilot/Makefile.am
@@ -4,4 +4,4 @@ lib_LTLIBRARIES = libAutopilot.la
 
 libAutopilot_la_SOURCES = autopilot.c autopilot.h
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator
+INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator
diff --git a/Autopilot/Makefile.in b/Autopilot/Makefile.in
index df7b5f4c8..d63b26361 100644
--- a/Autopilot/Makefile.in
+++ b/Autopilot/Makefile.in
@@ -312,7 +312,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator
+INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Autopilot/autopilot.c b/Autopilot/autopilot.c
index 867c17f6c..78dccb3bb 100644
--- a/Autopilot/autopilot.c
+++ b/Autopilot/autopilot.c
@@ -24,34 +24,15 @@
  **************************************************************************/
 
 
-// I have no Idea how many of these are needed.  Some one tell me.
 #include <config.h>
-#include <assert.h>
-
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
 
-#include <GL/glut.h>
+#include <assert.h>
 #include <stdlib.h>
-#include <string.h>
 
-#ifdef HAVE_VALUES_H
-#  include <values.h>  // for MAXINT
-#endif
- 
 #include "autopilot.h"
 
 #include <Include/fg_constants.h>
-#include <Aircraft/aircraft.h>
-#include <Main/fg_debug.h>
-#include <Math/fg_random.h>
-#include <Math/mat3.h>
-#include <Math/polar.h>
-#include <Scenery/scenery.h>
-#include <Time/fg_timer.h>
-#include <Weather/weather.h>
-#include <Controls/controls.h>
+#include <Debug/fg_debug.h>
 
 
 // The below routines were copied right from hud.c ( I hate reinventing
@@ -61,7 +42,7 @@
 //// They should eventually be member functions of the aircraft.
 ////
 
-double get_throttleval( void )
+static double get_throttleval( void )
 {
 	fgCONTROLS *pcontrols;
 
@@ -69,7 +50,7 @@ double get_throttleval( void )
   return pcontrols->throttle[0];     // Hack limiting to one engine
 }
 
-double get_aileronval( void )
+static double get_aileronval( void )
 {
 	fgCONTROLS *pcontrols;
 
@@ -77,7 +58,7 @@ double get_aileronval( void )
   return pcontrols->aileron;
 }
 
-double get_elevatorval( void )
+static double get_elevatorval( void )
 {
 	fgCONTROLS *pcontrols;
 
@@ -85,7 +66,7 @@ double get_elevatorval( void )
   return pcontrols->elevator;
 }
 
-double get_elev_trimval( void )
+static double get_elev_trimval( void )
 {
 	fgCONTROLS *pcontrols;
 
@@ -93,7 +74,7 @@ double get_elev_trimval( void )
   return pcontrols->elevator_trim;
 }
 
-double get_rudderval( void )
+static double get_rudderval( void )
 {
 	fgCONTROLS *pcontrols;
 
@@ -101,7 +82,7 @@ double get_rudderval( void )
   return pcontrols->rudder;
 }
 
-double get_speed( void )
+static double get_speed( void )
 {
 	fgFLIGHT *f;
 
@@ -109,7 +90,7 @@ double get_speed( void )
 	return( FG_V_equiv_kts );    // Make an explicit function call.
 }
 
-double get_aoa( void )
+static double get_aoa( void )
 {
 	fgFLIGHT *f;
               
@@ -117,7 +98,7 @@ double get_aoa( void )
 	return( FG_Gamma_vert_rad * RAD_TO_DEG );
 }
 
-double fgAPget_roll( void )
+static double fgAPget_roll( void )
 {
 	fgFLIGHT *f;
 
@@ -125,7 +106,7 @@ double fgAPget_roll( void )
 	return( FG_Phi * RAD_TO_DEG );
 }
 
-double get_pitch( void )
+static double get_pitch( void )
 {
 	fgFLIGHT *f;
               
@@ -141,7 +122,7 @@ double fgAPget_heading( void )
 	return( FG_Psi * RAD_TO_DEG );
 }
 
-double get_altitude( void )
+static double get_altitude( void )
 {
 	fgFLIGHT *f;
 	// double rough_elev;
@@ -153,7 +134,7 @@ double get_altitude( void )
 	return( FG_Altitude * FEET_TO_METER /* -rough_elev */ );
 }
 
-double get_sideslip( void )
+static double get_sideslip( void )
 {
         fgFLIGHT *f;
         
@@ -187,7 +168,7 @@ void fgAPInit( fgAIRCRAFT *current_aircraft )
 		exit(1);
 		
 	APData->Mode = 0 ; 		// turn the AP off
-	APData->Heading = 5 ; 		// default direction, due north
+	APData->Heading = 0.0; 		// default direction, due north
 	
 	// These eventually need to be read from current_aircaft somehow.
 	
@@ -300,7 +281,7 @@ void fgAPSetMode( int mode)
 	 fgPrintf( FG_COCKPIT, FG_INFO, "APSetMode : %d\n", mode );
 	 
 	 APData->Mode = mode;  // set the new mode
-	 
+	 APData->Heading = fgAPget_heading();  // Lock to current heading
 }
 	         
 
@@ -319,4 +300,4 @@ double LinearExtrapolate( double x,double x1,double y1,double x2,double y2)
 	
 	return (y);
 	
-};
\ No newline at end of file
+};
diff --git a/Cockpit/Makefile.am b/Cockpit/Makefile.am
index f472b9c3c..38c8803d0 100644
--- a/Cockpit/Makefile.am
+++ b/Cockpit/Makefile.am
@@ -5,4 +5,4 @@ libCockpit_la_SOURCES = \
 	cockpit.c cockpit.h \
 	hud.c hud.h
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator
+INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator
diff --git a/Cockpit/Makefile.in b/Cockpit/Makefile.in
index 147d2092a..062a2a64d 100644
--- a/Cockpit/Makefile.in
+++ b/Cockpit/Makefile.in
@@ -313,7 +313,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator
+INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Cockpit/cockpit.c b/Cockpit/cockpit.c
index 20ddb97b2..68a7df11c 100644
--- a/Cockpit/cockpit.c
+++ b/Cockpit/cockpit.c
@@ -38,14 +38,14 @@
 #include <Include/fg_constants.h>
 
 #include <Aircraft/aircraft.h>
-#include <Scenery/scenery.h>
+#include <Debug/fg_debug.h>
+#include <Math/fg_random.h>
 #include <Math/mat3.h>
 #include <Math/polar.h>
+#include <Scenery/scenery.h>
 #include <Time/fg_timer.h>
-#include <Math/fg_random.h>
 #include <Weather/weather.h>
 
-#include <Main/fg_debug.h>
 
 // This is a structure that contains all data related to
 // cockpit/panel/hud system
@@ -102,9 +102,12 @@ void fgCockpitUpdate( void )
 
 
 /* $Log$
-/* Revision 1.12  1998/04/14 02:23:09  curt
-/* Code reorganizations.  Added a Lib/ directory for more general libraries.
+/* Revision 1.13  1998/04/18 04:14:01  curt
+/* Moved fg_debug.c to it's own library.
 /*
+ * Revision 1.12  1998/04/14 02:23:09  curt
+ * Code reorganizations.  Added a Lib/ directory for more general libraries.
+ *
  * Revision 1.11  1998/03/14 00:32:13  curt
  * Changed a printf() to a fgPrintf().
  *
diff --git a/Cockpit/hud.c b/Cockpit/hud.c
index bb2687c9f..a0e58d485 100644
--- a/Cockpit/hud.c
+++ b/Cockpit/hud.c
@@ -40,9 +40,9 @@
 
 #include "hud.h"
 
-#include <Include/fg_constants.h>
 #include <Aircraft/aircraft.h>
-#include <Main/fg_debug.h>
+#include <Debug/fg_debug.h>
+#include <Include/fg_constants.h>
 #include <Math/fg_random.h>
 #include <Math/mat3.h>
 #include <Math/polar.h>
@@ -1603,10 +1603,13 @@ void fgHUDSetBrightness( Hptr hud, int brightness )
 }
 
 /* $Log$
-/* Revision 1.21  1998/04/03 21:55:28  curt
-/* Converting to Gnu autoconf system.
-/* Tweaks to hud.c
+/* Revision 1.22  1998/04/18 04:14:02  curt
+/* Moved fg_debug.c to it's own library.
 /*
+ * Revision 1.21  1998/04/03 21:55:28  curt
+ * Converting to Gnu autoconf system.
+ * Tweaks to hud.c
+ *
  * Revision 1.20  1998/03/09 22:48:40  curt
  * Minor "formatting" tweaks.
  *
diff --git a/FDM/Makefile.am b/FDM/Makefile.am
index 187049f22..1e0af44a6 100644
--- a/FDM/Makefile.am
+++ b/FDM/Makefile.am
@@ -6,4 +6,4 @@ lib_LTLIBRARIES = libFlight.la
 
 libFlight_la_SOURCES = flight.c flight.h
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator
+INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator
diff --git a/FDM/Makefile.in b/FDM/Makefile.in
index 164c0ac6d..feb909e8f 100644
--- a/FDM/Makefile.in
+++ b/FDM/Makefile.in
@@ -383,7 +383,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator
+INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/FDM/flight.c b/FDM/flight.c
index 879049e20..9468e9932 100644
--- a/FDM/flight.c
+++ b/FDM/flight.c
@@ -24,9 +24,10 @@
  **************************************************************************/
 
 #include <stdio.h>
+
+#include <Debug/fg_debug.h>
 #include <Flight/flight.h>
 #include <Flight/LaRCsim/ls_interface.h>
-#include <Main/fg_debug.h>
 
 
 fgFLIGHT cur_flight_params;
@@ -72,10 +73,13 @@ int fgFlightModelUpdate(int model, fgFLIGHT *f, int multiloop) {
 
 
 /* $Log$
-/* Revision 1.10  1998/02/07 15:29:37  curt
-/* Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
-/* <chotchkiss@namg.us.anritsu.com>
+/* Revision 1.11  1998/04/18 04:14:04  curt
+/* Moved fg_debug.c to it's own library.
 /*
+ * Revision 1.10  1998/02/07 15:29:37  curt
+ * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
+ * <chotchkiss@namg.us.anritsu.com>
+ *
  * Revision 1.9  1998/01/27 00:47:53  curt
  * Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message
  * system and commandline/config file processing code.
diff --git a/Joystick/Makefile.am b/Joystick/Makefile.am
index 7c208f697..51b18153a 100644
--- a/Joystick/Makefile.am
+++ b/Joystick/Makefile.am
@@ -4,4 +4,4 @@ lib_LTLIBRARIES = libJoystick.la
 
 libJoystick_la_SOURCES = joystick.c joystick.h
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator
+INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator
diff --git a/Joystick/Makefile.in b/Joystick/Makefile.in
index aa73b6b9d..cbde4ca74 100644
--- a/Joystick/Makefile.in
+++ b/Joystick/Makefile.in
@@ -312,7 +312,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator
+INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Joystick/joystick.c b/Joystick/joystick.c
index 18ddb8ba1..e0ea1cca0 100644
--- a/Joystick/joystick.c
+++ b/Joystick/joystick.c
@@ -33,7 +33,7 @@
 
 #endif
 
-#include <Main/fg_debug.h>
+#include <Debug/fg_debug.h>
 
 static joy_x_min=0, joy_x_ctr=0, joy_x_max=0;
 static joy_y_min=0, joy_y_ctr=0, joy_y_max=0;
@@ -256,10 +256,13 @@ int fgJoystickRead( double *joy_x, double *joy_y, int *joy_b1, int *joy_b2 )
 
 
 /* $Log$
-/* Revision 1.5  1998/02/12 21:59:44  curt
-/* Incorporated code changes contributed by Charlie Hotchkiss
-/* <chotchkiss@namg.us.anritsu.com>
+/* Revision 1.6  1998/04/18 04:14:05  curt
+/* Moved fg_debug.c to it's own library.
 /*
+ * Revision 1.5  1998/02/12 21:59:44  curt
+ * Incorporated code changes contributed by Charlie Hotchkiss
+ * <chotchkiss@namg.us.anritsu.com>
+ *
  * Revision 1.4  1998/02/03 23:20:20  curt
  * Lots of little tweaks to fix various consistency problems discovered by
  * Solaris' CC.  Fixed a bug in fg_debug.c with how the fgPrintf() wrapper
diff --git a/Scenery/scenery.c b/Scenery/scenery.c
index c5d8b1bec..c42df0657 100644
--- a/Scenery/scenery.c
+++ b/Scenery/scenery.c
@@ -37,8 +37,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <Debug/fg_debug.h>
 #include <Include/general.h>
-#include <Main/fg_debug.h>
 #include <Scenery/obj.h>
 #include <Scenery/scenery.h>
 #include <Scenery/texload.h>
@@ -114,9 +114,12 @@ void fgSceneryRender( void ) {
 
 
 /* $Log$
-/* Revision 1.39  1998/04/08 23:30:07  curt
-/* Adopted Gnu automake/autoconf system.
+/* Revision 1.40  1998/04/18 04:14:06  curt
+/* Moved fg_debug.c to it's own library.
 /*
+ * Revision 1.39  1998/04/08 23:30:07  curt
+ * Adopted Gnu automake/autoconf system.
+ *
  * Revision 1.38  1998/04/03 22:11:37  curt
  * Converting to Gnu autoconf system.
  *
diff --git a/Scenery/tilecache.c b/Scenery/tilecache.c
index dfb3f2606..4669a4e90 100644
--- a/Scenery/tilecache.c
+++ b/Scenery/tilecache.c
@@ -36,7 +36,7 @@
 #include <Include/general.h>
 
 #include <Bucket/bucketutils.h>
-#include <Main/fg_debug.h>
+#include <Debug/fg_debug.h>
 #include <Main/views.h>
 #include <Scenery/obj.h>
 #include <Scenery/tilecache.h>
@@ -197,9 +197,12 @@ int fgTileCacheNextAvail( void ) {
 
 
 /* $Log$
-/* Revision 1.10  1998/04/14 02:23:17  curt
-/* Code reorganizations.  Added a Lib/ directory for more general libraries.
+/* Revision 1.11  1998/04/18 04:14:07  curt
+/* Moved fg_debug.c to it's own library.
 /*
+ * Revision 1.10  1998/04/14 02:23:17  curt
+ * Code reorganizations.  Added a Lib/ directory for more general libraries.
+ *
  * Revision 1.9  1998/04/08 23:30:07  curt
  * Adopted Gnu automake/autoconf system.
  *
diff --git a/Scenery/tilemgr.c b/Scenery/tilemgr.c
index aa68fd90f..a692bd866 100644
--- a/Scenery/tilemgr.c
+++ b/Scenery/tilemgr.c
@@ -40,9 +40,9 @@
 
 #include <Aircraft/aircraft.h>
 #include <Bucket/bucketutils.h>
+#include <Debug/fg_debug.h>
 #include <Include/fg_constants.h>
 #include <Include/fg_types.h>
-#include <Main/fg_debug.h>
 
 
 #define FG_LOCAL_X           7   /* should be odd */
@@ -219,9 +219,12 @@ void fgTileMgrRender( void ) {
 
 
 /* $Log$
-/* Revision 1.24  1998/04/14 02:23:18  curt
-/* Code reorganizations.  Added a Lib/ directory for more general libraries.
+/* Revision 1.25  1998/04/18 04:14:07  curt
+/* Moved fg_debug.c to it's own library.
 /*
+ * Revision 1.24  1998/04/14 02:23:18  curt
+ * Code reorganizations.  Added a Lib/ directory for more general libraries.
+ *
  * Revision 1.23  1998/04/08 23:30:08  curt
  * Adopted Gnu automake/autoconf system.
  *
diff --git a/Simulator/Makefile.am b/Simulator/Makefile.am
index e356c9e4e..bb4096e61 100644
--- a/Simulator/Makefile.am
+++ b/Simulator/Makefile.am
@@ -6,7 +6,6 @@ SUBDIRS = \
 	Controls \
 	Flight \
 	Joystick \
-	Math \
 	Scenery \
 	Time \
 	Weather \
diff --git a/Simulator/Makefile.in b/Simulator/Makefile.in
index 698409d7d..2e7f9c8d3 100644
--- a/Simulator/Makefile.in
+++ b/Simulator/Makefile.in
@@ -79,7 +79,6 @@ SUBDIRS = \
 	Controls \
 	Flight \
 	Joystick \
-	Math \
 	Scenery \
 	Time \
 	Weather \
diff --git a/Time/Makefile.am b/Time/Makefile.am
index 146ff1acb..e2ab01cc8 100644
--- a/Time/Makefile.am
+++ b/Time/Makefile.am
@@ -8,4 +8,4 @@ libTime_la_SOURCES = \
 	fg_timer.c fg_timer.h \
 	sunpos.c sunpos.h
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator
+INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator
diff --git a/Time/Makefile.in b/Time/Makefile.in
index 4813d0513..c7a427186 100644
--- a/Time/Makefile.in
+++ b/Time/Makefile.in
@@ -317,7 +317,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator
+INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Time/event.c b/Time/event.c
index 5bb788246..75febe3dc 100644
--- a/Time/event.c
+++ b/Time/event.c
@@ -41,7 +41,7 @@
 
 #include "fg_time.h"
 
-#include <Main/fg_debug.h>
+#include <Debug/fg_debug.h>
 #include <Time/event.h>
 
 
@@ -301,14 +301,17 @@ void fgEventProcess( void ) {
 
 
 /* $Log$
-/* Revision 1.12  1998/04/09 18:40:13  curt
-/* We had unified some of the platform disparate time handling code, and
-/* there was a bug in timesum() which calculated a new time stamp based on
-/* the current time stamp + offset.  This hosed the periodic event processing
-/* logic because you'd never arrive at the time the event was scheduled for.
-/* Sky updates and lighting changes are handled via this event mechanism so
-/* they never changed ... it is fixed now.
+/* Revision 1.13  1998/04/18 04:14:08  curt
+/* Moved fg_debug.c to it's own library.
 /*
+ * Revision 1.12  1998/04/09 18:40:13  curt
+ * We had unified some of the platform disparate time handling code, and
+ * there was a bug in timesum() which calculated a new time stamp based on
+ * the current time stamp + offset.  This hosed the periodic event processing
+ * logic because you'd never arrive at the time the event was scheduled for.
+ * Sky updates and lighting changes are handled via this event mechanism so
+ * they never changed ... it is fixed now.
+ *
  * Revision 1.11  1998/04/03 22:12:55  curt
  * Converting to Gnu autoconf system.
  * Centralized time handling differences.
diff --git a/Time/fg_time.c b/Time/fg_time.c
index 20441a818..fdc510df9 100644
--- a/Time/fg_time.c
+++ b/Time/fg_time.c
@@ -41,16 +41,15 @@
 #  include <sys/time.h>  /* for get/setitimer, gettimeofday, struct timeval */
 #endif
 
-#include <Time/fg_time.h>
-#include <Include/fg_constants.h>
+#include <Debug/fg_debug.h>
 #include <Flight/flight.h>
+#include <Include/fg_constants.h>
+#include <Time/fg_time.h>
 
 
 #define DEGHR(x)        ((x)/15.)
 #define RADHR(x)        DEGHR(x*RAD_TO_DEG)
 
-#include <Main/fg_debug.h>
-
 struct fgTIME cur_time_params;
 struct fgLIGHT cur_light_params;
 
@@ -368,14 +367,17 @@ void fgTimeUpdate(fgFLIGHT *f, struct fgTIME *t) {
 
 
 /* $Log$
-/* Revision 1.39  1998/04/09 18:40:14  curt
-/* We had unified some of the platform disparate time handling code, and
-/* there was a bug in timesum() which calculated a new time stamp based on
-/* the current time stamp + offset.  This hosed the periodic event processing
-/* logic because you'd never arrive at the time the event was scheduled for.
-/* Sky updates and lighting changes are handled via this event mechanism so
-/* they never changed ... it is fixed now.
+/* Revision 1.40  1998/04/18 04:14:09  curt
+/* Moved fg_debug.c to it's own library.
 /*
+ * Revision 1.39  1998/04/09 18:40:14  curt
+ * We had unified some of the platform disparate time handling code, and
+ * there was a bug in timesum() which calculated a new time stamp based on
+ * the current time stamp + offset.  This hosed the periodic event processing
+ * logic because you'd never arrive at the time the event was scheduled for.
+ * Sky updates and lighting changes are handled via this event mechanism so
+ * they never changed ... it is fixed now.
+ *
  * Revision 1.38  1998/04/08 23:35:40  curt
  * Tweaks to Gnu automake/autoconf system.
  *
diff --git a/Weather/Makefile.am b/Weather/Makefile.am
index 1c971b75e..b5973bdd4 100644
--- a/Weather/Makefile.am
+++ b/Weather/Makefile.am
@@ -4,4 +4,4 @@ lib_LTLIBRARIES = libWeather.la
 
 libWeather_la_SOURCES = weather.c weather.h
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator
+INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator
diff --git a/Weather/Makefile.in b/Weather/Makefile.in
index fdbf8d500..ab0cfc37d 100644
--- a/Weather/Makefile.in
+++ b/Weather/Makefile.in
@@ -312,7 +312,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator
+INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
-- 
2.39.5