fly/flightgear
1
0
Fork 0
Code Activity

Code reorganizations. Added a Lib/ directory for more general libraries.

Browse source
This commit is contained in:
curt 1998-04-14 02:23:04 +00:00
parent 27ac2e344e
commit ab59ca78b9
28 changed files with 112 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Aircraft/Makefile.am
View file

@ -3,4 +3,4 @@ libdir = ${exec_prefix}/lib
lib_LTLIBRARIES = libAircraft.la lib_LTLIBRARIES = libAircraft.la
libAircraft_la_SOURCES = aircraft.c aircraft.h libAircraft_la_SOURCES = aircraft.c aircraft.h
INCLUDES += -I.. INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator

6
Aircraft/Makefile.in
View file

@ -75,12 +75,12 @@ libdir = ${exec_prefix}/lib
lib_LTLIBRARIES = libAircraft.la lib_LTLIBRARIES = libAircraft.la
libAircraft_la_SOURCES = aircraft.c aircraft.h libAircraft_la_SOURCES = aircraft.c aircraft.h
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../Simulator/Include/config.h CONFIG_HEADER = ../../Include/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES) LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
@ -311,7 +311,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean maintainer-clean-generic clean mostlyclean distclean maintainer-clean
INCLUDES += -I.. INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator
# Tell versions [3.59,3.63) of GNU make to not export all variables. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.

2
Astro/Makefile.am
View file

@ -9,4 +9,4 @@ libAstro_la_SOURCES = \
stars.c stars.h \ stars.c stars.h \
sun.c sun.h sun.c sun.h
INCLUDES += -I.. INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator

6
Astro/Makefile.in
View file

@ -81,12 +81,12 @@ libAstro_la_SOURCES = \
stars.c stars.h \ stars.c stars.h \
sun.c sun.h sun.c sun.h
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../Simulator/Include/config.h CONFIG_HEADER = ../../Include/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES) LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
@ -319,7 +319,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean maintainer-clean-generic clean mostlyclean distclean maintainer-clean
INCLUDES += -I.. 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. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.

2
Cockpit/Makefile.am
View file

@ -5,4 +5,4 @@ libCockpit_la_SOURCES = \
cockpit.c cockpit.h \ cockpit.c cockpit.h \
hud.c hud.h hud.c hud.h
INCLUDES += -I.. INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator

6
Cockpit/Makefile.in
View file

@ -77,12 +77,12 @@ libCockpit_la_SOURCES = \
cockpit.c cockpit.h \ cockpit.c cockpit.h \
hud.c hud.h hud.c hud.h
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../Simulator/Include/config.h CONFIG_HEADER = ../../Include/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES) LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
@ -313,7 +313,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean maintainer-clean-generic clean mostlyclean distclean maintainer-clean
INCLUDES += -I.. INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator
# Tell versions [3.59,3.63) of GNU make to not export all variables. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.

13
Cockpit/cockpit.c
View file

