fly/flightgear
1
0
Fork 0
Code Activity

Minor cleanups and reorganizations.

Browse source
This commit is contained in:
curt 1998-04-06 15:56:15 +00:00
parent 058e32ca21
commit b69c64da41
16 changed files with 106 additions and 299 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Aircraft/Makefile.in
View file

@ -76,12 +76,12 @@ lib_LTLIBRARIES = libAircraft.la
libAircraft_la_SOURCES = \
aircraft.c
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../Src/Include/config.h
CONFIG_HEADER = ../../Simulator/Include/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Src/Include
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
@ -112,7 +112,7 @@ all: Makefile $(LTLIBRARIES)
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .s
$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu Src/Aircraft/Makefile
cd $(top_srcdir) && $(AUTOMAKE) --gnu Simulator/Aircraft/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
@ -206,14 +206,14 @@ maintainer-clean-tags:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = Src/Aircraft
subdir = Simulator/Aircraft
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Src/Aircraft/Makefile
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Simulator/Aircraft/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
test -f $(distdir)/$$file \

10
Astro/Makefile.in
View file

@ -81,12 +81,12 @@ libAstro_la_SOURCES = \
stars.c \
sun.c
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../Src/Include/config.h
CONFIG_HEADER = ../../Simulator/Include/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Src/Include
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
@ -119,7 +119,7 @@ all: Makefile $(LTLIBRARIES)
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .s
$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu Src/Astro/Makefile
cd $(top_srcdir) && $(AUTOMAKE) --gnu Simulator/Astro/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
@ -213,14 +213,14 @@ maintainer-clean-tags:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = Src/Astro
subdir = Simulator/Astro
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Src/Astro/Makefile
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Simulator/Astro/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
test -f $(distdir)/$$file \

10
Cockpit/Makefile.in
View file

@ -77,12 +77,12 @@ libCockpit_la_SOURCES = \
cockpit.c \
hud.c
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../Src/Include/config.h
CONFIG_HEADER = ../../Simulator/Include/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Src/Include
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
@ -113,7 +113,7 @@ all: Makefile $(LTLIBRARIES)
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .s
$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu Src/Cockpit/Makefile
cd $(top_srcdir) && $(AUTOMAKE) --gnu Simulator/Cockpit/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
@ -207,14 +207,14 @@ maintainer-clean-tags:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = Src/Cockpit
subdir = Simulator/Cockpit
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Src/Cockpit/Makefile
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Simulator/Cockpit/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
test -f $(distdir)/$$file \

10
Controls/Makefile.in
View file

@ -76,12 +76,12 @@ lib_LTLIBRARIES = libControls.la
libControls_la_SOURCES = \
controls.c
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../Src/Include/config.h
CONFIG_HEADER = ../../Simulator/Include/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Src/Include
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
@ -112,7 +112,7 @@ all: Makefile $(LTLIBRARIES)
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .s
$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu Src/Controls/Makefile
cd $(top_srcdir) && $(AUTOMAKE) --gnu Simulator/Controls/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
@ -206,14 +206,14 @@ maintainer-clean-tags:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = Src/Controls
subdir = Simulator/Controls
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Src/Controls/Makefile
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Simulator/Controls/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
test -f $(distdir)/$$file \

10
FDM/Makefile.in
View file

@ -79,12 +79,12 @@ lib_LTLIBRARIES = libFlight.la
libFlight_la_SOURCES = \
flight.c
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../Src/Include/config.h
CONFIG_HEADER = ../../Simulator/Include/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Src/Include
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
@ -115,7 +115,7 @@ all: all-recursive all-am
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .s
$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu Src/Flight/Makefile
cd $(top_srcdir) && $(AUTOMAKE) --gnu Simulator/Flight/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
@ -249,14 +249,14 @@ maintainer-clean-tags:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = Src/Flight
subdir = Simulator/Flight
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Src/Flight/Makefile
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Simulator/Flight/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
test -f $(distdir)/$$file \

10
Joystick/Makefile.in
View file

