Moved fg_debug.c to it's own library.

diff --git a/Aircraft/Makefile.am b/Aircraft/Makefile.am
index 39f53eb0256412b3666263b26ed30160554aae7c..8da66cc3015e822b3498cc86c07cf0853e1a1a10 100644 (file)
--- 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 9e17dcef7b75d41883e9a50780d35a42a1a12f30..f2cc2fd2d1cceb07f4563bebb40924cc3efa0f98 100644 (file)
--- 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 edd8cd3321b3bff88fdaeec3c1f7c39fb0afff5a..97bf38a33ba531b2572b7cbb588798e9c790c64a 100644 (file)
--- 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 77be2f4ca8855d52deb004071852dcff1b4c0e10..f5480dd6816bc56cb6bcdcb45d21786a787c77a7 100644 (file)
--- 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 ed55d7d743830a123e24ce3ead399c052a6d024e..97619eff5e7d8ca1928e8b273909792d7684e9bd 100644 (file)
--- 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 50ff7cdf2bc50b12c30d6b88ba8f7cfc51a1bf26..8f99ba032089243a13114a19c7027574ef47c39d 100644 (file)
--- 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 b7bbe1bda122067472dd8a30f7e1c7a797f63ca7..a71f30e00ccfe862a2eb1e545111d85f12cd1545 100644 (file)
--- 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 b59df6868b5646899473a68960224374db7afad5..645a7d6b3c8cc72cd04903acec4dd828cd5cd100 100644 (file)
--- 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 b5e8dc47a8638bf32603781a0e1354dae88ca263..5ec208b05c9f240baf27c64237db8979d19ec39f 100644 (file)
--- 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 df7b5f4c8ac1ceb5a47f4d179b9dfd0012ac5e0a..d63b26361d384c57aab2e2958e7e37641096ed6a 100644 (file)
--- 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 867c17f6c525283883a9d3e14f97674fd276ea03..78dccb3bbe2c27abe811e720d2f7c03becf4e853 100644 (file)
--- 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 f472b9c3c39c1f660919e54b2fa73e0950fd4cd1..38c8803d0c2bbd0edd2061e6dec7fb70bcc311ed 100644 (file)
--- 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 147d2092a90a8d07e598257d2c9fa1cedddf6309..062a2a64d26996db1786ea2c6f8175491cb982ca 100644 (file)
--- 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 20ddb97b200c3372318ead3382fb065f3455968d..68a7df11c0856f857e72fe483acdb67b2261e306 100644 (file)
--- 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 bb2687c9f1fe27c7bc173dba58d0b8e2cae7fee5..a0e58d48503cd1d04c6b0855528c5864fc767ca0 100644 (file)
--- 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 187049f228094e235bfecf44415d647bb0a1a465..1e0af44a6206e2d74aa213a31d886a8090ab3d01 100644 (file)
--- 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 164c0ac6d1a08eaf0bfaace02fc2f3f3ea022dfb..feb909e8f5314f298f828697d20bc7276a8414de 100644 (file)
--- 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 879049e204ed56c2e46e35b1c88c1b07bb547d80..9468e9932f2d181277923a34df0c58844c9e783b 100644 (file)
--- 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 7c208f697df00336899ae7cbadc81d008966af7c..51b18153a00e3604a853c38bdec2e9ab1ca1e3bf 100644 (file)
--- 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 aa73b6b9d31f01bdc53da95db4f29e2be23211f4..cbde4ca74c0f2d7f7ecea2f828d7413772cf6b7e 100644 (file)
--- 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 18ddb8ba108e519e2e8caf88a0cbe55d200fd0fc..e0ea1cca0f75ec9ef49f499b4a625088f588213f 100644 (file)
--- 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 c5d8b1bec119d6c3cca159e1d1e46b054426fabe..c42df065756ca23a1a586c144edc19ba3bd31c36 100644 (file)
--- 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 dfb3f2606bfb5c677822233459db28e732046cf7..4669a4e90b404904a4c844899bd934e75a17c67d 100644 (file)
--- 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 aa68fd90f42b2b1d9a383b785a1a60edf36d3e65..a692bd86677eb64b8d03b29edf82209c72ce147a 100644 (file)
--- 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 e356c9e4e547bf63e5c9bb53abb2eb291aafcd0a..bb4096e6159f17fb24aa6c825182b518ea368de1 100644 (file)
--- 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 698409d7d81aeda84005676c73b6f5b6cbf4d4ce..2e7f9c8d39e1d710e3259d322884810a7635ecbf 100644 (file)
--- 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 146ff1acb948d957ad922bc8688d45ddc9919dbe..e2ab01cc8189f23c2c020c1f80db171c9cfd8a4b 100644 (file)
--- 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 4813d0513cba70af3c7a5786c78351f0b93f73be..c7a427186fe08ecb078f183abc1a423a720b4421 100644 (file)
--- 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 5bb7882462d9a306cce7a505af77ab7845fd134d..75febe3dc2c9b6717a7b4c3aa507ba47ab6e6c42 100644 (file)
--- 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 20441a8189b46b69285bfc8edd146ea5d516d32e..fdc510df993389f893036ea86827630a7fd56e51 100644 (file)
--- 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 1c971b75e897178cff1b5fbb4b4f229f981be2b9..b5973bdd4d66fc9a573d2603f5ce4ce898063c52 100644 (file)
--- 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 fdbf8d500a230135a0cea568d5b5affa73890d36..ab0cfc37da508e6f05c2106ebba4efe984d75f75 100644 (file)
--- 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.