From b570e9ce9a371cd89bf31b564944283336978f0e Mon Sep 17 00:00:00 2001 From: curt Date: Mon, 9 Feb 1998 22:56:28 +0000 Subject: [PATCH] Removed "depend" files from cvs control. Other minor make tweaks. --- Aircraft/depend | 1 - Astro/depend | 6 ------ Cockpit/depend | 2 -- Controls/controls.h | 11 +++++++---- Controls/depend | 1 - FDM/depend | 1 - Joystick/depend | 1 - LaRCsim/depend | 26 -------------------------- Main/GLUTmain.c | 9 ++++++--- Main/Makefile | 5 ++++- Main/depend | 7 ------- Main/fg_init.c | 15 ++++++++++++--- Scenery/depend | 9 --------- Simulator/Makefile | 7 +++++-- Simulator/Thanks | 4 ++++ Simulator/commondefs | 2 +- Simulator/commonrules | 4 ++-- Slew/depend | 1 - Time/depend | 6 ------ Weather/depend | 1 - 20 files changed, 41 insertions(+), 78 deletions(-) delete mode 100644 Aircraft/depend delete mode 100644 Astro/depend delete mode 100644 Cockpit/depend delete mode 100644 Controls/depend delete mode 100644 FDM/depend delete mode 100644 Joystick/depend delete mode 100644 LaRCsim/depend delete mode 100644 Main/depend delete mode 100644 Scenery/depend delete mode 100644 Slew/depend delete mode 100644 Time/depend delete mode 100644 Weather/depend diff --git a/Aircraft/depend b/Aircraft/depend deleted file mode 100644 index 7148bc0f7..000000000 --- a/Aircraft/depend +++ /dev/null @@ -1 +0,0 @@ -aircraft.o: aircraft.c diff --git a/Astro/depend b/Astro/depend deleted file mode 100644 index a21cdfd47..000000000 --- a/Astro/depend +++ /dev/null @@ -1,6 +0,0 @@ -moon.o: moon.c -orbits.o: orbits.c -planets.o: planets.c -sky.o: sky.c -stars.o: stars.c -sun.o: sun.c diff --git a/Cockpit/depend b/Cockpit/depend deleted file mode 100644 index daa26b6c6..000000000 --- a/Cockpit/depend +++ /dev/null @@ -1,2 +0,0 @@ -cockpit.o: cockpit.c -hud.o: hud.c hud.h diff --git a/Controls/controls.h b/Controls/controls.h index ddc89390d..03671a995 100644 --- a/Controls/controls.h +++ b/Controls/controls.h @@ -28,7 +28,7 @@ #define _CONTROLS_H -#include "../Include/fg_limits.h" +#include /* Define a structure containing the control parameters */ @@ -82,10 +82,13 @@ void fgThrottleSet(int engine, double pos); /* $Log$ -/* Revision 1.11 1998/02/07 15:29:36 curt -/* Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss -/* +/* Revision 1.12 1998/02/09 22:56:48 curt +/* Removed "depend" files from cvs control. Other minor make tweaks. /* + * Revision 1.11 1998/02/07 15:29:36 curt + * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss + * + * * Revision 1.10 1998/01/27 00:47:52 curt * Incorporated Paul Bleisch's new debug message * system and commandline/config file processing code. diff --git a/Controls/depend b/Controls/depend deleted file mode 100644 index 3334a5e70..000000000 --- a/Controls/depend +++ /dev/null @@ -1 +0,0 @@ -controls.o: controls.c diff --git a/FDM/depend b/FDM/depend deleted file mode 100644 index 191562116..000000000 --- a/FDM/depend +++ /dev/null @@ -1 +0,0 @@ -flight.o: flight.c diff --git a/Joystick/depend b/Joystick/depend deleted file mode 100644 index 1e3c61f9b..000000000 --- a/Joystick/depend +++ /dev/null @@ -1 +0,0 @@ -joystick.o: joystick.c diff --git a/LaRCsim/depend b/LaRCsim/depend deleted file mode 100644 index 4e21e3128..000000000 --- a/LaRCsim/depend +++ /dev/null @@ -1,26 +0,0 @@ -atmos_62.o: atmos_62.c ls_types.h ls_constants.h atmos_62.h -default_model_routines.o: default_model_routines.c ls_types.h \ - default_model_routines.h -ls_accel.o: ls_accel.c ls_types.h ls_generic.h ls_constants.h \ - ls_accel.h -ls_aux.o: ls_aux.c ls_types.h ls_constants.h ls_generic.h ls_aux.h \ - atmos_62.h ls_geodesy.h ls_gravity.h -ls_geodesy.o: ls_geodesy.c ls_types.h ls_constants.h ls_geodesy.h -ls_gravity.o: ls_gravity.c ls_types.h ls_constants.h ls_gravity.h -ls_init.o: ls_init.c ls_types.h ls_sym.h ls_step.h ls_init.h \ - navion_init.h ls_generic.h -ls_interface.o: ls_interface.c ls_types.h ls_constants.h ls_generic.h \ - ls_sim_control.h ls_cockpit.h ls_interface.h ls_step.h ls_accel.h \ - ls_aux.h ls_model.h ls_init.h -ls_matrix.o: ls_matrix.c ls_matrix.h -ls_model.o: ls_model.c ls_types.h ls_model.h default_model_routines.h -ls_step.o: ls_step.c ls_types.h ls_constants.h ls_generic.h ls_accel.h \ - ls_aux.h ls_model.h ls_step.h ls_geodesy.h ls_gravity.h -ls_trim.o: ls_trim.c ls_constants.h ls_types.h ls_sym.h ls_matrix.h -mymain.o: mymain.c ls_types.h ls_cockpit.h ls_generic.h -navion_aero.o: navion_aero.c ls_types.h ls_generic.h ls_cockpit.h -navion_engine.o: navion_engine.c ls_types.h ls_constants.h \ - ls_generic.h ls_sim_control.h ls_cockpit.h -navion_gear.o: navion_gear.c ls_types.h ls_constants.h ls_generic.h \ - ls_cockpit.h -navion_init.o: navion_init.c ls_types.h ls_generic.h ls_cockpit.h diff --git a/Main/GLUTmain.c b/Main/GLUTmain.c index 772028794..95208878b 100644 --- a/Main/GLUTmain.c +++ b/Main/GLUTmain.c @@ -286,7 +286,7 @@ static void fgRenderFrame( void ) { xglPopMatrix(); /* draw scenery */ - xglShadeModel( GL_FLAT /* GL_SMOOTH */ ); + xglShadeModel( /* GL_FLAT */ GL_SMOOTH ); xglEnable( GL_DEPTH_TEST ); xglEnable( GL_FOG ); xglFogfv (GL_FOG_COLOR, l->fog_color); @@ -647,9 +647,12 @@ int main( int argc, char *argv[] ) { #endif /* $Log$ -/* Revision 1.58 1998/02/09 15:07:49 curt -/* Minor tweaks. +/* Revision 1.59 1998/02/09 22:56:54 curt +/* Removed "depend" files from cvs control. Other minor make tweaks. /* + * Revision 1.58 1998/02/09 15:07:49 curt + * Minor tweaks. + * * Revision 1.57 1998/02/07 15:29:40 curt * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss * diff --git a/Main/Makefile b/Main/Makefile index a7d779b64..adfd1748c 100644 --- a/Main/Makefile +++ b/Main/Makefile @@ -45,13 +45,16 @@ include $(FG_ROOT_SRC)/commondefs $(TARGET)$(EXT): $(OBJECTS) $(FG_ROOT_LIB)/stamp_libs $(CC) -o $(TARGET)$(EXT) $(OBJECTS) $(LDFLAGS) $(LDLIBS) - $(RM) fg$(FG_VERSION_MAJOR)$(EXT) + $(RM) -f fg$(FG_VERSION_MAJOR)$(EXT) $(LN) $(TARGET)$(EXT) fg$(FG_VERSION_MAJOR)$(EXT) include $(COMMONRULES) #--------------------------------------------------------------------------- # $Log$ +# Revision 1.47 1998/02/09 22:56:56 curt +# Removed "depend" files from cvs control. Other minor make tweaks. +# # Revision 1.46 1998/02/03 23:20:24 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/Main/depend b/Main/depend deleted file mode 100644 index b6102bab2..000000000 --- a/Main/depend +++ /dev/null @@ -1,7 +0,0 @@ -GLUTkey.o: GLUTkey.c -GLUTmain.o: GLUTmain.c -fg_configvars.o: fg_configvars.c -fg_debug.o: fg_debug.c -fg_init.o: fg_init.c -probdemo.o: probdemo.c -views.o: views.c diff --git a/Main/fg_init.c b/Main/fg_init.c index 282e7e88f..2957d4b06 100644 --- a/Main/fg_init.c +++ b/Main/fg_init.c @@ -123,7 +123,7 @@ void fgInitSubsystems( void ) { /* Initial Position at (E81) Superior, AZ */ /* FG_Longitude = ( -111.1270650 ) * DEG_TO_RAD; */ /* FG_Latitude = ( 33.2778339 ) * DEG_TO_RAD; */ - /* FG_Runway_altitude = (2646 + 500); */ + /* FG_Runway_altitude = (2646 + 1000); */ /* FG_Altitude = FG_Runway_altitude + 3.758099; */ /* Initial Position at (TUS) Tucson, AZ */ @@ -180,6 +180,12 @@ void fgInitSubsystems( void ) { /* FG_Runway_altitude = 5000.0; */ /* FG_Altitude = FG_Runway_altitude + 3.758099; */ + /* Initial Position: (GCN) Grand Canyon Airport, AZ */ + /* FG_Longitude = ( -112.1469647 ) * DEG_TO_RAD; */ + /* FG_Latitude = ( 35.9523539 ) * DEG_TO_RAD; */ + /* FG_Runway_altitude = 6606.0; */ + /* FG_Altitude = FG_Runway_altitude + 3.758099; */ + /* A random test position */ /* FG_Longitude = ( 88128.00 / 3600.0 ) * DEG_TO_RAD; */ /* FG_Latitude = ( 93312.00 / 3600.0 ) * DEG_TO_RAD; */ @@ -328,9 +334,12 @@ void fgInitSubsystems( void ) { /* $Log$ -/* Revision 1.41 1998/02/09 15:07:50 curt -/* Minor tweaks. +/* Revision 1.42 1998/02/09 22:56:58 curt +/* Removed "depend" files from cvs control. Other minor make tweaks. /* + * Revision 1.41 1998/02/09 15:07:50 curt + * Minor tweaks. + * * Revision 1.40 1998/02/07 15:29:44 curt * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss * diff --git a/Scenery/depend b/Scenery/depend deleted file mode 100644 index 0944d3a2a..000000000 --- a/Scenery/depend +++ /dev/null @@ -1,9 +0,0 @@ -bucketutils.o: bucketutils.c -common.o: common.c -geometry.o: geometry.c -mesh.o: mesh.c -obj.o: obj.c -scenery.o: scenery.c -texload.o: texload.c texload.h -tilecache.o: tilecache.c -tilemgr.o: tilemgr.c diff --git a/Simulator/Makefile b/Simulator/Makefile index a5333c7af..e8836288d 100644 --- a/Simulator/Makefile +++ b/Simulator/Makefile @@ -40,7 +40,7 @@ all: depend: for dir in $(ORDEREDDIRS); do \ ( echo "Making depend in $$dir"; \ - cd $$dir; $(CC) $(CFLAGS) -MM *.c > depend ) ; \ + cd $$dir; $(CC) $(CFLAGS) -M *.c > depend ) ; \ done Makefile-os2: @@ -59,7 +59,7 @@ clean: clobber: for dir in $(ORDEREDDIRS); do \ - (cd $$dir; $(MAKE) clean) ; \ + (cd $$dir; $(MAKE) clobber) ; \ done source-tar: clean @@ -104,6 +104,9 @@ bin-zip: #--------------------------------------------------------------------------- # $Log$ +# Revision 1.41 1998/02/09 22:56:28 curt +# Removed "depend" files from cvs control. Other minor make tweaks. +# # Revision 1.40 1998/02/01 03:39:53 curt # Minor tweaks. # diff --git a/Simulator/Thanks b/Simulator/Thanks index 360f60057..9c60fc693 100644 --- a/Simulator/Thanks +++ b/Simulator/Thanks @@ -41,6 +41,10 @@ Michael I. Gold -- Patiently answered my endless fan. +Charlie Hotchkiss -- Worked on improving + and enhancing the HUD code. Lots of code style tips ... + + Bruce Jackson http://agcbwww.larc.nasa.gov/People/ebj.html -- Developed the LaRCsim code which we use to provide the flight model. Also diff --git a/Simulator/commondefs b/Simulator/commondefs index e1ea85b17..38fb0dcb9 100644 --- a/Simulator/commondefs +++ b/Simulator/commondefs @@ -140,7 +140,7 @@ EXT = #--------------------------------------------------------------------------- OBJECTS = $(CFILES:.c=.o) $(CXXFILES:.cxx=.o) -DEPENDS = $(CFILES:.c=.d) $(CXXFILES:.cxx=.d) +# DEPENDS = $(CFILES:.c=.d) $(CXXFILES:.cxx=.d) MAKEDEPENDFILE = depend diff --git a/Simulator/commonrules b/Simulator/commonrules index faba7e5cf..7c7c97935 100644 --- a/Simulator/commonrules +++ b/Simulator/commonrules @@ -34,8 +34,8 @@ clean: rm -f $(OBJECTS) $(TARGET) $(DIRT) clobber: clean - rm -f *.d *.o *.a *.os2 *~ core $(MAKEDEPENDFILE) + rm -f *.d *.o *.a *.os2 *~ core # $(MAKEDEPENDFILE) -#include $(MAKEDEPENDFILE) +include $(MAKEDEPENDFILE) diff --git a/Slew/depend b/Slew/depend deleted file mode 100644 index 2b320dd52..000000000 --- a/Slew/depend +++ /dev/null @@ -1 +0,0 @@ -slew.o: slew.c diff --git a/Time/depend b/Time/depend deleted file mode 100644 index b3cc3332f..000000000 --- a/Time/depend +++ /dev/null @@ -1,6 +0,0 @@ -event.o: event.c -fg_time.o: fg_time.c -fg_timer.o: fg_timer.c -sunpos.o: sunpos.c -test_event.o: test_event.c event.h -ttest.o: ttest.c diff --git a/Weather/depend b/Weather/depend deleted file mode 100644 index 1657c19e4..000000000 --- a/Weather/depend +++ /dev/null @@ -1 +0,0 @@ -weather.o: weather.c -- 2.39.2