More misc. tweaks for rpk make merge.

diff --git a/Aircraft/depend b/Aircraft/depend
index 24540f83ca3eee45b7e2421181f0f043e3fce470..7148bc0f717c009ce0ad3960d7df0183f53cb8a9 100644 (file)
--- a/Aircraft/depend
+++ b/Aircraft/depend
@@ -1,4 +1 @@
-aircraft.o: aircraft.c aircraft.h ../Flight/flight.h \
- ../Flight/Slew/slew.h ../Flight/LaRCsim/ls_interface.h \
- ../Flight/LaRCsim/../flight.h ../Controls/controls.h \
- ../Controls/../Include/limits.h ../Include/constants.h
+aircraft.o: aircraft.c

diff --git a/Astro/depend b/Astro/depend
index 223726e34dd1729dadc74b6eac79da513cbf38ab..a21cdfd472db61aa764c04fa3c9d03ea3e43a5ff 100644 (file)
--- a/Astro/depend
+++ b/Astro/depend
@@ -1,56 +1,6 @@
-moon.o: moon.c ../XGL/xgl.h orbits.h ../Time/fg_time.h \
- ../Time/../Include/types.h ../Time/../Flight/flight.h \
- ../Time/../Flight/Slew/slew.h \
- ../Time/../Flight/LaRCsim/ls_interface.h \
- ../Time/../Flight/LaRCsim/../flight.h moon.h ../Aircraft/aircraft.h \
- ../Aircraft/../Flight/flight.h ../Aircraft/../Controls/controls.h \
- ../Aircraft/../Controls/../Include/limits.h ../Include/constants.h \
- ../Include/general.h ../Main/views.h ../Main/../Include/types.h \
- ../Main/../Flight/flight.h ../Main/../Math/mat3.h \
- ../Main/../Time/fg_time.h
-old_astro.o: old_astro.c ../XGL/xgl.h old_astro.h stars.h moon.h \
- orbits.h ../Time/fg_time.h ../Time/../Include/types.h \
- ../Time/../Flight/flight.h ../Time/../Flight/Slew/slew.h \
- ../Time/../Flight/LaRCsim/ls_interface.h \
- ../Time/../Flight/LaRCsim/../flight.h planets.h sun.h \
- ../Include/constants.h ../Include/general.h ../Main/views.h \
- ../Main/../Include/types.h ../Main/../Flight/flight.h \
- ../Main/../Math/mat3.h ../Main/../Time/fg_time.h \
- ../Aircraft/aircraft.h ../Aircraft/../Flight/flight.h \
- ../Aircraft/../Controls/controls.h \
- ../Aircraft/../Controls/../Include/limits.h
-orbits.o: orbits.c orbits.h ../Time/fg_time.h \
- ../Time/../Include/types.h ../Time/../Flight/flight.h \
- ../Time/../Flight/Slew/slew.h \
- ../Time/../Flight/LaRCsim/ls_interface.h \
- ../Time/../Flight/LaRCsim/../flight.h ../Include/general.h
-planets.o: planets.c ../Time/fg_time.h ../Time/../Include/types.h \
- ../Time/../Flight/flight.h ../Time/../Flight/Slew/slew.h \
- ../Time/../Flight/LaRCsim/ls_interface.h \
- ../Time/../Flight/LaRCsim/../flight.h orbits.h planets.h sun.h
-sky.o: sky.c ../XGL/xgl.h sky.h ../Time/event.h ../Time/fg_time.h \
- ../Time/../Include/types.h ../Time/../Flight/flight.h \
- ../Time/../Flight/Slew/slew.h \
- ../Time/../Flight/LaRCsim/ls_interface.h \
- ../Time/../Flight/LaRCsim/../flight.h ../Aircraft/aircraft.h \
- ../Aircraft/../Flight/flight.h ../Aircraft/../Controls/controls.h \
- ../Aircraft/../Controls/../Include/limits.h ../Flight/flight.h \
- ../Include/constants.h ../Main/views.h ../Main/../Include/types.h \
- ../Main/../Flight/flight.h ../Main/../Math/mat3.h \
- ../Main/../Time/fg_time.h ../Math/fg_random.h
-stars.o: stars.c ../XGL/xgl.h orbits.h ../Time/fg_time.h \
- ../Time/../Include/types.h ../Time/../Flight/flight.h \
- ../Time/../Flight/Slew/slew.h \
- ../Time/../Flight/LaRCsim/ls_interface.h \
- ../Time/../Flight/LaRCsim/../flight.h planets.h stars.h \
- ../Include/constants.h ../Include/general.h ../Aircraft/aircraft.h \
- ../Aircraft/../Flight/flight.h ../Aircraft/../Controls/controls.h \
- ../Aircraft/../Controls/../Include/limits.h ../Main/views.h \
- ../Main/../Include/types.h ../Main/../Flight/flight.h \
- ../Main/../Math/mat3.h ../Main/../Time/fg_time.h
-sun.o: sun.c ../XGL/xgl.h ../Time/fg_time.h ../Time/../Include/types.h \
- ../Time/../Flight/flight.h ../Time/../Flight/Slew/slew.h \
- ../Time/../Flight/LaRCsim/ls_interface.h \
- ../Time/../Flight/LaRCsim/../flight.h ../Main/views.h \
- ../Main/../Include/types.h ../Main/../Flight/flight.h \
- ../Main/../Math/mat3.h ../Main/../Time/fg_time.h orbits.h sun.h
+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
index d5e9f450e0fe3204cf619b2e7820b456b47a56a0..7872ed1fc9634d2c5e6968fc844a8a649eca9b21 100644 (file)
--- a/Cockpit/depend
+++ b/Cockpit/depend
@@ -1,20 +1,8 @@
-cockpit.o: cockpit.c cockpit.h hud.h ../Aircraft/aircraft.h \
- ../Aircraft/../Flight/flight.h ../Aircraft/../Flight/Slew/slew.h \
- ../Aircraft/../Flight/LaRCsim/ls_interface.h \
- ../Aircraft/../Flight/LaRCsim/../flight.h \
- ../Aircraft/../Controls/controls.h \
- ../Aircraft/../Controls/../Include/limits.h ../Flight/flight.h \
+cockpit.o: cockpit.c
+hud.o: hud.c hud.h ../Include/constants.h ../Aircraft/aircraft.h \
+ ../Scenery/mesh.h ../Scenery/scenery.h ../Math/mat3.h ../Math/polar.h \
+ ../Time/fg_timer.h ../Math/fg_random.h ../Weather/weather.h
+test.o: test.c test.h ../Aircraft/aircraft.h ../Flight/flight.h \
  ../Controls/controls.h ../Include/constants.h ../Scenery/mesh.h \