@ -76,12 +76,12 @@ lib_LTLIBRARIES = libJoystick.la
libJoystick_la_SOURCES = \
joystick.c
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../Src/Include/config.h
CONFIG_HEADER = ../../Simulator/Include/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Src/Include
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
@ -112,7 +112,7 @@ all: Makefile $(LTLIBRARIES)
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .s
$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu Src/Joystick/Makefile
cd $(top_srcdir) && $(AUTOMAKE) --gnu Simulator/Joystick/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
@ -206,14 +206,14 @@ maintainer-clean-tags:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = Src/Joystick
subdir = Simulator/Joystick
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Src/Joystick/Makefile
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Simulator/Joystick/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
test -f $(distdir)/$$file \

10
LaRCsim/Makefile.in
View file

@ -85,12 +85,12 @@ libLaRCsim_la_SOURCES = \
$(NavionFILES) \
$(InterfaceFILES)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../../Src/Include/config.h
CONFIG_HEADER = ../../../Simulator/Include/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../../Src/Include
DEFS = @DEFS@ -I. -I$(srcdir) -I../../../Simulator/Include
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
@ -128,7 +128,7 @@ all: Makefile $(LTLIBRARIES)
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .s
$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu Src/Flight/LaRCsim/Makefile
cd $(top_srcdir) && $(AUTOMAKE) --gnu Simulator/Flight/LaRCsim/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
@ -222,14 +222,14 @@ maintainer-clean-tags:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = Src/Flight/LaRCsim
subdir = Simulator/Flight/LaRCsim
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Src/Flight/LaRCsim/Makefile
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Simulator/Flight/LaRCsim/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
test -f $(distdir)/$$file \

26
Main/Makefile.am
View file

@ -1,5 +1,5 @@
bindir = ${exec_prefix}/japhar/bin
# bindir = ${exec_prefix}/japhar/bin
bin_PROGRAMS = fg
fg_SOURCES = \
@ -12,17 +12,17 @@ fg_SOURCES = \
# Need $(INTERFACE_LIBS) $(GRAPHICS_LIBS)
fg_LDADD = \
$(top_builddir)/Src/Aircraft/libAircraft.la \
$(top_builddir)/Src/Astro/libAstro.la \
$(top_builddir)/Src/Cockpit/libCockpit.la \
$(top_builddir)/Src/Controls/libControls.la \
$(top_builddir)/Src/Flight/libFlight.la \
$(top_builddir)/Src/Flight/LaRCsim/libLaRCsim.la \
$(top_builddir)/Src/Flight/Slew/libSlew.la \
$(top_builddir)/Src/Scenery/libScenery.la \
$(top_builddir)/Src/Time/libTime.la \
$(top_builddir)/Src/Weather/libWeather.la \
$(top_builddir)/Src/Joystick/libJoystick.la \
$(top_builddir)/Src/Math/libMath.la
$(top_builddir)/Simulator/Aircraft/libAircraft.la \
$(top_builddir)/Simulator/Astro/libAstro.la \
$(top_builddir)/Simulator/Cockpit/libCockpit.la \
$(top_builddir)/Simulator/Controls/libControls.la \
$(top_builddir)/Simulator/Flight/libFlight.la \
$(top_builddir)/Simulator/Flight/LaRCsim/libLaRCsim.la \
$(top_builddir)/Simulator/Flight/Slew/libSlew.la \
$(top_builddir)/Simulator/Scenery/libScenery.la \
$(top_builddir)/Simulator/Time/libTime.la \
$(top_builddir)/Simulator/Weather/libWeather.la \
$(top_builddir)/Simulator/Joystick/libJoystick.la \
$(top_builddir)/Simulator/Math/libMath.la
INCLUDES += -I.. -DGLUT

64
Main/Makefile.in
View file

