From: curt Date: Mon, 6 Apr 1998 15:56:04 +0000 (+0000) Subject: Minor cleanups and reorganizations. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=293f9611a17e4d329512f12614fd5f9010eb0982;p=flightgear.git Minor cleanups and reorganizations. --- diff --git a/Makefile.am b/Makefile.am index 9c49999aa..b2b6f3374 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,2 +1,2 @@ -SUBDIRS = Src +SUBDIRS = Simulator diff --git a/Makefile.in b/Makefile.in index c77142ce9..f451ac0b8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -71,14 +71,14 @@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ VERSION = @VERSION@ -SUBDIRS = Src +SUBDIRS = Simulator ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ./Src/Include/config.h +CONFIG_HEADER = ./Simulator/Include/config.h CONFIG_CLEAN_FILES = -DIST_COMMON = README COPYING INSTALL Makefile.am Makefile.in aclocal.m4 \ -config.guess config.sub configure configure.in install-sh ltconfig \ -ltmain.sh missing mkinstalldirs +DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ +Makefile.in NEWS aclocal.m4 config.guess config.sub configure \ +configure.in install-sh ltconfig ltmain.sh missing mkinstalldirs DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) diff --git a/configure b/configure index 430e3ad73..7236d6bd3 100755 --- a/configure +++ b/configure @@ -465,7 +465,7 @@ echo > confdefs.h # 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. -ac_unique_file=Src/Aircraft/aircraft.c +ac_unique_file=Simulator/Aircraft/aircraft.c # Find the source files, if location was not specified. 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` case "$ac_prog" in # Accept absolute paths. - /* | [A-Za-z]:\\*) + /* | A-Za-z:\\*) test -z "$LD" && LD="$ac_prog" ;; "") @@ -3877,26 +3877,24 @@ ac_given_INSTALL="$INSTALL" trap 'rm -fr `echo "\ Makefile \ - Docs/Makefile \ - Scenery/Makefile \ - Src/Aircraft/Makefile \ - Src/Astro/Makefile \ - Src/Cockpit/Makefile \ - Src/Controls/Makefile \ - Src/Flight/LaRCsim/Makefile \ - Src/Flight/Makefile \ - Src/Flight/Slew/Makefile \ - Src/Include/Makefile \ - Src/Joystick/Makefile \ - Src/Linux/Makefile \ - Src/Main/Makefile \ - Src/Makefile \ - Src/Math/Makefile \ - Src/Scenery/Makefile \ - Src/Time/Makefile \ - Src/Weather/Makefile \ - Src/XGL/Makefile \ - Src/Include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 + Simulator/Aircraft/Makefile \ + Simulator/Astro/Makefile \ + Simulator/Cockpit/Makefile \ + Simulator/Controls/Makefile \ + Simulator/Flight/LaRCsim/Makefile \ + Simulator/Flight/Makefile \ + Simulator/Flight/Slew/Makefile \ + Simulator/Include/Makefile \ + Simulator/Joystick/Makefile \ + Simulator/Linux/Makefile \ + Simulator/Main/Makefile \ + Simulator/Makefile \ + Simulator/Math/Makefile \ + Simulator/Scenery/Makefile \ + Simulator/Time/Makefile \ + Simulator/Weather/Makefile \ + Simulator/XGL/Makefile \ + Simulator/Include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF @@ -4098,7 +4094,7 @@ ac_eD='%g' if test "${CONFIG_HEADERS+set}" != set; then EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF fi @@ -4189,7 +4185,7 @@ cat >> $CONFIG_STATUS <> $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 EOF diff --git a/configure.in b/configure.in index 59eb959ec..5c846c896 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. dnl dnl The basis for this file was generated by autoscan(1) [pere 1998-03-19] dnl -AC_INIT(Src/Aircraft/aircraft.c) +AC_INIT(Simulator/Aircraft/aircraft.c) dnl Initialize the automake stuff AM_INIT_AUTOMAKE(FlightGear, 0.40) @@ -122,27 +122,25 @@ if test "x$ac_cv_lib_glut_glutGetModifiers" = "xno"; then exit 1 fi -AM_CONFIG_HEADER(Src/Include/config.h) +AM_CONFIG_HEADER(Simulator/Include/config.h) AC_OUTPUT( \ Makefile \ - Docs/Makefile \ - Scenery/Makefile \ - Src/Aircraft/Makefile \ - Src/Astro/Makefile \ - Src/Cockpit/Makefile \ - Src/Controls/Makefile \ - Src/Flight/LaRCsim/Makefile \ - Src/Flight/Makefile \ - Src/Flight/Slew/Makefile \ - Src/Include/Makefile \ - Src/Joystick/Makefile \ - Src/Linux/Makefile \ - Src/Main/Makefile \ - Src/Makefile \ - Src/Math/Makefile \ - Src/Scenery/Makefile \ - Src/Time/Makefile \ - Src/Weather/Makefile \ - Src/XGL/Makefile \ + Simulator/Aircraft/Makefile \ + Simulator/Astro/Makefile \ + Simulator/Cockpit/Makefile \ + Simulator/Controls/Makefile \ + Simulator/Flight/LaRCsim/Makefile \ + Simulator/Flight/Makefile \ + Simulator/Flight/Slew/Makefile \ + Simulator/Include/Makefile \ + Simulator/Joystick/Makefile \ + Simulator/Linux/Makefile \ + Simulator/Main/Makefile \ + Simulator/Makefile \ + Simulator/Math/Makefile \ + Simulator/Scenery/Makefile \ + Simulator/Time/Makefile \ + Simulator/Weather/Makefile \ + Simulator/XGL/Makefile \ )