- ../Scenery/scenery.h ../Scenery/../Include/types.h ../Math/mat3.h \
- ../Math/polar.h ../Math/../Include/types.h ../Time/fg_timer.h \
- ../Math/fg_random.h ../Weather/weather.h
-hud.o: hud.c hud.h ../Aircraft/aircraft.h \
- ../Aircraft/../Flight/flight.h ../Aircraft/../Flight/Slew/slew.h \
- ../Aircraft/../Flight/LaRCsim/ls_interface.h \
- ../Aircraft/../Flight/LaRCsim/../flight.h \
- ../Aircraft/../Controls/controls.h \
- ../Aircraft/../Controls/../Include/limits.h ../Flight/flight.h \
- ../Controls/controls.h ../Include/constants.h ../Scenery/mesh.h \
- ../Scenery/scenery.h ../Scenery/../Include/types.h ../Math/mat3.h \
- ../Math/polar.h ../Math/../Include/types.h ../Time/fg_timer.h \
- ../Math/fg_random.h ../Weather/weather.h
+ ../Scenery/scenery.h ../Math/mat3.h ../Math/polar.h \
+ ../Time/fg_timer.h ../Math/fg_random.h ../Weather/weather.h

diff --git a/Controls/depend b/Controls/depend
index 584466910012879c65a8a08c23c094dc6b62f9bb..3334a5e70dcb7e5011c3a45cb0a524dc9d810d62 100644 (file)
--- a/Controls/depend
+++ b/Controls/depend
@@ -1,7 +1 @@
-controls.o: controls.c /home/rpk/FlightGear/Src/Controls/controls.h \
- /home/rpk/FlightGear/Src/Controls/../Include/limits.h \
- /home/rpk/FlightGear/Src/Aircraft/aircraft.h \
- /home/rpk/FlightGear/Src/Flight/flight.h \
- /home/rpk/FlightGear/Src/Flight/Slew/slew.h \
- /home/rpk/FlightGear/Src/Flight/LaRCsim/ls_interface.h \
- /home/rpk/FlightGear/Src/Flight/LaRCsim/../flight.h
+controls.o: controls.c