@ -10,6 +10,8 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
# bindir = ${exec_prefix}/japhar/bin
SHELL = /bin/sh
@ -18,6 +20,8 @@ top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
@ -69,8 +73,6 @@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
VERSION = @VERSION@
bindir = ${exec_prefix}/japhar/bin
bin_PROGRAMS = fg
fg_SOURCES = \
fg_debug.c \
@ -82,25 +84,25 @@ fg_SOURCES = \
# Need $(INTERFACE_LIBS) $(GRAPHICS_LIBS)
fg_LDADD = \
$(top_builddir)/Src/Aircraft/libAircraft.la \
$(top_builddir)/Src/Astro/libAstro.la \
$(top_builddir)/Src/Cockpit/libCockpit.la \
$(top_builddir)/Src/Controls/libControls.la \
$(top_builddir)/Src/Flight/libFlight.la \
$(top_builddir)/Src/Flight/LaRCsim/libLaRCsim.la \
$(top_builddir)/Src/Flight/Slew/libSlew.la \
$(top_builddir)/Src/Scenery/libScenery.la \
$(top_builddir)/Src/Time/libTime.la \
$(top_builddir)/Src/Weather/libWeather.la \
$(top_builddir)/Src/Joystick/libJoystick.la \
$(top_builddir)/Src/Math/libMath.la
$(top_builddir)/Simulator/Aircraft/libAircraft.la \
$(top_builddir)/Simulator/Astro/libAstro.la \
$(top_builddir)/Simulator/Cockpit/libCockpit.la \
$(top_builddir)/Simulator/Controls/libControls.la \
$(top_builddir)/Simulator/Flight/libFlight.la \
$(top_builddir)/Simulator/Flight/LaRCsim/libLaRCsim.la \
$(top_builddir)/Simulator/Flight/Slew/libSlew.la \
$(top_builddir)/Simulator/Scenery/libScenery.la \
$(top_builddir)/Simulator/Time/libTime.la \
$(top_builddir)/Simulator/Weather/libWeather.la \
$(top_builddir)/Simulator/Joystick/libJoystick.la \
$(top_builddir)/Simulator/Math/libMath.la
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../Src/Include/config.h
CONFIG_HEADER = ../../Simulator/Include/config.h
CONFIG_CLEAN_FILES =
PROGRAMS = $(bin_PROGRAMS)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Src/Include
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
@ -110,18 +112,18 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
fg_OBJECTS = fg_debug.o fg_getopt.o fg_init.o views.o GLUTkey.o \
GLUTmain.o
fg_DEPENDENCIES = $(top_builddir)/Src/Aircraft/libAircraft.la \
$(top_builddir)/Src/Astro/libAstro.la \
$(top_builddir)/Src/Cockpit/libCockpit.la \
$(top_builddir)/Src/Controls/libControls.la \
$(top_builddir)/Src/Flight/libFlight.la \
$(top_builddir)/Src/Flight/LaRCsim/libLaRCsim.la \
$(top_builddir)/Src/Flight/Slew/libSlew.la \
$(top_builddir)/Src/Scenery/libScenery.la \
$(top_builddir)/Src/Time/libTime.la \
$(top_builddir)/Src/Weather/libWeather.la \
$(top_builddir)/Src/Joystick/libJoystick.la \
$(top_builddir)/Src/Math/libMath.la
fg_DEPENDENCIES = $(top_builddir)/Simulator/Aircraft/libAircraft.la \
$(top_builddir)/Simulator/Astro/libAstro.la \
$(top_builddir)/Simulator/Cockpit/libCockpit.la \
$(top_builddir)/Simulator/Controls/libControls.la \
$(top_builddir)/Simulator/Flight/libFlight.la \
$(top_builddir)/Simulator/Flight/LaRCsim/libLaRCsim.la \
$(top_builddir)/Simulator/Flight/Slew/libSlew.la \
$(top_builddir)/Simulator/Scenery/libScenery.la \
$(top_builddir)/Simulator/Time/libTime.la \
$(top_builddir)/Simulator/Weather/libWeather.la \
$(top_builddir)/Simulator/Joystick/libJoystick.la \
$(top_builddir)/Simulator/Math/libMath.la
fg_LDFLAGS =
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
@ -144,7 +146,7 @@ all: Makefile $(PROGRAMS)
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .s
$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu Src/Main/Makefile
cd $(top_srcdir) && $(AUTOMAKE) --gnu Simulator/Main/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
@ -239,14 +241,14 @@ maintainer-clean-tags:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = Src/Main
subdir = Simulator/Main
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Src/Main/Makefile
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Simulator/Main/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
test -f $(distdir)/$$file \

10
Scenery/Makefile.in
View file

