Tweaks to Gnu automake/autoconf system.

diff --git a/Aircraft/Makefile.am b/Aircraft/Makefile.am
index 99177c64b7b922b090d06d7158dae667bc2e1309..6b9da13786fa21e5527018349c45a7a9db9c72a4 100644 (file)
--- a/Aircraft/Makefile.am
+++ b/Aircraft/Makefile.am
@@ -1,7 +1,6 @@
 libdir = ${exec_prefix}/lib
 
 lib_LTLIBRARIES = libAircraft.la
-libAircraft_la_SOURCES = \
-       aircraft.c
+libAircraft_la_SOURCES = aircraft.c aircraft.h
 
 INCLUDES += -I..

diff --git a/Aircraft/Makefile.in b/Aircraft/Makefile.in
index 29beaeb0dec6f7ec0bd6efa26ed5fe0b8c37e623..3e84e160fd357871b01ad6876b8fdb506ff96f49 100644 (file)
--- a/Aircraft/Makefile.in
+++ b/Aircraft/Makefile.in
@@ -73,8 +73,7 @@ VERSION = @VERSION@
 libdir = ${exec_prefix}/lib
 
 lib_LTLIBRARIES = libAircraft.la
-libAircraft_la_SOURCES = \
-       aircraft.c
+libAircraft_la_SOURCES = aircraft.c aircraft.h
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../Simulator/Include/config.h
 CONFIG_CLEAN_FILES = 

diff --git a/Astro/Makefile.am b/Astro/Makefile.am
index 294b425c0f6ccb98cfb9a3ca7f8e0de8e14c2aba..0863e4d903b40f6e160305aafba8136e3684227c 100644 (file)
--- a/Astro/Makefile.am
+++ b/Astro/Makefile.am
@@ -2,11 +2,11 @@ libdir        = ${exec_prefix}/lib
 
 lib_LTLIBRARIES = libAstro.la
 libAstro_la_SOURCES = \
-       moon.c \
-       orbits.c \
-       planets.c \
-       sky.c \
-       stars.c \
-       sun.c
+       moon.c moon.h \
+       orbits.c orbits.h \
+       planets.c planets.h \
+       sky.c sky.h \
+       stars.c stars.h \
+       sun.c sun.h
 
 INCLUDES += -I..

diff --git a/Astro/Makefile.in b/Astro/Makefile.in
index 98cd5d31bdecbea5013f728ee15fdff7639bbb27..d645c8e21d1e4453eaf2900faf3156cf70369563 100644 (file)
--- a/Astro/Makefile.in
+++ b/Astro/Makefile.in
@@ -74,12 +74,12 @@ libdir      = ${exec_prefix}/lib
 
 lib_LTLIBRARIES = libAstro.la
 libAstro_la_SOURCES = \
-       moon.c \
-       orbits.c \
-       planets.c \
-       sky.c \
-       stars.c \
-       sun.c
+       moon.c moon.h \
+       orbits.c orbits.h \
+       planets.c planets.h \
+       sky.c sky.h \
+       stars.c stars.h \
+       sun.c sun.h
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../Simulator/Include/config.h
 CONFIG_CLEAN_FILES = 

diff --git a/Cockpit/Makefile.am b/Cockpit/Makefile.am
index 28e44feafa283dab3ac41128c1ca4f62a21a2aac..a62b646897821bc31877a9d2822a96efb3323075 100644 (file)
--- a/Cockpit/Makefile.am
+++ b/Cockpit/Makefile.am
@@ -2,7 +2,7 @@ libdir  = ${exec_prefix}/lib
 
 lib_LTLIBRARIES = libCockpit.la
 libCockpit_la_SOURCES = \
-       cockpit.c \
-       hud.c
+       cockpit.c cockpit.h \
+       hud.c hud.h
 
 INCLUDES += -I..

diff --git a/Cockpit/Makefile.in b/Cockpit/Makefile.in
index b10ab40d1cde9ec0528681e983b671f54c62d760..3c9f6a143894fff0f9ee0cd361f0cbe6c86a9368 100644 (file)
--- a/Cockpit/Makefile.in
+++ b/Cockpit/Makefile.in
@@ -74,8 +74,8 @@ libdir        = ${exec_prefix}/lib
 
 lib_LTLIBRARIES = libCockpit.la
 libCockpit_la_SOURCES = \
-       cockpit.c \
-       hud.c
+       cockpit.c cockpit.h \
+       hud.c hud.h
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../Simulator/Include/config.h
 CONFIG_CLEAN_FILES = 