diff --git a/FDM/depend b/FDM/depend
index 8ce307456a2358e14d717fd4cf10083426b5a196..191562116a8abf0ebd741aca55f948c055704af3 100644 (file)
--- a/FDM/depend
+++ b/FDM/depend
@@ -1,2 +1 @@
-flight.o: flight.c flight.h Slew/slew.h LaRCsim/ls_interface.h \
- LaRCsim/../flight.h
+flight.o: flight.c

diff --git a/LaRCsim/depend b/LaRCsim/depend
index de39a3ceb3e85d4fe4282a769cd45c3f1536c126..f1d12c0b8ff728dc87c4f05687cc9d4588fbac5e 100644 (file)
--- a/LaRCsim/depend
+++ b/LaRCsim/depend
@@ -1,5 +1,3 @@
-LaRCsim.o: LaRCsim.c ls_types.h ls_constants.h ls_generic.h \
- ls_sim_control.h ls_cockpit.h
 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
@@ -12,16 +10,11 @@ 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 ../flight.h \
- ../Slew/slew.h ../LaRCsim/ls_interface.h ls_step.h ls_accel.h \
- ls_aux.h ls_model.h ls_init.h ../../Aircraft/aircraft.h \
- ../../Aircraft/../Flight/flight.h \
- ../../Aircraft/../Controls/controls.h \
- ../../Aircraft/../Controls/../Include/limits.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_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_sync.o: ls_sync.c ls_types.h ls_sim_control.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 \

diff --git a/Main/depend b/Main/depend
index fe774ec848d678a85cf28e2c6bad145aa12229c2..3ddf5d8e34660aeb943d319900d8788ff89c1266 100644 (file)
--- a/Main/depend
+++ b/Main/depend
@@ -1,46 +1,5 @@
-GLUTkey.o: GLUTkey.c ../XGL/xgl.h GLUTkey.h views.h ../Include/types.h \
- ../Flight/flight.h ../Flight/Slew/slew.h \
- ../Flight/LaRCsim/ls_interface.h ../Flight/LaRCsim/../flight.h \
- ../Math/mat3.h ../Time/fg_time.h ../Time/../Include/types.h \
- ../Time/../Flight/flight.h ../Include/constants.h \
- ../Aircraft/aircraft.h ../Aircraft/../Flight/flight.h \
- ../Aircraft/../Controls/controls.h \
- ../Aircraft/../Controls/../Include/limits.h ../Weather/weather.h
-GLUTmain.o: GLUTmain.c ../XGL/xgl.h GLUTkey.h fg_init.h views.h \
- ../Include/types.h ../Flight/flight.h ../Flight/Slew/slew.h \
- ../Flight/LaRCsim/ls_interface.h ../Flight/LaRCsim/../flight.h \
- ../Math/mat3.h ../Time/fg_time.h ../Time/../Include/types.h \
- ../Time/../Flight/flight.h ../Include/constants.h \
- ../Include/general.h ../Aircraft/aircraft.h \
- ../Aircraft/../Flight/flight.h ../Aircraft/../Controls/controls.h \
- ../Aircraft/../Controls/../Include/limits.h ../Astro/moon.h \
- ../Astro/orbits.h ../Astro/../Time/fg_time.h ../Astro/sky.h \
- ../Astro/stars.h ../Astro/sun.h ../Cockpit/cockpit.h ../Cockpit/hud.h \
- ../Cockpit/../Aircraft/aircraft.h ../Cockpit/../Flight/flight.h \
- ../Cockpit/../Controls/controls.h ../Joystick/joystick.h \
- ../Math/fg_geodesy.h ../Math/polar.h ../Math/../Include/types.h \
- ../Scenery/mesh.h ../Scenery/scenery.h ../Scenery/../Include/types.h \
- ../Scenery/tilemgr.h ../Time/event.h ../Time/fg_timer.h \
- ../Time/sunpos.h ../Weather/weather.h
-fg_init.o: fg_init.c fg_init.h views.h ../Include/types.h \
- ../Flight/flight.h ../Flight/Slew/slew.h \
- ../Flight/LaRCsim/ls_interface.h ../Flight/LaRCsim/../flight.h \
- ../Math/mat3.h ../Time/fg_time.h ../Time/../Include/types.h \
- ../Time/../Flight/flight.h ../Include/constants.h \
- ../Include/general.h ../Aircraft/aircraft.h \
- ../Aircraft/../Flight/flight.h ../Aircraft/../Controls/controls.h \
- ../Aircraft/../Controls/../Include/limits.h ../Astro/moon.h \
- ../Astro/orbits.h ../Astro/../Time/fg_time.h ../Astro/sky.h \
- ../Astro/stars.h ../Astro/sun.h ../Cockpit/cockpit.h ../Cockpit/hud.h \
- ../Cockpit/../Aircraft/aircraft.h ../Cockpit/../Flight/flight.h \
- ../Cockpit/../Controls/controls.h ../Joystick/joystick.h \
- ../Math/fg_random.h ../Scenery/mesh.h ../Scenery/scenery.h \
- ../Scenery/../Include/types.h ../Scenery/tilemgr.h ../Time/event.h \
- ../Time/sunpos.h ../Weather/weather.h
-views.o: views.c views.h ../Include/types.h ../Flight/flight.h \
- ../Flight/Slew/slew.h ../Flight/LaRCsim/ls_interface.h \
- ../Flight/LaRCsim/../flight.h ../Math/mat3.h ../Time/fg_time.h \
- ../Time/../Include/types.h ../Time/../Flight/flight.h \
- ../Include/constants.h ../Math/polar.h ../Math/../Include/types.h \
- ../Math/vector.h ../Math/../Math/mat3.h ../Scenery/scenery.h \
- ../Scenery/../Include/types.h
+GLUTkey.o: GLUTkey.c
+GLUTmain.o: GLUTmain.c
+fg_init.o: fg_init.c
+probdemo.o: probdemo.c
+views.o: views.c