@ -81,12 +81,12 @@ libScenery_la_SOURCES = \
tilecache.c \
tilemgr.c
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../Src/Include/config.h
CONFIG_HEADER = ../../Simulator/Include/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Src/Include
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
@ -119,7 +119,7 @@ all: Makefile $(LTLIBRARIES)
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .s
$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu Src/Scenery/Makefile
cd $(top_srcdir) && $(AUTOMAKE) --gnu Simulator/Scenery/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
@ -213,14 +213,14 @@ maintainer-clean-tags:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = Src/Scenery
subdir = Simulator/Scenery
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Src/Scenery/Makefile
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Simulator/Scenery/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
test -f $(distdir)/$$file \

11
Simulator/Makefile.in
View file

@ -84,10 +84,9 @@ SUBDIRS = Aircraft \
Time \
Weather \
XGL \
Main \
Include
Main
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../Src/Include/config.h
CONFIG_HEADER = ../Simulator/Include/config.h
CONFIG_CLEAN_FILES =
DIST_COMMON = README Makefile.am Makefile.in
@ -100,7 +99,7 @@ all: all-recursive all-am
.SUFFIXES:
$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu Src/Makefile
cd $(top_srcdir) && $(AUTOMAKE) --gnu Simulator/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
@ -174,14 +173,14 @@ maintainer-clean-tags:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = Src
subdir = Simulator
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Src/Makefile
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Simulator/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
test -f $(distdir)/$$file \

49
Simulator/README
View file

@ -1,49 +0,0 @@
Welcome to the Flight Gear project.
Starting the executable
=======================
Unix: runfg
Windows: runfg.bat
"runfg" is a script which sets the FG_ROOT environment variable, then
runs the flight gear executable.
Keyboard controls
=================
Flying is mainly done via the numeric keypad. There is some
unresolved wierdness with the GLUT libraries and keyboard input, so
for now, the state of the "Num Lock" key is important.
Num Lock Active
---------------
Pg Up/Pg Dn Throttle
Left Arrow/Right Arrow Aileron
Up Arrow/Down Arrow Elevator
Ins/Del Rudder
"5" Center aileron/elevator/rudder
Home/End Elevator Trim
Num Lock Inactive
-----------------
Shift + <Numeric Keypad Key> Change view
where key is one of:
8 = forward
7 = left/forward
4 = left
1 = left/back
2 = back
3 = right/back
6 = right
9 = right/forward

145
Simulator/README.Win32
View file

