1
0
Fork 0

Minor cleanups and reorganizations.

This commit is contained in:
curt 1998-04-06 15:56:04 +00:00
parent 49a48ee726
commit 293f9611a1
4 changed files with 64 additions and 70 deletions

View file

@ -1,2 +1,2 @@
SUBDIRS = Src SUBDIRS = Simulator

View file

@ -71,14 +71,14 @@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
VERSION = @VERSION@ VERSION = @VERSION@
SUBDIRS = Src SUBDIRS = Simulator
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ./Src/Include/config.h CONFIG_HEADER = ./Simulator/Include/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
DIST_COMMON = README COPYING INSTALL Makefile.am Makefile.in aclocal.m4 \ DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
config.guess config.sub configure configure.in install-sh ltconfig \ Makefile.in NEWS aclocal.m4 config.guess config.sub configure \
ltmain.sh missing mkinstalldirs configure.in install-sh ltconfig ltmain.sh missing mkinstalldirs
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

82
configure vendored
View file

@ -465,7 +465,7 @@ echo > confdefs.h
# A filename unique to this package, relative to the directory that # A filename unique to this package, relative to the directory that
# configure is in, which we can look for to find out if srcdir is correct. # configure is in, which we can look for to find out if srcdir is correct.
ac_unique_file=Src/Aircraft/aircraft.c ac_unique_file=Simulator/Aircraft/aircraft.c
# Find the source files, if location was not specified. # Find the source files, if location was not specified.
if test -z "$srcdir"; then if test -z "$srcdir"; then
@ -1316,7 +1316,7 @@ echo "configure:1316: checking for ld used by GCC" >&5
ac_prog=`($CC -print-prog-name=ld) 2>&5` ac_prog=`($CC -print-prog-name=ld) 2>&5`
case "$ac_prog" in case "$ac_prog" in
# Accept absolute paths. # Accept absolute paths.
/* | [A-Za-z]:\\*) /* | A-Za-z:\\*)
test -z "$LD" && LD="$ac_prog" test -z "$LD" && LD="$ac_prog"
;; ;;
"") "")
@ -3877,26 +3877,24 @@ ac_given_INSTALL="$INSTALL"
trap 'rm -fr `echo "\ trap 'rm -fr `echo "\
Makefile \ Makefile \
Docs/Makefile \ Simulator/Aircraft/Makefile \
Scenery/Makefile \ Simulator/Astro/Makefile \
Src/Aircraft/Makefile \ Simulator/Cockpit/Makefile \
Src/Astro/Makefile \ Simulator/Controls/Makefile \
Src/Cockpit/Makefile \ Simulator/Flight/LaRCsim/Makefile \
Src/Controls/Makefile \ Simulator/Flight/Makefile \
Src/Flight/LaRCsim/Makefile \ Simulator/Flight/Slew/Makefile \
Src/Flight/Makefile \ Simulator/Include/Makefile \
Src/Flight/Slew/Makefile \ Simulator/Joystick/Makefile \
Src/Include/Makefile \ Simulator/Linux/Makefile \
Src/Joystick/Makefile \ Simulator/Main/Makefile \
Src/Linux/Makefile \ Simulator/Makefile \
Src/Main/Makefile \ Simulator/Math/Makefile \
Src/Makefile \ Simulator/Scenery/Makefile \
Src/Math/Makefile \ Simulator/Time/Makefile \
Src/Scenery/Makefile \ Simulator/Weather/Makefile \
Src/Time/Makefile \ Simulator/XGL/Makefile \
Src/Weather/Makefile \ Simulator/Include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
Src/XGL/Makefile \
Src/Include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF EOF
cat >> $CONFIG_STATUS <<EOF cat >> $CONFIG_STATUS <<EOF
@ -3998,25 +3996,23 @@ cat >> $CONFIG_STATUS <<EOF
CONFIG_FILES=\${CONFIG_FILES-"\ CONFIG_FILES=\${CONFIG_FILES-"\
Makefile \ Makefile \
Docs/Makefile \ Simulator/Aircraft/Makefile \
Scenery/Makefile \ Simulator/Astro/Makefile \
Src/Aircraft/Makefile \ Simulator/Cockpit/Makefile \
Src/Astro/Makefile \ Simulator/Controls/Makefile \
Src/Cockpit/Makefile \ Simulator/Flight/LaRCsim/Makefile \
Src/Controls/Makefile \ Simulator/Flight/Makefile \
Src/Flight/LaRCsim/Makefile \ Simulator/Flight/Slew/Makefile \
Src/Flight/Makefile \ Simulator/Include/Makefile \
Src/Flight/Slew/Makefile \ Simulator/Joystick/Makefile \
Src/Include/Makefile \ Simulator/Linux/Makefile \
Src/Joystick/Makefile \ Simulator/Main/Makefile \
Src/Linux/Makefile \ Simulator/Makefile \
Src/Main/Makefile \ Simulator/Math/Makefile \
Src/Makefile \ Simulator/Scenery/Makefile \
Src/Math/Makefile \ Simulator/Time/Makefile \
Src/Scenery/Makefile \ Simulator/Weather/Makefile \
Src/Time/Makefile \ Simulator/XGL/Makefile \
Src/Weather/Makefile \
Src/XGL/Makefile \
"} "}
EOF EOF
cat >> $CONFIG_STATUS <<\EOF cat >> $CONFIG_STATUS <<\EOF
@ -4098,7 +4094,7 @@ ac_eD='%g'
if test "${CONFIG_HEADERS+set}" != set; then if test "${CONFIG_HEADERS+set}" != set; then
EOF EOF
cat >> $CONFIG_STATUS <<EOF cat >> $CONFIG_STATUS <<EOF
CONFIG_HEADERS="Src/Include/config.h" CONFIG_HEADERS="Simulator/Include/config.h"
EOF EOF
cat >> $CONFIG_STATUS <<\EOF cat >> $CONFIG_STATUS <<\EOF
fi fi
@ -4189,7 +4185,7 @@ cat >> $CONFIG_STATUS <<EOF
EOF EOF
cat >> $CONFIG_STATUS <<\EOF cat >> $CONFIG_STATUS <<\EOF
test -z "$CONFIG_HEADERS" || echo timestamp > Src/Include/stamp-h test -z "$CONFIG_HEADERS" || echo timestamp > Simulator/Include/stamp-h
exit 0 exit 0
EOF EOF

View file

@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
dnl dnl
dnl The basis for this file was generated by autoscan(1) [pere 1998-03-19] dnl The basis for this file was generated by autoscan(1) [pere 1998-03-19]
dnl dnl
AC_INIT(Src/Aircraft/aircraft.c) AC_INIT(Simulator/Aircraft/aircraft.c)
dnl Initialize the automake stuff dnl Initialize the automake stuff
AM_INIT_AUTOMAKE(FlightGear, 0.40) AM_INIT_AUTOMAKE(FlightGear, 0.40)
@ -122,27 +122,25 @@ if test "x$ac_cv_lib_glut_glutGetModifiers" = "xno"; then
exit 1 exit 1
fi fi
AM_CONFIG_HEADER(Src/Include/config.h) AM_CONFIG_HEADER(Simulator/Include/config.h)
AC_OUTPUT( \ AC_OUTPUT( \
Makefile \ Makefile \
Docs/Makefile \ Simulator/Aircraft/Makefile \
Scenery/Makefile \ Simulator/Astro/Makefile \
Src/Aircraft/Makefile \ Simulator/Cockpit/Makefile \
Src/Astro/Makefile \ Simulator/Controls/Makefile \
Src/Cockpit/Makefile \ Simulator/Flight/LaRCsim/Makefile \
Src/Controls/Makefile \ Simulator/Flight/Makefile \
Src/Flight/LaRCsim/Makefile \ Simulator/Flight/Slew/Makefile \
Src/Flight/Makefile \ Simulator/Include/Makefile \
Src/Flight/Slew/Makefile \ Simulator/Joystick/Makefile \
Src/Include/Makefile \ Simulator/Linux/Makefile \
Src/Joystick/Makefile \ Simulator/Main/Makefile \
Src/Linux/Makefile \ Simulator/Makefile \
Src/Main/Makefile \ Simulator/Math/Makefile \
Src/Makefile \ Simulator/Scenery/Makefile \
Src/Math/Makefile \ Simulator/Time/Makefile \
Src/Scenery/Makefile \ Simulator/Weather/Makefile \
Src/Time/Makefile \ Simulator/XGL/Makefile \
Src/Weather/Makefile \
Src/XGL/Makefile \
) )