diff --git a/Controls/Makefile.am b/Controls/Makefile.am
index 0517f7e20c7bc623a484ea8ab071de6485662ebc..79d5629ac4f1798e528ecb8ff8cc799f7e636b10 100644 (file)
--- a/Controls/Makefile.am
+++ b/Controls/Makefile.am
@@ -1,7 +1,7 @@
 libdir = ${exec_prefix}/lib
 
 lib_LTLIBRARIES = libControls.la
-libControls_la_SOURCES = \
-       controls.c
+
+libControls_la_SOURCES = controls.c controls.h
 
 INCLUDES += -I..

diff --git a/Controls/Makefile.in b/Controls/Makefile.in
index d17478b6d354ad2299c43dd0735c1967fcab41e6..bd6cdfa9c1c7d87a14c3efa46e7656d73d8c3b06 100644 (file)
--- a/Controls/Makefile.in
+++ b/Controls/Makefile.in
@@ -73,8 +73,8 @@ VERSION = @VERSION@
 libdir = ${exec_prefix}/lib
 
 lib_LTLIBRARIES = libControls.la
-libControls_la_SOURCES = \
-       controls.c
+
+libControls_la_SOURCES = controls.c controls.h
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../Simulator/Include/config.h
 CONFIG_CLEAN_FILES = 

diff --git a/FDM/Makefile.am b/FDM/Makefile.am
index 579fab55f74e6c8bef721a6e6182ad0a2384d5cb..5f2670a22d7444c7abb09370a0f370368ecd036e 100644 (file)
--- a/FDM/Makefile.am
+++ b/FDM/Makefile.am
@@ -4,7 +4,6 @@ libdir  = ${exec_prefix}/lib
 
 lib_LTLIBRARIES = libFlight.la
 
-libFlight_la_SOURCES = \
-       flight.c
+libFlight_la_SOURCES = flight.c flight.h
 
 INCLUDES += -I..

diff --git a/FDM/Makefile.in b/FDM/Makefile.in
index e454d4051496ce1e7f00d55966711b2ac5c5968b..1a01b6afbbe1973c0e9212a5a73d3285151af840 100644 (file)
--- a/FDM/Makefile.in
+++ b/FDM/Makefile.in
@@ -76,8 +76,7 @@ libdir        = ${exec_prefix}/lib
 
 lib_LTLIBRARIES = libFlight.la
 
-libFlight_la_SOURCES = \
-       flight.c
+libFlight_la_SOURCES = flight.c flight.h
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../Simulator/Include/config.h
 CONFIG_CLEAN_FILES = 

diff --git a/Joystick/Makefile.am b/Joystick/Makefile.am
index 37437cab62ca411fa9bae6c9e2946de8cc588a21..d01f0b0f659e1ac6a4da0c748ee90145291c884e 100644 (file)
--- a/Joystick/Makefile.am
+++ b/Joystick/Makefile.am
@@ -1,7 +1,7 @@
 libdir = ${exec_prefix}/lib
 
 lib_LTLIBRARIES = libJoystick.la
-libJoystick_la_SOURCES = \
-       joystick.c
+
+libJoystick_la_SOURCES = joystick.c joystick.h
 
 INCLUDES += -I..

diff --git a/Joystick/Makefile.in b/Joystick/Makefile.in
index 1c12f47f14be025907ab7a26230fcd7554d00364..7af7b9351fb361b2deb7399bdeb87cc051f1ec2b 100644 (file)
--- a/Joystick/Makefile.in
+++ b/Joystick/Makefile.in
@@ -73,8 +73,8 @@ VERSION = @VERSION@
 libdir = ${exec_prefix}/lib
 
 lib_LTLIBRARIES = libJoystick.la
-libJoystick_la_SOURCES = \
-       joystick.c
+
+libJoystick_la_SOURCES = joystick.c joystick.h
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../Simulator/Include/config.h
 CONFIG_CLEAN_FILES = 

diff --git a/LaRCsim/Makefile.am b/LaRCsim/Makefile.am
index 1031d914db73fcf171234ea0d42cf2f9af183475..9977377bda28e6e3dc12570de99ee7098ba7e67a 100644 (file)
--- a/LaRCsim/Makefile.am
+++ b/LaRCsim/Makefile.am
@@ -1,16 +1,23 @@
 libdir = ${exec_prefix}/lib
 
-LaRCsimFILES = atmos_62.c ls_accel.c ls_aux.c ls_geodesy.c ls_gravity.c \
-        ls_step.c ls_matrix.c ls_model.c default_model_routines.c ls_init.c
-#      ls_trim.c
-
-NavionFILES = navion_aero.c navion_engine.c navion_gear.c navion_init.c
-InterfaceFILES = ls_interface.c
-
 lib_LTLIBRARIES = libLaRCsim.la
+
 libLaRCsim_la_SOURCES = \
