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

diff --git a/Aircraft/Makefile.am b/Aircraft/Makefile.am
index 6b9da13786fa21e5527018349c45a7a9db9c72a4..39f53eb0256412b3666263b26ed30160554aae7c 100644 (file)
--- 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 3e84e160fd357871b01ad6876b8fdb506ff96f49..9e17dcef7b75d41883e9a50780d35a42a1a12f30 100644 (file)
--- 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 0863e4d903b40f6e160305aafba8136e3684227c..e9d12c06531545d718476cdb9175350a8067b389 100644 (file)
--- 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 d645c8e21d1e4453eaf2900faf3156cf70369563..9b9348cb296803a7d79aa8c151159c041f7ce2e9 100644 (file)
--- 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 a62b646897821bc31877a9d2822a96efb3323075..f472b9c3c39c1f660919e54b2fa73e0950fd4cd1 100644 (file)
--- 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 3c9f6a143894fff0f9ee0cd361f0cbe6c86a9368..147d2092a90a8d07e598257d2c9fa1cedddf6309 100644 (file)
--- 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 9066ab1ce81f97da62acf02a95d4329c02d40e86..20ddb97b200c3372318ead3382fb065f3455968d 100644 (file)
--- a/Cockpit/cockpit.c
+++ b/Cockpit/cockpit.c
@@ -24,6 +24,12 @@
  **************************************************************************/
 
 
+#include <config.h>
+
+#ifdef HAVE_WINDOWS_H          
+#  include <windows.h>
+#endif
+
 #include <GL/glut.h>
 
 #include <stdlib.h>
@@ -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
  * <chotchkiss@namg.us.anritsu.com>

diff --git a/Controls/Makefile.am b/Controls/Makefile.am
index 79d5629ac4f1798e528ecb8ff8cc799f7e636b10..83d27869bc914fab6926963ed9771e08dd81171f 100644 (file)
--- 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 bd6cdfa9c1c7d87a14c3efa46e7656d73d8c3b06..bec366224017299b26928ca62102ee87ffbc78e6 100644 (file)
--- 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 5f2670a22d7444c7abb09370a0f370368ecd036e..187049f228094e235bfecf44415d647bb0a1a465 100644 (file)
--- 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 1a01b6afbbe1973c0e9212a5a73d3285151af840..164c0ac6d1a08eaf0bfaace02fc2f3f3ea022dfb 100644 (file)
--- 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 d01f0b0f659e1ac6a4da0c748ee90145291c884e..7c208f697df00336899ae7cbadc81d008966af7c 100644 (file)
--- 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 7af7b9351fb361b2deb7399bdeb87cc051f1ec2b..aa73b6b9d31f01bdc53da95db4f29e2be23211f4 100644 (file)
--- 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 9977377bda28e6e3dc12570de99ee7098ba7e67a..4b9981a7a6217fe28404ed66691d624fb0b6e6e1 100644 (file)
--- 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 3a6c4f11d44328d08bdcc441f13ff497cbf0263b..a5912d976d38ef873a0b0f7bf0b0701b145afb6e 100644 (file)
--- 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 7ea058584f0176f04e8181312fcd621e4511673f..fadd161c96f456063487f4d8ad6a9795d4f1dde9 100644 (file)
--- 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 4bdb9ecc664bcab67731e300c1b0b804076630d4..c4f45f80b0ab6f76675163904bb9a730670f3a76 100644 (file)
--- 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 ce7c73b0592b135012e4df45fd40e11d24c93db5..dfb3f2606bfb5c677822233459db28e732046cf7 100644 (file)
--- a/Scenery/tilecache.c
+++ b/Scenery/tilecache.c
@@ -34,9 +34,10 @@
 #include <XGL/xgl.h>
 
 #include <Include/general.h>
+
+#include <Bucket/bucketutils.h>
 #include <Main/fg_debug.h>
 #include <Main/views.h>
-#include <Scenery/Bucket/bucketutils.h>
 #include <Scenery/obj.h>
 #include <Scenery/tilecache.h>
 
@@ -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 7c6c69e96dfdf2f07652962a9785a0597c2c4a40..1b4cd7eaf977455778a36fbf56b6868f78153a78 100644 (file)
--- a/Scenery/tilecache.h
+++ b/Scenery/tilecache.h
@@ -37,7 +37,7 @@
 #include <GL/glut.h>
 #include <XGL/xgl.h>
 
-#include <Scenery/Bucket/bucketutils.h>
+#include <Bucket/bucketutils.h>
 #include <Include/fg_types.h>
 
 /* 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 e9437b954dc6baf8d60e05fd1b3e4920742d7267..aa68fd90f42b2b1d9a383b785a1a60edf36d3e65 100644 (file)
--- a/Scenery/tilemgr.c
+++ b/Scenery/tilemgr.c
@@ -35,11 +35,11 @@
 #include <XGL/xgl.h>
 
 #include <Scenery/scenery.h>
-#include <Scenery/Bucket/bucketutils.h>
 #include <Scenery/obj.h>
 #include <Scenery/tilecache.h>
 
 #include <Aircraft/aircraft.h>
+#include <Bucket/bucketutils.h>
 #include <Include/fg_constants.h>
 #include <Include/fg_types.h>
 #include <Main/fg_debug.h>
@@ -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 6cb1e3655dd35ce5c6c8e9272170cd91602f0752..e356c9e4e547bf63e5c9bb53abb2eb291aafcd0a 100644 (file)
--- 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 f65c634f41fc73705800a56950af33f05bca51af..698409d7d81aeda84005676c73b6f5b6cbf4d4ce 100644 (file)
--- 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 aed4990ce849c18db7780110e49463e1cc7d45cb..570ff85a99785b0230213d7ff1e48a5f69dce2ea 100644 (file)
--- 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 e2023ee781dccc9353f0d5078c6ce9b2982b38a1..e433f39176bff18474f57d1633ff58de9337add3 100644 (file)
--- 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 fee9f8caa0758d2ba3f26243c892eee579ac9a88..146ff1acb948d957ad922bc8688d45ddc9919dbe 100644 (file)
--- 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 8bb21507c93411beb88bee90917fb6c207f620bc..4813d0513cba70af3c7a5786c78351f0b93f73be 100644 (file)
--- 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 a69884293149855a236738a48345cd71b43d8fe7..1c971b75e897178cff1b5fbb4b4f229f981be2b9 100644 (file)
--- 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 33fc202846dc653699e9434d75eaa94cb0382fb6..fdbf8d500a230135a0cea568d5b5affa73890d36 100644 (file)
--- 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.