More reorganization.

diff --git a/README.gpc b/README.gpc
deleted file mode 100644 (file)
index f58ba80..0000000
--- a/README.gpc
+++ /dev/null
@@ -1,75 +0,0 @@
-You need to have the GPC library installed on your system to build
-some of the scenery generation tools, otherwise you won't be able to
-create scenery.
-
-You can get the library from:
-
-    http://www.cs.man.ac.uk/aig/staff/alan/software/
-
-Unfortunately, because of some of the wording in the GPC licensing
-terms we are unable to include the GPC library with the Flight Gear
-distribution.
-
-This library comes as a single source file and header with no build
-directions.  So, here are some directions contributed by Riley Rainey
-<riley.rainey@websimulations.com> with additional notes by Curt Olson:
-
-
-1. Download the GPC library source code from URL:
-
-       http://www.cs.man.ac.uk/aig/staff/alan/software
-
-2. Unpack it; the current version seems to be 2.30:
-
-       $ zcat gpc231.tar.Z | tar xvf -
-
-3. ***IMPORTANT STEP*** ***DO NOT SKIP***
-
-   This is important step if you want to use gpc to generate quality
-   scenery!
-
-   Before building the library, edit the gpc.h file and change
-   GPC_EPSILON to something bigger.  You may experiment with this
-   value, but the following seems to work well for me:
-
-       #define GPC_EPSILON (0.000001)
-
-4. Copy in the Makefile attached to this message:
-
-       $ cp Makefile ./gpc231
-
-5. Check install paths.  Edit the Makefile and make sure the install
-   paths are satisfactory.  Also make sure that all the make commands
-   have leading tabs (i.e. that the tabs aren't expanded out into 8
-   spaces) otherwise the make will fail.
-
-6. Build and install it:
-
-       $ cd ./gpc231
-       $ make
-       $ su
-       Password:
-        # make install
-
-
--------------------------- snip ------------------------------
-
-# Unix/Linux makefile for GPC 2.31
-#
-# Riley Rainey  (riley.rainey@websimulations.com)
-
-CFLAGS = -O -g
-
-libgpc.a: gpc.o
-       rm -f $@
-       ar cr $@ $<
-       ranlib $@
-
-clean:
-       rm -f libgpc.a *.o core *~
-
-install: libgpc.a
-       -mkdir -p /usr/local/lib
-       -mkdir -p /usr/local/include
-       install libgpc.a /usr/local/lib/libgpc.a
-       install gpc.h /usr/local/include/gpc.h

diff --git a/aclocal.m4 b/aclocal.m4
index 78a4037e5c412f8cbb48479f9e8cf5998f0aad3e..df0bfb9e8f29b50a464c5d59d88df5ad05cb821c 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4
+dnl aclocal.m4 generated automatically by aclocal 1.3
 
-dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
+dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+dnl This Makefile.in is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
@@ -20,7 +20,7 @@ dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
 AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AC_PROG_INSTALL])
+[AC_REQUIRE([AM_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -30,8 +30,8 @@ if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
 fi
 ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION"))
 AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
@@ -43,6 +43,15 @@ AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
+
+# serial 1
+
+AC_DEFUN(AM_PROG_INSTALL,
+[AC_REQUIRE([AC_PROG_INSTALL])
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+AC_SUBST(INSTALL_SCRIPT)dnl
+])
+
 #
 # Check to make sure that the build environment is sane.
 #

diff --git a/src/Include/Makefile.am b/src/Include/Makefile.am
index a0d205c61a164df2967c2edf8bbbf2374ef38668..50443f788d8544497fabcf903fa3134a2f1cd67a 100644 (file)
--- a/src/Include/Makefile.am
+++ b/src/Include/Makefile.am
@@ -2,12 +2,7 @@ EXTRA_DIST = \
        auto_ptr.hxx \
        config.h.in \
        cmdargs.h \
-       compiler.h \
        fg_callback.hxx \
-       fg_constants.h \
-       fg_traits.hxx \
        fg_typedefs.h \
-       fg_types.hxx \
        fg_stl_config.h \
-       fg_zlib.h \
        general.hxx