-       $(LaRCsimFILES) \
-       $(NavionFILES) \
-       $(InterfaceFILES)
+       atmos_62.c atmos_62.h \
+       default_model_routines.c default_model_routines.h \
+       ls_accel.c ls_accel.h \
+       ls_aux.c ls_aux.h \
+       ls_cockpit.h ls_constants.h ls_generic.h \
+       ls_geodesy.c ls_geodesy.h \
+       ls_gravity.c ls_gravity.h \
+       ls_init.c ls_init.h \
+       ls_matrix.c ls_matrix.h \
+       ls_model.c ls_model.h \
+       ls_sim_control.h \
+        ls_step.c ls_step.h \
+       ls_sym.h ls_types.h \
+       navion_aero.c navion_engine.c navion_gear.c \
+       navion_init.c navion_init.h \
+       ls_interface.c ls_interface.h
 
 INCLUDES += -I../..

diff --git a/LaRCsim/Makefile.in b/LaRCsim/Makefile.in
index ac158dcb5c68318661bcf8fee28b444e0cbef7f4..3a6c4f11d44328d08bdcc441f13ff497cbf0263b 100644 (file)
--- a/LaRCsim/Makefile.in
+++ b/LaRCsim/Makefile.in
@@ -72,18 +72,25 @@ VERSION = @VERSION@
 
 libdir = ${exec_prefix}/lib
 
-LaRCsimFILES = atmos_62.c ls_accel.c ls_aux.c ls_geodesy.c ls_gravity.c \
-        ls_step.c ls_matrix.c ls_model.c default_model_routines.c ls_init.c
-#      ls_trim.c
-
-NavionFILES = navion_aero.c navion_engine.c navion_gear.c navion_init.c
-InterfaceFILES = ls_interface.c
-
 lib_LTLIBRARIES = libLaRCsim.la
+
 libLaRCsim_la_SOURCES = \
-       $(LaRCsimFILES) \
-       $(NavionFILES) \
-       $(InterfaceFILES)
+       atmos_62.c atmos_62.h \
+       default_model_routines.c default_model_routines.h \
+       ls_accel.c ls_accel.h \
+       ls_aux.c ls_aux.h \
+       ls_cockpit.h ls_constants.h ls_generic.h \
+       ls_geodesy.c ls_geodesy.h \
+       ls_gravity.c ls_gravity.h \
+       ls_init.c ls_init.h \
+       ls_matrix.c ls_matrix.h \
+       ls_model.c ls_model.h \
+       ls_sim_control.h \
+        ls_step.c ls_step.h \
+       ls_sym.h ls_types.h \
+       navion_aero.c navion_engine.c navion_gear.c \
+       navion_init.c navion_init.h \
+       ls_interface.c ls_interface.h
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../../Simulator/Include/config.h
 CONFIG_CLEAN_FILES = 
@@ -100,9 +107,9 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
 libLaRCsim_la_LDFLAGS = 
 libLaRCsim_la_LIBADD = 
-libLaRCsim_la_OBJECTS =  atmos_62.lo ls_accel.lo ls_aux.lo ls_geodesy.lo \
-ls_gravity.lo ls_step.lo ls_matrix.lo ls_model.lo \
-default_model_routines.lo ls_init.lo navion_aero.lo navion_engine.lo \
+libLaRCsim_la_OBJECTS =  atmos_62.lo default_model_routines.lo \
+ls_accel.lo ls_aux.lo ls_geodesy.lo ls_gravity.lo ls_init.lo \
+ls_matrix.lo ls_model.lo ls_step.lo navion_aero.lo navion_engine.lo \
 navion_gear.lo navion_init.lo ls_interface.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)

diff --git a/Main/GLUTmain.c b/Main/GLUTmain.c
index f25fe77ddb79ca63e07555d049389d7c0579f663..0dd996cdefaacadf8dc76f14f9218a8a80389904 100644 (file)
--- a/Main/GLUTmain.c
+++ b/Main/GLUTmain.c
@@ -48,7 +48,7 @@
 #include <Main/views.h>
 
 #include <Include/cmdargs.h>       // Line to command line arguments
-#include <Include/fg_constants.h>
+#include <Include/fg_constants.h>  // for VERSION
 #include <Include/general.h>
 
 #include <Aircraft/aircraft.h>