diff --git a/Scenery/depend b/Scenery/depend
index d7c4966d2c9e7ed3b3b6c7dfa791646ed5ec87a0..8063cae33c5da314abd690efd97ac34a2e2a204a 100644 (file)
--- a/Scenery/depend
+++ b/Scenery/depend
@@ -1,18 +1,7 @@
-common.o: common.c common.h
-geometry.o: geometry.c geometry.h mesh.h
-mesh.o: mesh.c ../Include/constants.h ../Include/types.h \
- ../Math/fg_geodesy.h ../Math/fg_random.h ../Math/mat3.h \
- ../Math/polar.h ../Math/../Include/types.h mesh.h common.h scenery.h
-obj.o: obj.c ../XGL/xgl.h obj.h ../Include/types.h scenery.h \
- ../Math/mat3.h
-scenery.o: scenery.c ../XGL/xgl.h ../Include/general.h obj.h \
- ../Include/types.h scenery.h
-tilemgr.o: tilemgr.c ../XGL/xgl.h scenery.h ../Include/types.h \
- tileutils.h obj.h ../Aircraft/aircraft.h \
- ../Aircraft/../Flight/flight.h ../Aircraft/../Flight/Slew/slew.h \
- ../Aircraft/../Flight/LaRCsim/ls_interface.h \
- ../Aircraft/../Flight/LaRCsim/../flight.h \
- ../Aircraft/../Controls/controls.h \
- ../Aircraft/../Controls/../Include/limits.h ../Include/constants.h \
- ../Include/general.h
-tileutils.o: tileutils.c tileutils.h ../Include/constants.h
+common.o: common.c
+geometry.o: geometry.c
+mesh.o: mesh.c
+obj.o: obj.c
+scenery.o: scenery.c
+tilemgr.o: tilemgr.c
+tileutils.o: tileutils.c

diff --git a/Simulator/Makefile b/Simulator/Makefile
index 14410d4b6c0b6f5c3025017592f0617877207894..de0de65227623a01bb9b1481b59180149f6b49e2 100644 (file)
--- a/Simulator/Makefile
+++ b/Simulator/Makefile
@@ -39,7 +39,7 @@ all:
 depend:
        for dir in $(ORDEREDDIRS); do \
            ( echo "Making depend in $$dir"; \
-             cd $$dir; $(CC) -MM *.c > depend ) ; \
+             cd $$dir; $(CC) $(CFLAGS) -MM *.c > depend ) ; \
        done
 
 Makefile-os2:
