1
0
Fork 0

More misc. tweaks for rpk make merge.

This commit is contained in:
curt 1998-01-19 19:42:58 +00:00
parent 7162a877bf
commit ec140f2161
13 changed files with 43 additions and 189 deletions
Aircraft
Astro
Cockpit
Controls
FDM
LaRCsim
Main
Scenery
Simulator
Slew
Time
Weather

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -1,2 +1 @@
flight.o: flight.c flight.h Slew/slew.h LaRCsim/ls_interface.h \
LaRCsim/../flight.h
flight.o: flight.c

View file

@ -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 \

View file

@ -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

View file

@ -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

View file

@ -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.

View file

@ -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

View file

@ -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)

View file

@ -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

View file

@ -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