@ -24,6 +24,12 @@
**************************************************************************/ **************************************************************************/
#include <config.h>
#ifdef HAVE_WINDOWS_H
# include <windows.h>
#endif
#include <GL/glut.h> #include <GL/glut.h>
#include <stdlib.h> #include <stdlib.h>
@ -96,9 +102,12 @@ void fgCockpitUpdate( void )
/* $Log$ /* $Log$
/* Revision 1.11 1998/03/14 00:32:13 curt /* Revision 1.12 1998/04/14 02:23:09 curt
/* Changed a printf() to a fgPrintf(). /* 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().
*
* Revision 1.10 1998/02/07 15:29:33 curt * Revision 1.10 1998/02/07 15:29:33 curt
* Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
* <chotchkiss@namg.us.anritsu.com> * <chotchkiss@namg.us.anritsu.com>

2
Controls/Makefile.am
View file

@ -4,4 +4,4 @@ lib_LTLIBRARIES = libControls.la
libControls_la_SOURCES = controls.c controls.h libControls_la_SOURCES = controls.c controls.h
INCLUDES += -I.. INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator

6
Controls/Makefile.in
View file

@ -76,12 +76,12 @@ lib_LTLIBRARIES = libControls.la
libControls_la_SOURCES = controls.c controls.h libControls_la_SOURCES = controls.c controls.h
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../Simulator/Include/config.h CONFIG_HEADER = ../../Include/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES) LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
@ -312,7 +312,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean maintainer-clean-generic clean mostlyclean distclean maintainer-clean
INCLUDES += -I.. INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator
# Tell versions [3.59,3.63) of GNU make to not export all variables. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.

2
FDM/Makefile.am
View file

@ -6,4 +6,4 @@ lib_LTLIBRARIES = libFlight.la
libFlight_la_SOURCES = flight.c flight.h libFlight_la_SOURCES = flight.c flight.h
INCLUDES += -I.. INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator

6
FDM/Makefile.in
View file

@ -78,12 +78,12 @@ lib_LTLIBRARIES = libFlight.la
libFlight_la_SOURCES = flight.c flight.h libFlight_la_SOURCES = flight.c flight.h
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../Simulator/Include/config.h CONFIG_HEADER = ../../Include/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES) LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
@ -383,7 +383,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean maintainer-clean-generic clean mostlyclean distclean maintainer-clean
INCLUDES += -I.. INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator
# Tell versions [3.59,3.63) of GNU make to not export all variables. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.

2
Joystick/Makefile.am
View file

@ -4,4 +4,4 @@ lib_LTLIBRARIES = libJoystick.la
libJoystick_la_SOURCES = joystick.c joystick.h libJoystick_la_SOURCES = joystick.c joystick.h
INCLUDES += -I.. INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator

6
Joystick/Makefile.in
View file

@ -76,12 +76,12 @@ lib_LTLIBRARIES = libJoystick.la
libJoystick_la_SOURCES = joystick.c joystick.h libJoystick_la_SOURCES = joystick.c joystick.h
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../Simulator/Include/config.h CONFIG_HEADER = ../../Include/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES) LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
@ -312,7 +312,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean maintainer-clean-generic clean mostlyclean distclean maintainer-clean
INCLUDES += -I.. INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator
# Tell versions [3.59,3.63) of GNU make to not export all variables. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.

2
LaRCsim/Makefile.am
View file

@ -20,4 +20,4 @@ libLaRCsim_la_SOURCES = \
navion_init.c navion_init.h \ navion_init.c navion_init.h \
ls_interface.c ls_interface.h ls_interface.c ls_interface.h
INCLUDES += -I../.. INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator

6
LaRCsim/Makefile.in
View file

@ -92,12 +92,12 @@ libLaRCsim_la_SOURCES = \
navion_init.c navion_init.h \ navion_init.c navion_init.h \
ls_interface.c ls_interface.h ls_interface.c ls_interface.h
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../../Simulator/Include/config.h CONFIG_HEADER = ../../../Include/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES) LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../../Simulator/Include DEFS = @DEFS@ -I. -I$(srcdir) -I../../../Include
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
@ -335,7 +335,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean maintainer-clean-generic clean mostlyclean distclean maintainer-clean
INCLUDES += -I../.. INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator
# Tell versions [3.59,3.63) of GNU make to not export all variables. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.

7
Scenery/Makefile.am
View file

@ -1,5 +1,3 @@
SUBDIRS = Bucket
libdir = ${exec_prefix}/lib libdir = ${exec_prefix}/lib
lib_LTLIBRARIES = libScenery.la lib_LTLIBRARIES = libScenery.la
@ -11,4 +9,7 @@ libScenery_la_SOURCES = \
tilecache.c tilecache.h \ tilecache.c tilecache.h \
tilemgr.c tilemgr.h tilemgr.c tilemgr.h
INCLUDES += -I.. INCLUDES += \
-I$(top_builddir) \
-I$(top_builddir)/Lib \
-I$(top_builddir)/Simulator

130
Scenery/Makefile.in
View file

@ -70,8 +70,6 @@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
VERSION = @VERSION@ VERSION = @VERSION@
SUBDIRS = Bucket
libdir = ${exec_prefix}/lib libdir = ${exec_prefix}/lib
lib_LTLIBRARIES = libScenery.la lib_LTLIBRARIES = libScenery.la
@ -83,12 +81,12 @@ libScenery_la_SOURCES = \
tilecache.c tilecache.h \ tilecache.c tilecache.h \
tilemgr.c tilemgr.h tilemgr.c tilemgr.h
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../Simulator/Include/config.h CONFIG_HEADER = ../../Include/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES) LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
@ -116,7 +114,7 @@ DEP_FILES = .deps/obj.P .deps/scenery.P .deps/texload.P \
SOURCES = $(libScenery_la_SOURCES) SOURCES = $(libScenery_la_SOURCES)
OBJECTS = $(libScenery_la_OBJECTS) OBJECTS = $(libScenery_la_OBJECTS)
all: all-recursive all-am all: Makefile $(LTLIBRARIES)
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .S .c .lo .o .s .SUFFIXES: .S .c .lo .o .s
@ -188,55 +186,15 @@ maintainer-clean-libtool:
libScenery.la: $(libScenery_la_OBJECTS) $(libScenery_la_DEPENDENCIES) libScenery.la: $(libScenery_la_OBJECTS) $(libScenery_la_DEPENDENCIES)
$(LINK) -rpath $(libdir) $(libScenery_la_LDFLAGS) $(libScenery_la_OBJECTS) $(libScenery_la_LIBADD) $(LIBS) $(LINK) -rpath $(libdir) $(libScenery_la_LDFLAGS) $(libScenery_la_OBJECTS) $(libScenery_la_LIBADD) $(LIBS)
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
# (1) if the variable is set in `config.status', edit `config.status'
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
@SET_MAKE@
all-recursive install-data-recursive install-exec-recursive \
installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive info-recursive dvi-recursive:
@set fnord $(MAKEFLAGS); amf=$$2; \
list='$(SUBDIRS)'; for subdir in $$list; do \
target=`echo $@ | sed s/-recursive//`; \
echo "Making $$target in $$subdir"; \
(cd $$subdir && $(MAKE) $$target) \
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
done && test -z "$$fail"
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@set fnord $(MAKEFLAGS); amf=$$2; \
rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
rev="$$subdir $$rev"; \
done; \
for subdir in $$rev; do \
target=`echo $@ | sed s/-recursive//`; \
echo "Making $$target in $$subdir"; \
(cd $$subdir && $(MAKE) $$target) \
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
(cd $$subdir && $(MAKE) tags); \
done
tags: TAGS tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) ID: $(HEADERS) $(SOURCES) $(LISP)
here=`pwd` && cd $(srcdir) \ here=`pwd` && cd $(srcdir) \
&& mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
tags=; \ tags=; \
here=`pwd`; \ here=`pwd`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
done; \
list='$(SOURCES) $(HEADERS)'; \ list='$(SOURCES) $(HEADERS)'; \
unique=`for i in $$list; do echo $$i; done | \ unique=`for i in $$list; do echo $$i; done | \
awk ' { files[$$0] = 1; } \ awk ' { files[$$0] = 1; } \
@ -269,14 +227,6 @@ distdir: $(DISTFILES)
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
|| cp -p $$d/$$file $(distdir)/$$file; \ || cp -p $$d/$$file $(distdir)/$$file; \
done done
for subdir in $(SUBDIRS); do \
test -d $(distdir)/$$subdir \
|| mkdir $(distdir)/$$subdir \
|| exit 1; \
chmod 777 $(distdir)/$$subdir; \
(cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
|| exit 1; \
done
DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
@ -301,31 +251,25 @@ maintainer-clean-depend:
@-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \ @-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \
< .deps/$(*F).p > .deps/$(*F).P < .deps/$(*F).p > .deps/$(*F).P
@-rm -f .deps/$(*F).p @-rm -f .deps/$(*F).p
info: info-recursive info:
dvi: dvi-recursive dvi:
check: all-am check: all
$(MAKE) check-recursive $(MAKE)
installcheck: installcheck-recursive installcheck:
all-am: Makefile $(LTLIBRARIES) install-exec: install-libLTLIBRARIES
install-exec-am: install-libLTLIBRARIES
uninstall-am: uninstall-libLTLIBRARIES
install-exec: install-exec-recursive install-exec-am
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
install-data: install-data-recursive install-data:
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
install: install-recursive install-exec-am install: install-exec install-data all
@: @:
uninstall: uninstall-recursive uninstall-am uninstall: uninstall-libLTLIBRARIES
install-strip: install-strip:
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
installdirs: installdirs-recursive installdirs:
$(mkinstalldirs) $(DATADIR)$(libdir) $(mkinstalldirs) $(DATADIR)$(libdir)
@ -343,31 +287,22 @@ distclean-generic:
maintainer-clean-generic: maintainer-clean-generic:
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \ mostlyclean: mostlyclean-libLTLIBRARIES mostlyclean-compile \
mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
mostlyclean-generic mostlyclean-generic
clean-am: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \ clean: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \
clean-depend clean-generic mostlyclean-am clean-depend clean-generic mostlyclean
distclean-am: distclean-libLTLIBRARIES distclean-compile \ distclean: distclean-libLTLIBRARIES distclean-compile distclean-libtool \
distclean-libtool distclean-tags distclean-depend \ distclean-tags distclean-depend distclean-generic clean
distclean-generic clean-am
maintainer-clean-am: maintainer-clean-libLTLIBRARIES \
maintainer-clean-compile maintainer-clean-libtool \
maintainer-clean-tags maintainer-clean-depend \
maintainer-clean-generic distclean-am
mostlyclean: mostlyclean-recursive mostlyclean-am
clean: clean-recursive clean-am
distclean: distclean-recursive distclean-am
-rm -f config.status -rm -f config.status
-rm -f libtool -rm -f libtool
maintainer-clean: maintainer-clean-recursive maintainer-clean-am maintainer-clean: maintainer-clean-libLTLIBRARIES \
maintainer-clean-compile maintainer-clean-libtool \
maintainer-clean-tags maintainer-clean-depend \
maintainer-clean-generic distclean
@echo "This command is intended for maintainers to use;" @echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
@ -376,21 +311,18 @@ clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \ uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
distclean-compile clean-compile maintainer-clean-compile \ distclean-compile clean-compile maintainer-clean-compile \
mostlyclean-libtool distclean-libtool clean-libtool \ mostlyclean-libtool distclean-libtool clean-libtool \
maintainer-clean-libtool install-data-recursive \ maintainer-clean-libtool tags mostlyclean-tags distclean-tags \
uninstall-data-recursive install-exec-recursive \ clean-tags maintainer-clean-tags distdir mostlyclean-depend \
uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ distclean-depend clean-depend maintainer-clean-depend info dvi \
all-recursive check-recursive installcheck-recursive info-recursive \ installcheck install-exec install-data install uninstall all \
dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
distclean-tags clean-tags maintainer-clean-tags distdir \
mostlyclean-depend distclean-depend clean-depend \
maintainer-clean-depend info dvi installcheck all-am install-exec-am \
uninstall-am install-exec install-data install uninstall all \
installdirs mostlyclean-generic distclean-generic clean-generic \ installdirs mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean maintainer-clean-generic clean mostlyclean distclean maintainer-clean
INCLUDES += -I.. 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. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.

10
Scenery/tilecache.c
View file

@ -34,9 +34,10 @@
#include <XGL/xgl.h> #include <XGL/xgl.h>
#include <Include/general.h> #include <Include/general.h>
#include <Bucket/bucketutils.h>
#include <Main/fg_debug.h> #include <Main/fg_debug.h>
#include <Main/views.h> #include <Main/views.h>
#include <Scenery/Bucket/bucketutils.h>
#include <Scenery/obj.h> #include <Scenery/obj.h>
#include <Scenery/tilecache.h> #include <Scenery/tilecache.h>
@ -196,9 +197,12 @@ int fgTileCacheNextAvail( void ) {
/* $Log$ /* $Log$
/* Revision 1.9 1998/04/08 23:30:07 curt /* Revision 1.10 1998/04/14 02:23:17 curt
/* Adopted Gnu automake/autoconf system. /* 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.
*
* Revision 1.8 1998/04/03 22:11:38 curt * Revision 1.8 1998/04/03 22:11:38 curt
* Converting to Gnu autoconf system. * Converting to Gnu autoconf system.
* *

9
Scenery/tilecache.h
View file

@ -37,7 +37,7 @@
#include <GL/glut.h> #include <GL/glut.h>
#include <XGL/xgl.h> #include <XGL/xgl.h>
#include <Scenery/Bucket/bucketutils.h> #include <Bucket/bucketutils.h>
#include <Include/fg_types.h> #include <Include/fg_types.h>
/* For best results ... i.e. to avoid tile load problems and blank areas /* For best results ... i.e. to avoid tile load problems and blank areas
@ -81,9 +81,12 @@ void fgTileCacheEntryInfo( int index, GLint *display_list,
/* $Log$ /* $Log$
/* Revision 1.8 1998/04/08 23:30:08 curt /* Revision 1.9 1998/04/14 02:23:17 curt
/* Adopted Gnu automake/autoconf system. /* Code reorganizations. Added a Lib/ directory for more general libraries.
/* /*
* Revision 1.8 1998/04/08 23:30:08 curt
* Adopted Gnu automake/autoconf system.
*
* Revision 1.7 1998/04/03 22:11:38 curt * Revision 1.7 1998/04/03 22:11:38 curt
* Converting to Gnu autoconf system. * Converting to Gnu autoconf system.
* *

9
Scenery/tilemgr.c
View file

@ -35,11 +35,11 @@
#include <XGL/xgl.h> #include <XGL/xgl.h>
#include <Scenery/scenery.h> #include <Scenery/scenery.h>
#include <Scenery/Bucket/bucketutils.h>
#include <Scenery/obj.h> #include <Scenery/obj.h>
#include <Scenery/tilecache.h> #include <Scenery/tilecache.h>
#include <Aircraft/aircraft.h> #include <Aircraft/aircraft.h>
#include <Bucket/bucketutils.h>
#include <Include/fg_constants.h> #include <Include/fg_constants.h>
#include <Include/fg_types.h> #include <Include/fg_types.h>
#include <Main/fg_debug.h> #include <Main/fg_debug.h>
@ -219,9 +219,12 @@ void fgTileMgrRender( void ) {
/* $Log$ /* $Log$
/* Revision 1.23 1998/04/08 23:30:08 curt /* Revision 1.24 1998/04/14 02:23:18 curt
/* Adopted Gnu automake/autoconf system. /* 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.
*
* Revision 1.22 1998/04/03 22:11:38 curt * Revision 1.22 1998/04/03 22:11:38 curt
* Converting to Gnu autoconf system. * Converting to Gnu autoconf system.
* *

8
Simulator/Makefile.am
View file

@ -1,15 +1,13 @@
SUBDIRS = \
# Place Include last to get 'distclean' do the correct thing Aircraft \
SUBDIRS = Aircraft \
Astro \ Astro \
Autopilot \
Cockpit \ Cockpit \
Controls \ Controls \
Flight \ Flight \
Include \
Joystick \ Joystick \
Math \ Math \
Scenery \ Scenery \
Time \ Time \
Weather \ Weather \
XGL \
Main Main

10
Simulator/Makefile.in
View file

@ -10,8 +10,6 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE. # PARTICULAR PURPOSE.
# Place Include last to get 'distclean' do the correct thing
SHELL = /bin/sh SHELL = /bin/sh
@ -73,21 +71,21 @@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
VERSION = @VERSION@ VERSION = @VERSION@
SUBDIRS = Aircraft \ SUBDIRS = \
Aircraft \
Astro \ Astro \
Autopilot \
Cockpit \ Cockpit \
Controls \ Controls \
Flight \ Flight \
Include \
Joystick \ Joystick \
Math \ Math \
Scenery \ Scenery \
Time \ Time \
Weather \ Weather \
XGL \
Main Main
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../Simulator/Include/config.h CONFIG_HEADER = ../Include/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
DIST_COMMON = Makefile.am Makefile.in DIST_COMMON = Makefile.am Makefile.in

2
Slew/Makefile.am
View file

@ -4,4 +4,4 @@ lib_LTLIBRARIES = libSlew.la
libSlew_la_SOURCES = slew.c slew.h libSlew_la_SOURCES = slew.c slew.h
INCLUDES += -I../.. INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator

6
Slew/Makefile.in
View file

@ -76,12 +76,12 @@ lib_LTLIBRARIES = libSlew.la
libSlew_la_SOURCES = slew.c slew.h libSlew_la_SOURCES = slew.c slew.h
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../../Simulator/Include/config.h CONFIG_HEADER = ../../../Include/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES) LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../../Simulator/Include DEFS = @DEFS@ -I. -I$(srcdir) -I../../../Include
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
@ -312,7 +312,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean maintainer-clean-generic clean mostlyclean distclean maintainer-clean
INCLUDES += -I../.. INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator
# Tell versions [3.59,3.63) of GNU make to not export all variables. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.

2
Time/Makefile.am
View file

@ -8,4 +8,4 @@ libTime_la_SOURCES = \
fg_timer.c fg_timer.h \ fg_timer.c fg_timer.h \
sunpos.c sunpos.h sunpos.c sunpos.h
INCLUDES += -I.. INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator

6
Time/Makefile.in
View file

@ -80,12 +80,12 @@ libTime_la_SOURCES = \
fg_timer.c fg_timer.h \ fg_timer.c fg_timer.h \
sunpos.c sunpos.h sunpos.c sunpos.h
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../Simulator/Include/config.h CONFIG_HEADER = ../../Include/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES) LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
@ -317,7 +317,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean maintainer-clean-generic clean mostlyclean distclean maintainer-clean
INCLUDES += -I.. INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator
# Tell versions [3.59,3.63) of GNU make to not export all variables. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.

2
Weather/Makefile.am
View file

@ -4,4 +4,4 @@ lib_LTLIBRARIES = libWeather.la
libWeather_la_SOURCES = weather.c weather.h libWeather_la_SOURCES = weather.c weather.h
INCLUDES += -I.. INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator

6
Weather/Makefile.in
View file

@ -76,12 +76,12 @@ lib_LTLIBRARIES = libWeather.la
libWeather_la_SOURCES = weather.c weather.h libWeather_la_SOURCES = weather.c weather.h
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../Simulator/Include/config.h CONFIG_HEADER = ../../Include/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES) LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
@ -312,7 +312,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean maintainer-clean-generic clean mostlyclean distclean maintainer-clean
INCLUDES += -I.. INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator
# Tell versions [3.59,3.63) of GNU make to not export all variables. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.