@@ -100,6 +100,9 @@ bin-zip:
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.37  1998/01/19 19:42:58  curt
+# More misc. tweaks for rpk make merge.
+#
 # Revision 1.36  1998/01/19 19:26:51  curt
 # Merged in make system changes from Bob Kuehne <rpk@sgi.com>
 # This should simplify things tremendously.

diff --git a/Slew/depend b/Slew/depend
index bec72d53ab9b94d5062ad9bfec15d440edcb5c4d..2b320dd52b8db474f6e37d8aaa18b451f918fe4e 100644 (file)
--- a/Slew/depend
+++ b/Slew/depend
@@ -1,6 +1 @@
-slew.o: slew.c slew.h ../flight.h ../Slew/slew.h \
- ../LaRCsim/ls_interface.h ../LaRCsim/../flight.h \
- ../../Aircraft/aircraft.h ../../Aircraft/../Flight/flight.h \
- ../../Aircraft/../Controls/controls.h \
- ../../Aircraft/../Controls/../Include/limits.h \
- ../../Controls/controls.h ../../Include/constants.h
+slew.o: slew.c

diff --git a/Time/Makefile b/Time/Makefile
index 576fc01d65b0c475f3fcc9ff73e5a98250e097f4..1a749bd8251b1b13cec41a217a80d8cd096b19d7 100644 (file)
--- a/Time/Makefile
+++ b/Time/Makefile
@@ -26,7 +26,7 @@
 ARLIBRARY = libTime.a
 TARGETS = $(ARLIBRARY)
 
-CFILES = event.c fg_time.c fg_timer.c scheduler.c sidereal.c sunpos.c test_event.c ttest.c
+CFILES = event.c fg_time.c fg_timer.c scheduler.c sunpos.c
 CXXFILES = 
 
 LDIRT = $(FG_ROOT_LIB)/$(ARLIBRARY)

diff --git a/Time/depend b/Time/depend
index d9a27d3e777febdf4110483de0b49ae15f416644..0ad13a2c479ed4f311ce13f307ba830c21b1f81c 100644 (file)
--- a/Time/depend
+++ b/Time/depend
@@ -1,16 +1,8 @@
-event.o: event.c event.h
-fg_time.o: fg_time.c fg_time.h ../Include/types.h ../Flight/flight.h \
- ../Flight/Slew/slew.h ../Flight/LaRCsim/ls_interface.h \
- ../Flight/LaRCsim/../flight.h ../Include/constants.h \
- ../Time/fg_time.h
-fg_timer.o: fg_timer.c fg_timer.h
-sptest.o: sptest.c sunpos.h ../Include/types.h ../Include/constants.h
-sunpos.o: sunpos.c sunpos.h ../Include/types.h fg_time.h \
- ../Flight/flight.h ../Flight/Slew/slew.h \
- ../Flight/LaRCsim/ls_interface.h ../Flight/LaRCsim/../flight.h \
- ../Include/constants.h ../Main/views.h ../Main/../Include/types.h \
- ../Main/../Flight/flight.h ../Main/../Math/mat3.h \
- ../Main/../Time/fg_time.h ../Math/fg_geodesy.h ../Math/mat3.h \
- ../Math/polar.h ../Math/../Include/types.h
+event.o: event.c
+fg_time.o: fg_time.c
+fg_timer.o: fg_timer.c
+old-sidereal.o: old-sidereal.c ../Include/constants.h
+scheduler.o: scheduler.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
index 1bfe93835854020ffe64adf9bf9c248c9c4592a9..1657c19e43a2b5771d412334016b5d8c6ea43232 100644 (file)
--- a/Weather/depend
+++ b/Weather/depend
@@ -1,6 +1 @@
-weather.o: weather.c weather.h ../Aircraft/aircraft.h \
- ../Aircraft/../Flight/flight.h ../Aircraft/../Flight/Slew/slew.h \
- ../Aircraft/../Flight/LaRCsim/ls_interface.h \
- ../Aircraft/../Flight/LaRCsim/../flight.h \
- ../Aircraft/../Controls/controls.h \
- ../Aircraft/../Controls/../Include/limits.h ../Math/fg_random.h
+weather.o: weather.c