@ -1,145 +0,0 @@
March 15, 1998
=============
Here is a quick outline of *one* way you can build FG for Win32 using
a completely free development environment.
1. Install and configure the Cygnus Gnu-Win32 development
environment. The latest version is Beta 19. The main
Cygnus Gnu-Win32 page is at:
http://www.cygnus.com/misc/gnu-win32/
You can download the Cygnus Gnu-Win32 compiler from:
ftp://ftp.cygnus.com/pub/gnu-win32/latest/cdk.exe
To install, just run the file: "cdk.exe" by double-clicking on it
from windows explorer. Be sure to read this package's README:
http://www.cygnus.com/misc/gnu-win32/readme_toc.html
and install them as well. After installing the cygnus compiler
and the usertools you should find a program group "Gygnus"
in your start menu.
2. Fetch the Flight Gear source code and win32 libs. They can be
found at:
http://www.menet.umn.edu/~curt/fgfs/Downloads/
Grab the latest source-X.XX.zip file.
In addition, you need the win32 libraries from win32-libs-X.XX.zip
Also, don't forget to download scenery and textures. These aren't
needed to built the code, but you'll need them before you can run
the executable.
3. Unpack the FG prototype code and the libraries. Run:
pkunzip -d <file>.zip
Be sure to use the -d option. This will create all the needed
subdirectories. Otherwise you will have one big mess!
This should create a directory called ``FlightGear'' with several
subdirectories. Do the same with the libraries.
4. The win32-libs zip file provides the necessary OpenGL/GLUT headers
and libraries for the build process.
Before trying to run the executable, you should copy glut.dll from
...\FlightGear\Win32\glut.dll
into someplace in your path such as:
...\FlightGear\Src\Main\glut.dll
5. Install the Silicon Graphics OpenGL dynamic link libraries. For
this purpose, get the file sgi-opengl2.exe from the flight gear
project site. This is a win95/winnt self extracting installation
program. Install it by double-clicking in windows explorer.
6. Edit the ``commondefs'' file, if necessary. Go to the main
FlightGear source directory. From where ever you extracted the FG
code, cd to ``FlightGear\Src''. Edit the file called
``commondefs''. Find the part of the file that says: ``Uncomment
one of the following sections depending on your system''
Uncomment all the makefile defines in the ``Cygnus Win32 beta19''
section. Also, you should comment out any of the defines in the
other platform dependent sections. Depending on the version,
you may find, that the appropriate settings are already done
and you can skip this step.
7. Prepare the shell. Call the Cygnus shell from the start menu.
At first, you have to mount your flight gear drive (assuming it is g:)
with
mount g:/ /mnt
(Be careful writing slashes; you are working within a strange mixture
of DOS/WIN95/UNIX here.)
If anything went wrong with mounting you can unmount the drive with
mount --reset.
Now change to the flight gear source directory with
cd /mnt/FlightGear/Src
(make sure you're correct with the "pwd" command)
Next, you have to set the environment variables as:
SET FG_ROOT=/mnt/FlightGear
SET FG_ROOT_SRC=${FG_ROOT}/Src
SET FG_ROOT_LIB=${FG_ROOT}/Lib
8. Build the executable. Type first
make depend
and after that's done type
make
You will see a few warning messages from the compiler, but none of
these are serious.
Be prepared flight gear to need 10 minutes or more for compilation
(depending of your system).
9. Try it out! When make is done close the Cygnus shell. There are several
possibilities running flight gear. The one which should always work
is as follows:
Open an ordinary DOS shell. Within this one reset the flight gear root
environment variable to
SET FG_ROOT=g:\flightgear
(or whatever your drive is.) This is absolutely necessary as win95
does not recover your "mounted" drive.
Goto the directory where your freshly build executable sits, i.e.
cd g:\flightgear\src\main
and type fg0.exe.
10. Tell me that it works! If it doesn't, tell me what goes wrong. My
email is curt@me.umn.edu. Please send me email and let me know
what changes need to be made to this document and these procedures
to make them easier to understand and follow.

10
Slew/Makefile.in
View file

@ -76,12 +76,12 @@ lib_LTLIBRARIES = libSlew.la
libSlew_la_SOURCES = \
slew.c
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../../Src/Include/config.h
CONFIG_HEADER = ../../../Simulator/Include/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../../Src/Include
DEFS = @DEFS@ -I. -I$(srcdir) -I../../../Simulator/Include
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
@ -112,7 +112,7 @@ all: Makefile $(LTLIBRARIES)
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .s
$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu Src/Flight/Slew/Makefile
cd $(top_srcdir) && $(AUTOMAKE) --gnu Simulator/Flight/Slew/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
@ -206,14 +206,14 @@ maintainer-clean-tags:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = Src/Flight/Slew
subdir = Simulator/Flight/Slew
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Src/Flight/Slew/Makefile
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Simulator/Flight/Slew/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
test -f $(distdir)/$$file \

10
Time/Makefile.in
View file

@ -79,12 +79,12 @@ libTime_la_SOURCES = \
fg_timer.c \
sunpos.c
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../Src/Include/config.h
CONFIG_HEADER = ../../Simulator/Include/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Src/Include
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
@ -116,7 +116,7 @@ all: Makefile $(LTLIBRARIES)
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .s
$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu Src/Time/Makefile
cd $(top_srcdir) && $(AUTOMAKE) --gnu Simulator/Time/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
@ -210,14 +210,14 @@ maintainer-clean-tags:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = Src/Time
subdir = Simulator/Time
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Src/Time/Makefile
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Simulator/Time/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
test -f $(distdir)/$$file \

10
Weather/Makefile.in
View file

@ -76,12 +76,12 @@ lib_LTLIBRARIES = libWeather.la
libWeather_la_SOURCES = \
weather.c
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../Src/Include/config.h
CONFIG_HEADER = ../../Simulator/Include/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Src/Include
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
@ -112,7 +112,7 @@ all: Makefile $(LTLIBRARIES)
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .s
$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu Src/Weather/Makefile
cd $(top_srcdir) && $(AUTOMAKE) --gnu Simulator/Weather/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
@ -206,14 +206,14 @@ maintainer-clean-tags:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = Src/Weather
subdir = Simulator/Weather
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Src/Weather/Makefile
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Simulator/Weather/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
test -f $(distdir)/$$file \