@@ -703,9 +703,6 @@ int main( int argc, char *argv[] ) {
     f = current_aircraft.flight;
     //  First things first... We must have startup options dealt with.
 
-    #ifndef VERSION
-    #define VERSION "src-32A"
-    #endif
     printf("Flight Gear:  Version %s\n\n", VERSION);
 
      /*********************************************************************
@@ -814,9 +811,12 @@ extern "C" {
 #endif
 
 /* $Log$
-/* Revision 1.68  1998/04/03 22:09:03  curt
-/* Converting to Gnu autoconf system.
+/* Revision 1.69  1998/04/08 23:35:34  curt
+/* Tweaks to Gnu automake/autoconf system.
 /*
+ * Revision 1.68  1998/04/03 22:09:03  curt
+ * Converting to Gnu autoconf system.
+ *
  * Revision 1.67  1998/03/23 21:24:37  curt
  * Source code formating tweaks.
  *

diff --git a/Main/Makefile.am b/Main/Makefile.am
index 41aefc2dbc5969f07d8b7547aae8b1046f688ee6..c6ac62072d9931d8fcca6fb263ee02cb259c0b10 100644 (file)
--- a/Main/Makefile.am
+++ b/Main/Makefile.am
@@ -1,17 +1,19 @@
+EXTRA_DIST = runfg.in runfg.bat.in
 
-# bindir = ${exec_prefix}/japhar/bin
+bin_PROGRAMS = fg
 
-bin_PROGRAMS   = fg
-fg_SOURCES     = \
-       fg_debug.c \
-       fg_getopt.c \
-       fg_init.c \
-       views.c \
-       GLUTkey.c \
-       GLUTmain.c
+bin_SCRIPTS = runfg runfg.bat
 
-# Need $(INTERFACE_LIBS) $(GRAPHICS_LIBS)
-fg_LDADD       = \
+fg_SOURCES = \
+       GLUTkey.c GLUTkey.h \
+       GLUTmain.c \
+       fg_config.h \
+       fg_debug.c fg_debug.h \
+       fg_getopt.c fg_getopt.h \
+       fg_init.c fg_init.h \
+       views.c views.h
+
+fg_LDADD = \
        $(top_builddir)/Simulator/Aircraft/libAircraft.la \
        $(top_builddir)/Simulator/Astro/libAstro.la \
        $(top_builddir)/Simulator/Cockpit/libCockpit.la \
@@ -20,6 +22,7 @@ fg_LDADD      = \
        $(top_builddir)/Simulator/Flight/LaRCsim/libLaRCsim.la \
        $(top_builddir)/Simulator/Flight/Slew/libSlew.la \
        $(top_builddir)/Simulator/Scenery/libScenery.la \
+       $(top_builddir)/Simulator/Scenery/Bucket/libBucket.la \
        $(top_builddir)/Simulator/Time/libTime.la \
        $(top_builddir)/Simulator/Weather/libWeather.la \
         $(top_builddir)/Simulator/Joystick/libJoystick.la \

diff --git a/Main/Makefile.in b/Main/Makefile.in
index fec2e1c0da1c2da79bcf5a31a32beb4a3413eaa7..289ac5db7929668fc5700e1ec3624411b251b595 100644 (file)
--- a/Main/Makefile.in
+++ b/Main/Makefile.in
@@ -10,8 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# bindir = ${exec_prefix}/japhar/bin
-
 
 SHELL = /bin/sh
 
@@ -73,17 +71,22 @@ PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
 
-bin_PROGRAMS   = fg
-fg_SOURCES     = \
-       fg_debug.c \
-       fg_getopt.c \
-       fg_init.c \
-       views.c \
-       GLUTkey.c \
-       GLUTmain.c
-
-# Need $(INTERFACE_LIBS) $(GRAPHICS_LIBS)
-fg_LDADD       = \
+EXTRA_DIST = runfg.in runfg.bat.in
+
+bin_PROGRAMS = fg
+
+bin_SCRIPTS = runfg runfg.bat
+
+fg_SOURCES = \
+       GLUTkey.c GLUTkey.h \
+       GLUTmain.c \
+       fg_config.h \
+       fg_debug.c fg_debug.h \
+       fg_getopt.c fg_getopt.h \
+       fg_init.c fg_init.h \
+       views.c views.h
+
+fg_LDADD = \
        $(top_builddir)/Simulator/Aircraft/libAircraft.la \
        $(top_builddir)/Simulator/Astro/libAstro.la \
        $(top_builddir)/Simulator/Cockpit/libCockpit.la \
@@ -92,13 +95,14 @@ fg_LDADD    = \
        $(top_builddir)/Simulator/Flight/LaRCsim/libLaRCsim.la \
        $(top_builddir)/Simulator/Flight/Slew/libSlew.la \
        $(top_builddir)/Simulator/Scenery/libScenery.la \
+       $(top_builddir)/Simulator/Scenery/Bucket/libBucket.la \
        $(top_builddir)/Simulator/Time/libTime.la \
        $(top_builddir)/Simulator/Weather/libWeather.la \
         $(top_builddir)/Simulator/Joystick/libJoystick.la \
        $(top_builddir)/Simulator/Math/libMath.la
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../Simulator/Include/config.h
-CONFIG_CLEAN_FILES = 
+CONFIG_CLEAN_FILES =  runfg runfg.bat
 PROGRAMS =  $(bin_PROGRAMS)
 
 
@@ -110,8 +114,8 @@ X_CFLAGS = @X_CFLAGS@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-fg_OBJECTS =  fg_debug.o fg_getopt.o fg_init.o views.o GLUTkey.o \
-GLUTmain.o
+fg_OBJECTS =  GLUTkey.o GLUTmain.o fg_debug.o fg_getopt.o fg_init.o \
+views.o
 fg_DEPENDENCIES =  $(top_builddir)/Simulator/Aircraft/libAircraft.la \
 $(top_builddir)/Simulator/Astro/libAstro.la \
 $(top_builddir)/Simulator/Cockpit/libCockpit.la \
@@ -120,16 +124,19 @@ $(top_builddir)/Simulator/Flight/libFlight.la \
 $(top_builddir)/Simulator/Flight/LaRCsim/libLaRCsim.la \
 $(top_builddir)/Simulator/Flight/Slew/libSlew.la \
 $(top_builddir)/Simulator/Scenery/libScenery.la \
+$(top_builddir)/Simulator/Scenery/Bucket/libBucket.la \
 $(top_builddir)/Simulator/Time/libTime.la \
 $(top_builddir)/Simulator/Weather/libWeather.la \
 $(top_builddir)/Simulator/Joystick/libJoystick.la \
 $(top_builddir)/Simulator/Math/libMath.la
 fg_LDFLAGS = 
+SCRIPTS =  $(bin_SCRIPTS)
+
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  README Makefile.am Makefile.in
+DIST_COMMON =  README Makefile.am Makefile.in runfg.bat.in runfg.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -141,7 +148,7 @@ DEP_FILES =  .deps/GLUTkey.P .deps/GLUTmain.P .deps/fg_debug.P \
 SOURCES = $(fg_SOURCES)
 OBJECTS = $(fg_OBJECTS)
 
-all: Makefile $(PROGRAMS)
+all: Makefile $(PROGRAMS) $(SCRIPTS)
 
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .s
@@ -152,6 +159,10 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
+runfg: $(top_builddir)/config.status runfg.in
+       cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
+runfg.bat: $(top_builddir)/config.status runfg.bat.in
+       cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
 
 mostlyclean-binPROGRAMS:
 
@@ -214,6 +225,25 @@ fg: $(fg_OBJECTS) $(fg_DEPENDENCIES)
        @rm -f fg
        $(LINK) $(fg_LDFLAGS) $(fg_OBJECTS) $(fg_LDADD) $(LIBS)
 
+install-binSCRIPTS: $(bin_SCRIPTS)
+       @$(NORMAL_INSTALL)
+       $(mkinstalldirs) $(DESTDIR)$(bindir)
+       @list='$(bin_SCRIPTS)'; for p in $$list; do \
+         if test -f $$p; then \
+           echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
+           $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+         else if test -f $(srcdir)/$$p; then \
+           echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
+           $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+         else :; fi; fi; \
+       done
+
+uninstall-binSCRIPTS:
+       @$(NORMAL_UNINSTALL)
+       list='$(bin_SCRIPTS)'; for p in $$list; do \
+         rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+       done
+
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP)
@@ -284,7 +314,7 @@ dvi:
 check: all
        $(MAKE)
 installcheck:
-install-exec: install-binPROGRAMS
+install-exec: install-binPROGRAMS install-binSCRIPTS
        @$(NORMAL_INSTALL)
 
 install-data: 
@@ -293,12 +323,12 @@ install-data:
 install: install-exec install-data all
        @:
 
-uninstall: uninstall-binPROGRAMS
+uninstall: uninstall-binPROGRAMS uninstall-binSCRIPTS
 
 install-strip:
        $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs:
-       $(mkinstalldirs)  $(DATADIR)$(bindir)
+       $(mkinstalldirs)  $(DATADIR)$(bindir) $(DATADIR)$(bindir)
 
 
 mostlyclean-generic:
@@ -338,13 +368,13 @@ maintainer-clean:  maintainer-clean-binPROGRAMS maintainer-clean-compile \
 maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool 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
+clean-libtool maintainer-clean-libtool uninstall-binSCRIPTS \
+install-binSCRIPTS 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.. -DGLUT

diff --git a/Main/fg_init.c b/Main/fg_init.c
index 79e9505f384a04996b1b751ebfd7ba51a28d4e04..479a3b09f4261c077ee0debd3f26a66dc06a5eb1 100644 (file)
--- a/Main/fg_init.c
+++ b/Main/fg_init.c
@@ -157,10 +157,10 @@ int fgInitSubsystems( void ) {
     // FG_Altitude = FG_Runway_altitude + 3.758099;
 
     // Initial Position at (HSP) Hot Springs, VA
-    FG_Longitude = (-79.8338964 + 0.01) * DEG_TO_RAD;
-    FG_Latitude  = ( 37.9514564 + 0.008) * DEG_TO_RAD;
-    FG_Runway_altitude = (3792 + 1300);
-    FG_Altitude = FG_Runway_altitude + 3.758099;
+    // FG_Longitude = (-79.8338964 + 0.01) * DEG_TO_RAD;
+    // FG_Latitude  = ( 37.9514564 + 0.008) * DEG_TO_RAD;
+    // FG_Runway_altitude = (3792 + 1300);
+    // FG_Altitude = FG_Runway_altitude + 3.758099;
     
     // Initial Position at (ANE) Anoka County airport
     // FG_Longitude = -93.2113889 * DEG_TO_RAD;
@@ -400,9 +400,12 @@ int fgInitSubsystems( void ) {
 
 
 /* $Log$
-/* Revision 1.53  1998/04/03 22:09:06  curt
-/* Converting to Gnu autoconf system.
+/* Revision 1.54  1998/04/08 23:35:36  curt
+/* Tweaks to Gnu automake/autoconf system.
 /*
+ * Revision 1.53  1998/04/03 22:09:06  curt
+ * Converting to Gnu autoconf system.
+ *
  * Revision 1.52  1998/03/23 21:24:38  curt
  * Source code formating tweaks.
  *

diff --git a/Simulator/Makefile.am b/Simulator/Makefile.am
index 821b7c8215224f267c13c27b59972e3ae76fdfd8..6cb1e3655dd35ce5c6c8e9272170cd91602f0752 100644 (file)
--- a/Simulator/Makefile.am
+++ b/Simulator/Makefile.am
@@ -5,6 +5,7 @@ SUBDIRS = Aircraft \
        Cockpit \
        Controls \
        Flight \
+       Include \
        Joystick \
        Math \
        Scenery \

diff --git a/Simulator/Makefile.in b/Simulator/Makefile.in
index 4aeec19f939a98dd3c4f6fe90f5a62d6007bb76c..f65c634f41fc73705800a56950af33f05bca51af 100644 (file)
--- a/Simulator/Makefile.in
+++ b/Simulator/Makefile.in
@@ -78,6 +78,7 @@ SUBDIRS = Aircraft \
        Cockpit \
        Controls \
        Flight \
+       Include \
        Joystick \
        Math \
        Scenery \
@@ -88,7 +89,7 @@ SUBDIRS = Aircraft \
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../Simulator/Include/config.h
 CONFIG_CLEAN_FILES = 
-DIST_COMMON =  README Makefile.am Makefile.in
+DIST_COMMON =  Makefile.am Makefile.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

diff --git a/Simulator/runfg b/Simulator/runfg
deleted file mode 100755 (executable)
index 22a9341..0000000
--- a/Simulator/runfg
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/perl
-
-#---------------------------------------------------------------------------
-# runfg -- front end for setting up the FG_ROOT env variable and launching 
-#          the fg executable.
-#
-# Written by Curtis Olson, started September 1997.
-#
-# Copyright (C) 1997  Curtis L. Olson  - curt@infoplane.com
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-# $Id$
-# (Log is kept at end of this file)
-#---------------------------------------------------------------------------
-
-
-# Flight Gear Version
-$version_major = "0";
-
-$path = "";
-
-# name of Flight Gear executable
-@programs = ( "fg" . $version_major, "fg" . $version_major . ".exe" );
-
-# see if we can find the executable
-while ( $path eq "" && ($program = shift(@programs)) ) {
-    print "$program\n";
-
-    if ( -x "./Main/$program" ) {
-       $path = "./Main/$program";
-    } elsif ( -x "./$program" ) {
-       $path = "./$program";
-    }
-}
-
-die "Cannot locate program.\n" if ( $path eq "" );
-
-
-# set the FG_ROOT environment variable if it hasn't already been set.
-if ( $ENV{FG_ROOT} eq "" ) {
-    # look for a file called fgtop as a place marker
-    if ( -e "fgtop" ) {
-        $ENV{FG_ROOT} = ".";
-    } elsif ( -e "../fgtop" ) {
-        $ENV{FG_ROOT} = "..";
-    }
-}
-
-# run Flight Gear
-print "Running $path @ARGV\n";
-exec("$path @ARGV");
-
-
-#---------------------------------------------------------------------------
-# $Log$
-# Revision 1.4  1998/03/09 22:52:38  curt
-# Mod's to better support win32 if perl exists.
-#
-# Revision 1.3  1998/02/16 16:17:34  curt
-# Minor tweaks.
-#
-# Revision 1.2  1998/01/27 00:47:43  curt
-# Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message
-# system and commandline/config file processing code.
-#
-# Revision 1.1  1997/10/28 18:47:27  curt
-# Initial revision.
-#

diff --git a/Slew/Makefile.am b/Slew/Makefile.am
index de9221a5a3326e46985f80d641964387708fc71e..aed4990ce849c18db7780110e49463e1cc7d45cb 100644 (file)
--- a/Slew/Makefile.am
+++ b/Slew/Makefile.am
@@ -1,7 +1,7 @@
 libdir = ${exec_prefix}/lib
 
 lib_LTLIBRARIES = libSlew.la
-libSlew_la_SOURCES = \
-       slew.c
+
+libSlew_la_SOURCES = slew.c slew.h
 
 INCLUDES += -I../..

diff --git a/Slew/Makefile.in b/Slew/Makefile.in
index e9fc72170b8b7085375dde1b54c07090ca3d0e43..e2023ee781dccc9353f0d5078c6ce9b2982b38a1 100644 (file)
--- a/Slew/Makefile.in
+++ b/Slew/Makefile.in
@@ -73,8 +73,8 @@ VERSION = @VERSION@
 libdir = ${exec_prefix}/lib
 
 lib_LTLIBRARIES = libSlew.la
-libSlew_la_SOURCES = \
-       slew.c
+
+libSlew_la_SOURCES = slew.c slew.h
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../../Simulator/Include/config.h
 CONFIG_CLEAN_FILES = 

diff --git a/Slew/slew.c b/Slew/slew.c
index 33579555bea54a6a79244dc1f186b51199cc182f..ca1d3533a5a93005055af44655c3ff952b26cc8c 100644 (file)
--- a/Slew/slew.c
+++ b/Slew/slew.c
@@ -33,15 +33,6 @@
 #include <Include/fg_constants.h>
 
 
-#ifndef M_PI                                    
-#define M_PI        3.14159265358979323846      /* pi */
-#endif                                                           
-
-#ifndef PI2                                               
-#define PI2  (M_PI + M_PI)                      
-#endif        
-
-
 /* reset flight params to a specific position */
 void fgSlewInit(double pos_x, double pos_y, double pos_z, double heading) {
     fgFLIGHT *f;
@@ -93,10 +84,13 @@ void fgSlewUpdate( void ) {
 
 
 /* $Log$
-/* Revision 1.11  1998/02/07 15:29:39  curt
-/* Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
-/* <chotchkiss@namg.us.anritsu.com>
+/* Revision 1.12  1998/04/08 23:35:30  curt
+/* Tweaks to Gnu automake/autoconf system.
 /*
+ * Revision 1.11  1998/02/07 15:29:39  curt
+ * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
+ * <chotchkiss@namg.us.anritsu.com>
+ *
  * Revision 1.10  1998/01/27 00:47:53  curt
  * Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message
  * system and commandline/config file processing code.

diff --git a/Time/Makefile.am b/Time/Makefile.am
index 181a7f66535e24f8c2720f6f1a9adb6f7a1b1c60..fee9f8caa0758d2ba3f26243c892eee579ac9a88 100644 (file)
--- a/Time/Makefile.am
+++ b/Time/Makefile.am
@@ -1,10 +1,11 @@
 libdir = ${exec_prefix}/lib
 
 lib_LTLIBRARIES = libTime.la
+
 libTime_la_SOURCES = \
-       event.c \
-       fg_time.c \
-       fg_timer.c \
-       sunpos.c
+       event.c event.h \
+       fg_time.c fg_time.h \
+       fg_timer.c fg_timer.h \
+       sunpos.c sunpos.h
 
 INCLUDES += -I..

diff --git a/Time/Makefile.in b/Time/Makefile.in
index f18430d38f1c59f20def1134efbb4b429b3e41d5..8bb21507c93411beb88bee90917fb6c207f620bc 100644 (file)
--- a/Time/Makefile.in
+++ b/Time/Makefile.in
@@ -73,11 +73,12 @@ VERSION = @VERSION@
 libdir = ${exec_prefix}/lib
 
 lib_LTLIBRARIES = libTime.la
+
 libTime_la_SOURCES = \
-       event.c \
-       fg_time.c \
-       fg_timer.c \
-       sunpos.c
+       event.c event.h \
+       fg_time.c fg_time.h \
+       fg_timer.c fg_timer.h \
+       sunpos.c sunpos.h
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../Simulator/Include/config.h
 CONFIG_CLEAN_FILES = 

diff --git a/Time/fg_time.c b/Time/fg_time.c
index b9eb89f309d21efcfcad8f7537a8889a09129553..f6d2e5bdac79fb0b1090c4037b85137c6177a11d 100644 (file)
--- a/Time/fg_time.c
+++ b/Time/fg_time.c
@@ -213,9 +213,14 @@ double sidereal_course(struct tm *gmt, time_t now, double lng) {
     long int offset;
     double diff, part, days, hours, lst;
 
-#ifdef USE_FTIME
+    // ftime() needs a little extra help finding the current timezone
+#if defined( HAVE_GETTIMEOFDAY )
+#elif defined( HAVE_GETLOCALTIME )
+#elif defined( HAVE_FTIME )
     struct timeb current;
-#endif /* USE_FTIME */
+#else
+# error Port me
+#endif
 
 #ifdef __CYGWIN32__
     int daylight;
@@ -252,10 +257,15 @@ double sidereal_course(struct tm *gmt, time_t now, double lng) {
              "no daylight savings info ... being hardcoded to %d\n", daylight);
 #endif
 
-#ifdef USE_FTIME
+    // ftime() needs a little extra help finding the current timezone
+#if defined( HAVE_GETTIMEOFDAY )
+#elif defined( HAVE_GETLOCALTIME )
+#elif defined( HAVE_FTIME )
     ftime(&current);
     timezone = current.timezone * 60;
-#endif /* USE_FTIME */
+#else
+# error Port me
+#endif
 
     if ( daylight > 0 ) {
        daylight = 1;
@@ -362,10 +372,13 @@ void fgTimeUpdate(fgFLIGHT *f, struct fgTIME *t) {
 
 
 /* $Log$
-/* Revision 1.37  1998/04/03 22:12:55  curt
-/* Converting to Gnu autoconf system.
-/* Centralized time handling differences.
+/* Revision 1.38  1998/04/08 23:35:40  curt
+/* Tweaks to Gnu automake/autoconf system.
 /*
+ * Revision 1.37  1998/04/03 22:12:55  curt
+ * Converting to Gnu autoconf system.
+ * Centralized time handling differences.
+ *
  * Revision 1.36  1998/03/09 22:48:09  curt
  * Debug message tweaks.
  *

diff --git a/Time/fg_time.h b/Time/fg_time.h
index 376fd7b499ccc6c42649aa2a5ddc6c8ce5d88be8..c520166d51107de039411989a826bb4ca992d7d8 100644 (file)
--- a/Time/fg_time.h
+++ b/Time/fg_time.h
@@ -28,9 +28,11 @@
 #define _FG_TIME_H
 
 
-// #ifdef WIN32
-// #  include <windows.h>
-// #endif
+#include <config.h>
+
+#ifdef HAVE_WINDOWS_H
+#  include <windows.h>
+#endif
 
 #include <GL/glut.h>
 #include <time.h>
@@ -113,10 +115,13 @@ void fgTimeUpdate(fgFLIGHT *f, struct fgTIME *t);
 
 
 /* $Log$
-/* Revision 1.17  1998/04/03 22:12:56  curt
-/* Converting to Gnu autoconf system.
-/* Centralized time handling differences.
+/* Revision 1.18  1998/04/08 23:35:40  curt
+/* Tweaks to Gnu automake/autoconf system.
 /*
+ * Revision 1.17  1998/04/03 22:12:56  curt
+ * Converting to Gnu autoconf system.
+ * Centralized time handling differences.
+ *
  * Revision 1.16  1998/02/07 15:29:47  curt
  * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
  * <chotchkiss@namg.us.anritsu.com>

diff --git a/Weather/Makefile.am b/Weather/Makefile.am
index 4a269239aa5683fed9f7b51a0d7f58e22983216e..a69884293149855a236738a48345cd71b43d8fe7 100644 (file)
--- a/Weather/Makefile.am
+++ b/Weather/Makefile.am
@@ -1,7 +1,7 @@
 libdir = ${exec_prefix}/lib
 
 lib_LTLIBRARIES = libWeather.la
-libWeather_la_SOURCES = \
-       weather.c
+
+libWeather_la_SOURCES = weather.c weather.h
 
 INCLUDES += -I..

diff --git a/Weather/Makefile.in b/Weather/Makefile.in
index bae46fa4f3b50665b70f54effd13e3e73c3ab95b..33fc202846dc653699e9434d75eaa94cb0382fb6 100644 (file)
--- a/Weather/Makefile.in
+++ b/Weather/Makefile.in
@@ -73,8 +73,8 @@ VERSION = @VERSION@
 libdir = ${exec_prefix}/lib
 
 lib_LTLIBRARIES = libWeather.la
-libWeather_la_SOURCES = \
-       weather.c
+
+libWeather_la_SOURCES = weather.c weather.h
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../Simulator/Include/config.h
 CONFIG_CLEAN_FILES =