From ab59ca78b9d7fda79fc993092f56235cec6cf59a Mon Sep 17 00:00:00 2001 From: curt Date: Tue, 14 Apr 1998 02:23:04 +0000 Subject: [PATCH] Code reorganizations. Added a Lib/ directory for more general libraries. --- Aircraft/Makefile.am | 2 +- Aircraft/Makefile.in | 6 +- Astro/Makefile.am | 2 +- Astro/Makefile.in | 6 +- Cockpit/Makefile.am | 2 +- Cockpit/Makefile.in | 6 +- Cockpit/cockpit.c | 13 ++++- Controls/Makefile.am | 2 +- Controls/Makefile.in | 6 +- FDM/Makefile.am | 2 +- FDM/Makefile.in | 6 +- Joystick/Makefile.am | 2 +- Joystick/Makefile.in | 6 +- LaRCsim/Makefile.am | 2 +- LaRCsim/Makefile.in | 6 +- Scenery/Makefile.am | 7 ++- Scenery/Makefile.in | 130 ++++++++++-------------------------------- Scenery/tilecache.c | 10 +++- Scenery/tilecache.h | 9 ++- Scenery/tilemgr.c | 9 ++- Simulator/Makefile.am | 8 +-- Simulator/Makefile.in | 10 ++-- Slew/Makefile.am | 2 +- Slew/Makefile.in | 6 +- Time/Makefile.am | 2 +- Time/Makefile.in | 6 +- Weather/Makefile.am | 2 +- Weather/Makefile.in | 6 +- 28 files changed, 112 insertions(+), 164 deletions(-) diff --git a/Aircraft/Makefile.am b/Aircraft/Makefile.am index 6b9da1378..39f53eb02 100644 --- a/Aircraft/Makefile.am +++ b/Aircraft/Makefile.am @@ -3,4 +3,4 @@ libdir = ${exec_prefix}/lib lib_LTLIBRARIES = libAircraft.la libAircraft_la_SOURCES = aircraft.c aircraft.h -INCLUDES += -I.. +INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator diff --git a/Aircraft/Makefile.in b/Aircraft/Makefile.in index 3e84e160f..9e17dcef7 100644 --- a/Aircraft/Makefile.in +++ b/Aircraft/Makefile.in @@ -75,12 +75,12 @@ libdir = ${exec_prefix}/lib lib_LTLIBRARIES = libAircraft.la libAircraft_la_SOURCES = aircraft.c aircraft.h mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../Simulator/Include/config.h +CONFIG_HEADER = ../../Include/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include +DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -311,7 +311,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \ 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. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Astro/Makefile.am b/Astro/Makefile.am index 0863e4d90..e9d12c065 100644 --- a/Astro/Makefile.am +++ b/Astro/Makefile.am @@ -9,4 +9,4 @@ libAstro_la_SOURCES = \ stars.c stars.h \ sun.c sun.h -INCLUDES += -I.. +INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator diff --git a/Astro/Makefile.in b/Astro/Makefile.in index d645c8e21..9b9348cb2 100644 --- a/Astro/Makefile.in +++ b/Astro/Makefile.in @@ -81,12 +81,12 @@ libAstro_la_SOURCES = \ stars.c stars.h \ sun.c sun.h mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../Simulator/Include/config.h +CONFIG_HEADER = ../../Include/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include +DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -319,7 +319,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \ 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. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Cockpit/Makefile.am b/Cockpit/Makefile.am index a62b64689..f472b9c3c 100644 --- a/Cockpit/Makefile.am +++ b/Cockpit/Makefile.am @@ -5,4 +5,4 @@ libCockpit_la_SOURCES = \ cockpit.c cockpit.h \ hud.c hud.h -INCLUDES += -I.. +INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator diff --git a/Cockpit/Makefile.in b/Cockpit/Makefile.in index 3c9f6a143..147d2092a 100644 --- a/Cockpit/Makefile.in +++ b/Cockpit/Makefile.in @@ -77,12 +77,12 @@ libCockpit_la_SOURCES = \ cockpit.c cockpit.h \ hud.c hud.h mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../Simulator/Include/config.h +CONFIG_HEADER = ../../Include/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include +DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -313,7 +313,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \ 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. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Cockpit/cockpit.c b/Cockpit/cockpit.c index 9066ab1ce..20ddb97b2 100644 --- a/Cockpit/cockpit.c +++ b/Cockpit/cockpit.c @@ -24,6 +24,12 @@ **************************************************************************/ +#include + +#ifdef HAVE_WINDOWS_H +# include +#endif + #include #include @@ -96,9 +102,12 @@ void fgCockpitUpdate( void ) /* $Log$ -/* Revision 1.11 1998/03/14 00:32:13 curt -/* Changed a printf() to a fgPrintf(). +/* Revision 1.12 1998/04/14 02:23:09 curt +/* 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 * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss * diff --git a/Controls/Makefile.am b/Controls/Makefile.am index 79d5629ac..83d27869b 100644 --- a/Controls/Makefile.am +++ b/Controls/Makefile.am @@ -4,4 +4,4 @@ lib_LTLIBRARIES = libControls.la libControls_la_SOURCES = controls.c controls.h -INCLUDES += -I.. +INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator diff --git a/Controls/Makefile.in b/Controls/Makefile.in index bd6cdfa9c..bec366224 100644 --- a/Controls/Makefile.in +++ b/Controls/Makefile.in @@ -76,12 +76,12 @@ lib_LTLIBRARIES = libControls.la libControls_la_SOURCES = controls.c controls.h mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../Simulator/Include/config.h +CONFIG_HEADER = ../../Include/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include +DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -312,7 +312,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \ 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. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/FDM/Makefile.am b/FDM/Makefile.am index 5f2670a22..187049f22 100644 --- a/FDM/Makefile.am +++ b/FDM/Makefile.am @@ -6,4 +6,4 @@ lib_LTLIBRARIES = libFlight.la libFlight_la_SOURCES = flight.c flight.h -INCLUDES += -I.. +INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator diff --git a/FDM/Makefile.in b/FDM/Makefile.in index 1a01b6afb..164c0ac6d 100644 --- a/FDM/Makefile.in +++ b/FDM/Makefile.in @@ -78,12 +78,12 @@ lib_LTLIBRARIES = libFlight.la libFlight_la_SOURCES = flight.c flight.h mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../Simulator/Include/config.h +CONFIG_HEADER = ../../Include/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include +DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -383,7 +383,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \ 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. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Joystick/Makefile.am b/Joystick/Makefile.am index d01f0b0f6..7c208f697 100644 --- a/Joystick/Makefile.am +++ b/Joystick/Makefile.am @@ -4,4 +4,4 @@ lib_LTLIBRARIES = libJoystick.la libJoystick_la_SOURCES = joystick.c joystick.h -INCLUDES += -I.. +INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator diff --git a/Joystick/Makefile.in b/Joystick/Makefile.in index 7af7b9351..aa73b6b9d 100644 --- a/Joystick/Makefile.in +++ b/Joystick/Makefile.in @@ -76,12 +76,12 @@ lib_LTLIBRARIES = libJoystick.la libJoystick_la_SOURCES = joystick.c joystick.h mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../Simulator/Include/config.h +CONFIG_HEADER = ../../Include/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include +DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -312,7 +312,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \ 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. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/LaRCsim/Makefile.am b/LaRCsim/Makefile.am index 9977377bd..4b9981a7a 100644 --- a/LaRCsim/Makefile.am +++ b/LaRCsim/Makefile.am @@ -20,4 +20,4 @@ libLaRCsim_la_SOURCES = \ navion_init.c navion_init.h \ ls_interface.c ls_interface.h -INCLUDES += -I../.. +INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator diff --git a/LaRCsim/Makefile.in b/LaRCsim/Makefile.in index 3a6c4f11d..a5912d976 100644 --- a/LaRCsim/Makefile.in +++ b/LaRCsim/Makefile.in @@ -92,12 +92,12 @@ libLaRCsim_la_SOURCES = \ navion_init.c navion_init.h \ ls_interface.c ls_interface.h mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../../Simulator/Include/config.h +CONFIG_HEADER = ../../../Include/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -DEFS = @DEFS@ -I. -I$(srcdir) -I../../../Simulator/Include +DEFS = @DEFS@ -I. -I$(srcdir) -I../../../Include CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -335,7 +335,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \ 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. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Scenery/Makefile.am b/Scenery/Makefile.am index 7ea058584..fadd161c9 100644 --- a/Scenery/Makefile.am +++ b/Scenery/Makefile.am @@ -1,5 +1,3 @@ -SUBDIRS = Bucket - libdir = ${exec_prefix}/lib lib_LTLIBRARIES = libScenery.la @@ -11,4 +9,7 @@ libScenery_la_SOURCES = \ tilecache.c tilecache.h \ tilemgr.c tilemgr.h -INCLUDES += -I.. +INCLUDES += \ + -I$(top_builddir) \ + -I$(top_builddir)/Lib \ + -I$(top_builddir)/Simulator diff --git a/Scenery/Makefile.in b/Scenery/Makefile.in index 4bdb9ecc6..c4f45f80b 100644 --- a/Scenery/Makefile.in +++ b/Scenery/Makefile.in @@ -70,8 +70,6 @@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ VERSION = @VERSION@ -SUBDIRS = Bucket - libdir = ${exec_prefix}/lib lib_LTLIBRARIES = libScenery.la @@ -83,12 +81,12 @@ libScenery_la_SOURCES = \ tilecache.c tilecache.h \ tilemgr.c tilemgr.h mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../Simulator/Include/config.h +CONFIG_HEADER = ../../Include/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include +DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -116,7 +114,7 @@ DEP_FILES = .deps/obj.P .deps/scenery.P .deps/texload.P \ SOURCES = $(libScenery_la_SOURCES) OBJECTS = $(libScenery_la_OBJECTS) -all: all-recursive all-am +all: Makefile $(LTLIBRARIES) .SUFFIXES: .SUFFIXES: .S .c .lo .o .s @@ -188,55 +186,15 @@ maintainer-clean-libtool: libScenery.la: $(libScenery_la_OBJECTS) $(libScenery_la_DEPENDENCIES) $(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 ID: $(HEADERS) $(SOURCES) $(LISP) here=`pwd` && cd $(srcdir) \ && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ - done; \ list='$(SOURCES) $(HEADERS)'; \ unique=`for i in $$list; do echo $$i; done | \ awk ' { files[$$0] = 1; } \ @@ -269,14 +227,6 @@ distdir: $(DISTFILES) || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ 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 || :) @@ -301,31 +251,25 @@ maintainer-clean-depend: @-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \ < .deps/$(*F).p > .deps/$(*F).P @-rm -f .deps/$(*F).p -info: info-recursive -dvi: dvi-recursive -check: all-am - $(MAKE) check-recursive -installcheck: installcheck-recursive -all-am: Makefile $(LTLIBRARIES) - -install-exec-am: install-libLTLIBRARIES - -uninstall-am: uninstall-libLTLIBRARIES - -install-exec: install-exec-recursive install-exec-am +info: +dvi: +check: all + $(MAKE) +installcheck: +install-exec: install-libLTLIBRARIES @$(NORMAL_INSTALL) -install-data: install-data-recursive +install-data: @$(NORMAL_INSTALL) -install: install-recursive install-exec-am +install: install-exec install-data all @: -uninstall: uninstall-recursive uninstall-am +uninstall: uninstall-libLTLIBRARIES install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install -installdirs: installdirs-recursive +installdirs: $(mkinstalldirs) $(DATADIR)$(libdir) @@ -343,31 +287,22 @@ distclean-generic: maintainer-clean-generic: -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -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-generic -clean-am: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \ - clean-depend clean-generic mostlyclean-am - -distclean-am: distclean-libLTLIBRARIES distclean-compile \ - distclean-libtool distclean-tags distclean-depend \ - distclean-generic clean-am +clean: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \ + clean-depend clean-generic mostlyclean -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 +distclean: distclean-libLTLIBRARIES distclean-compile distclean-libtool \ + distclean-tags distclean-depend distclean-generic clean -rm -f config.status -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 "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 \ distclean-compile clean-compile maintainer-clean-compile \ mostlyclean-libtool distclean-libtool clean-libtool \ -maintainer-clean-libtool install-data-recursive \ -uninstall-data-recursive install-exec-recursive \ -uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ -all-recursive check-recursive installcheck-recursive info-recursive \ -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 \ +maintainer-clean-libtool tags mostlyclean-tags distclean-tags \ +clean-tags maintainer-clean-tags distdir mostlyclean-depend \ +distclean-depend clean-depend maintainer-clean-depend info dvi \ +installcheck install-exec install-data install uninstall all \ installdirs mostlyclean-generic distclean-generic clean-generic \ 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. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Scenery/tilecache.c b/Scenery/tilecache.c index ce7c73b05..dfb3f2606 100644 --- a/Scenery/tilecache.c +++ b/Scenery/tilecache.c @@ -34,9 +34,10 @@ #include #include + +#include #include
#include
-#include #include #include @@ -196,9 +197,12 @@ int fgTileCacheNextAvail( void ) { /* $Log$ -/* Revision 1.9 1998/04/08 23:30:07 curt -/* Adopted Gnu automake/autoconf system. +/* Revision 1.10 1998/04/14 02:23:17 curt +/* 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 * Converting to Gnu autoconf system. * diff --git a/Scenery/tilecache.h b/Scenery/tilecache.h index 7c6c69e96..1b4cd7eaf 100644 --- a/Scenery/tilecache.h +++ b/Scenery/tilecache.h @@ -37,7 +37,7 @@ #include #include -#include +#include #include /* 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$ -/* Revision 1.8 1998/04/08 23:30:08 curt -/* Adopted Gnu automake/autoconf system. +/* Revision 1.9 1998/04/14 02:23:17 curt +/* 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 * Converting to Gnu autoconf system. * diff --git a/Scenery/tilemgr.c b/Scenery/tilemgr.c index e9437b954..aa68fd90f 100644 --- a/Scenery/tilemgr.c +++ b/Scenery/tilemgr.c @@ -35,11 +35,11 @@ #include #include -#include #include #include #include +#include #include #include #include
@@ -219,9 +219,12 @@ void fgTileMgrRender( void ) { /* $Log$ -/* Revision 1.23 1998/04/08 23:30:08 curt -/* Adopted Gnu automake/autoconf system. +/* Revision 1.24 1998/04/14 02:23:18 curt +/* 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 * Converting to Gnu autoconf system. * diff --git a/Simulator/Makefile.am b/Simulator/Makefile.am index 6cb1e3655..e356c9e4e 100644 --- a/Simulator/Makefile.am +++ b/Simulator/Makefile.am @@ -1,15 +1,13 @@ - -# Place Include last to get 'distclean' do the correct thing -SUBDIRS = Aircraft \ +SUBDIRS = \ + Aircraft \ Astro \ + Autopilot \ Cockpit \ Controls \ Flight \ - Include \ Joystick \ Math \ Scenery \ Time \ Weather \ - XGL \ Main diff --git a/Simulator/Makefile.in b/Simulator/Makefile.in index f65c634f4..698409d7d 100644 --- a/Simulator/Makefile.in +++ b/Simulator/Makefile.in @@ -10,8 +10,6 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Place Include last to get 'distclean' do the correct thing - SHELL = /bin/sh @@ -73,21 +71,21 @@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ VERSION = @VERSION@ -SUBDIRS = Aircraft \ +SUBDIRS = \ + Aircraft \ Astro \ + Autopilot \ Cockpit \ Controls \ Flight \ - Include \ Joystick \ Math \ Scenery \ Time \ Weather \ - XGL \ Main mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../Simulator/Include/config.h +CONFIG_HEADER = ../Include/config.h CONFIG_CLEAN_FILES = DIST_COMMON = Makefile.am Makefile.in diff --git a/Slew/Makefile.am b/Slew/Makefile.am index aed4990ce..570ff85a9 100644 --- a/Slew/Makefile.am +++ b/Slew/Makefile.am @@ -4,4 +4,4 @@ lib_LTLIBRARIES = libSlew.la libSlew_la_SOURCES = slew.c slew.h -INCLUDES += -I../.. +INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator diff --git a/Slew/Makefile.in b/Slew/Makefile.in index e2023ee78..e433f3917 100644 --- a/Slew/Makefile.in +++ b/Slew/Makefile.in @@ -76,12 +76,12 @@ lib_LTLIBRARIES = libSlew.la libSlew_la_SOURCES = slew.c slew.h mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../../Simulator/Include/config.h +CONFIG_HEADER = ../../../Include/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -DEFS = @DEFS@ -I. -I$(srcdir) -I../../../Simulator/Include +DEFS = @DEFS@ -I. -I$(srcdir) -I../../../Include CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -312,7 +312,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \ 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. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Time/Makefile.am b/Time/Makefile.am index fee9f8caa..146ff1acb 100644 --- a/Time/Makefile.am +++ b/Time/Makefile.am @@ -8,4 +8,4 @@ libTime_la_SOURCES = \ fg_timer.c fg_timer.h \ sunpos.c sunpos.h -INCLUDES += -I.. +INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator diff --git a/Time/Makefile.in b/Time/Makefile.in index 8bb21507c..4813d0513 100644 --- a/Time/Makefile.in +++ b/Time/Makefile.in @@ -80,12 +80,12 @@ libTime_la_SOURCES = \ fg_timer.c fg_timer.h \ sunpos.c sunpos.h mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../Simulator/Include/config.h +CONFIG_HEADER = ../../Include/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include +DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -317,7 +317,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \ 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. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Weather/Makefile.am b/Weather/Makefile.am index a69884293..1c971b75e 100644 --- a/Weather/Makefile.am +++ b/Weather/Makefile.am @@ -4,4 +4,4 @@ lib_LTLIBRARIES = libWeather.la libWeather_la_SOURCES = weather.c weather.h -INCLUDES += -I.. +INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator diff --git a/Weather/Makefile.in b/Weather/Makefile.in index 33fc20284..fdbf8d500 100644 --- a/Weather/Makefile.in +++ b/Weather/Makefile.in @@ -76,12 +76,12 @@ lib_LTLIBRARIES = libWeather.la libWeather_la_SOURCES = weather.c weather.h mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../Simulator/Include/config.h +CONFIG_HEADER = ../../Include/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include +DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -312,7 +312,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \ 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. # Otherwise a system limit (for SysV at least) may be exceeded. -- 2.39.2