From a46163bcd7fe4daa2bcfc95d6d609870797bad70 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Wed, 5 Jul 2000 00:20:08 +0000
Subject: [PATCH] Migrated this source over to SimGear.

---
 simgear/ephemeris/Makefile.am       | 46 +++++++++++++++++++----------
 simgear/ephemeris/celestialBody.hxx |  3 +-
 simgear/ephemeris/ephemeris.hxx     |  2 +-
 simgear/ephemeris/jupiter.hxx       |  3 +-
 simgear/ephemeris/mars.hxx          |  3 +-
 simgear/ephemeris/mercury.hxx       |  3 +-
 simgear/ephemeris/moon.cxx          | 11 +------
 simgear/ephemeris/moon.hxx          |  5 +---
 simgear/ephemeris/neptune.hxx       |  3 +-
 simgear/ephemeris/saturn.hxx        |  3 +-
 simgear/ephemeris/star.cxx          |  4 ---
 simgear/ephemeris/star.hxx          |  2 +-
 simgear/ephemeris/uranus.hxx        |  3 +-
 simgear/ephemeris/venus.hxx         |  3 +-
 14 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/simgear/ephemeris/Makefile.am b/simgear/ephemeris/Makefile.am
index b10bf21c..fa901de1 100644
--- a/simgear/ephemeris/Makefile.am
+++ b/simgear/ephemeris/Makefile.am
@@ -1,18 +1,34 @@
-noinst_LIBRARIES = libEphemeris.a
+includedir = @includedir@/ephemeris
 
-libEphemeris_a_SOURCES = \
-	celestialBody.cxx celestialBody.hxx \
-	ephemeris.cxx ephemeris.hxx \
-	jupiter.cxx jupiter.hxx \
-	mars.cxx mars.hxx \
-	mercury.cxx mercury.hxx \
-	moon.cxx moon.hxx \
-	neptune.cxx neptune.hxx \
+lib_LIBRARIES = libsgephem.a
+
+include_HEADERS = \
+	celestialBody.hxx \
+        ephemeris.hxx \
+	jupiter.hxx \
+	mars.hxx \
+	mercury.hxx \
+	moon.hxx \
+	neptune.hxx \
+	saturn.hxx \
+	star.hxx \
+	stars.hxx \
+	uranus.hxx \
+	venus.hxx
+
+libsgephem_a_SOURCES = \
+	celestialBody.cxx \
+	ephemeris.cxx \
+	jupiter.cxx \
+	mars.cxx \
+	mercury.cxx \
+	moon.cxx \
+	neptune.cxx \
 	pluto.hxx \
-	saturn.cxx saturn.hxx \
-	star.cxx star.hxx \
-	stars.cxx stars.hxx \
-	uranus.cxx uranus.hxx \
-	venus.cxx venus.hxx
+	saturn.cxx \
+	star.cxx \
+	stars.cxx \
+	uranus.cxx \
+	venus.cxx
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/src
+INCLUDES += -I$(top_builddir)
diff --git a/simgear/ephemeris/celestialBody.hxx b/simgear/ephemeris/celestialBody.hxx
index 59611ef4..c9cda8b9 100644
--- a/simgear/ephemeris/celestialBody.hxx
+++ b/simgear/ephemeris/celestialBody.hxx
@@ -32,8 +32,7 @@
 
 
 #include <simgear/constants.h>
-
-#include <Time/fg_time.hxx>
+#include <simgear/timing/fg_time.hxx>
 
 class Star;
 
diff --git a/simgear/ephemeris/ephemeris.hxx b/simgear/ephemeris/ephemeris.hxx
index f6658edd..063dcf54 100644
--- a/simgear/ephemeris/ephemeris.hxx
+++ b/simgear/ephemeris/ephemeris.hxx
@@ -32,7 +32,7 @@
 
 #include <plib/sg.h>
 
-#include <Time/fg_time.hxx>
+#include <simgear/timing/fg_time.hxx>
 
 #include "star.hxx"
 #include "moon.hxx"
diff --git a/simgear/ephemeris/jupiter.hxx b/simgear/ephemeris/jupiter.hxx
index a490fa2f..ddf74ddd 100644
--- a/simgear/ephemeris/jupiter.hxx
+++ b/simgear/ephemeris/jupiter.hxx
@@ -24,7 +24,8 @@
 #ifndef _JUPITER_HXX_
 #define _JUPITER_HXX_
 
-#include <Time/fg_time.hxx>
+#include <simgear/timing/fg_time.hxx>
+
 #include "celestialBody.hxx"
 #include "star.hxx"
 
diff --git a/simgear/ephemeris/mars.hxx b/simgear/ephemeris/mars.hxx
index 9501f3c2..d773e06e 100644
--- a/simgear/ephemeris/mars.hxx
+++ b/simgear/ephemeris/mars.hxx
@@ -24,7 +24,8 @@
 #ifndef _MARS_HXX_
 #define _MARS_HXX_
 
-#include <Time/fg_time.hxx>
+#include <simgear/timing/fg_time.hxx>
+
 #include "celestialBody.hxx"
 #include "star.hxx"
 
diff --git a/simgear/ephemeris/mercury.hxx b/simgear/ephemeris/mercury.hxx
index 24047851..8f92f080 100644
--- a/simgear/ephemeris/mercury.hxx
+++ b/simgear/ephemeris/mercury.hxx
@@ -24,7 +24,8 @@
 #ifndef _MERCURY_HXX_
 #define _MERCURY_HXX_
 
-#include <Time/fg_time.hxx>
+#include <simgear/timing/fg_time.hxx>
+
 #include "celestialBody.hxx"
 #include "star.hxx"
 
diff --git a/simgear/ephemeris/moon.cxx b/simgear/ephemeris/moon.cxx
index 3b1d65f9..79267dc3 100644
--- a/simgear/ephemeris/moon.cxx
+++ b/simgear/ephemeris/moon.cxx
@@ -28,15 +28,12 @@
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/fgpath.hxx>
 
-#include <Main/options.hxx>
-#include <Objects/texload.h>
-
 #ifdef __BORLANDC__
 #  define exception c_exception
 #endif
 #include <math.h>
 
-#include <FDM/flight.hxx>
+// #include <FDM/flight.hxx>
 
 #include "moon.hxx"
 
@@ -89,12 +86,6 @@ void Moon::updatePosition(FGTime *t, double lat, Star *ourSun)
     Ls, Lm, D, F, mpar, gclat, rho, HA, g,
     geoRa, geoDec;
   
-  fgAIRCRAFT *air;
-  FGInterface *f;
-
-  air = &current_aircraft;
-  f = air->fdm_state;
- 
   updateOrbElements(t);
   actTime = fgCalcActTime(t);
 
diff --git a/simgear/ephemeris/moon.hxx b/simgear/ephemeris/moon.hxx
index 91210753..4f3ca4f8 100644
--- a/simgear/ephemeris/moon.hxx
+++ b/simgear/ephemeris/moon.hxx
@@ -26,10 +26,7 @@
 
 
 #include <simgear/constants.h>
-
-#include <Aircraft/aircraft.hxx>
-#include <Main/views.hxx>
-#include <Time/fg_time.hxx>
+#include <simgear/timing/fg_time.hxx>
 
 #include "celestialBody.hxx"
 #include "star.hxx"
diff --git a/simgear/ephemeris/neptune.hxx b/simgear/ephemeris/neptune.hxx
index b837eab5..17e6f7d1 100644
--- a/simgear/ephemeris/neptune.hxx
+++ b/simgear/ephemeris/neptune.hxx
@@ -24,7 +24,8 @@
 #ifndef _NEPTUNE_HXX_
 #define _NEPTUNE_HXX_
 
-#include <Time/fg_time.hxx>
+#include <simgear/timing/fg_time.hxx>
+
 #include "celestialBody.hxx"
 #include "star.hxx"
 
diff --git a/simgear/ephemeris/saturn.hxx b/simgear/ephemeris/saturn.hxx
index 1b503377..ab42adff 100644
--- a/simgear/ephemeris/saturn.hxx
+++ b/simgear/ephemeris/saturn.hxx
@@ -24,7 +24,8 @@
 #ifndef _SATURN_HXX_
 #define _SATURN_HXX_
 
-#include <Time/fg_time.hxx>
+#include <simgear/timing/fg_time.hxx>
+
 #include "celestialBody.hxx"
 #include "star.hxx"
 
diff --git a/simgear/ephemeris/star.cxx b/simgear/ephemeris/star.cxx
index 5e1a4431..3aff95db 100644
--- a/simgear/ephemeris/star.cxx
+++ b/simgear/ephemeris/star.cxx
@@ -30,10 +30,6 @@
 
 #include <simgear/debug/logstream.hxx>
 
-#include <Time/sunpos.hxx>
-#include <Time/light.hxx>
-#include <Main/options.hxx>
-
 #include "star.hxx"
 
 
diff --git a/simgear/ephemeris/star.hxx b/simgear/ephemeris/star.hxx
index 7b3b02a5..5c4ffa69 100644
--- a/simgear/ephemeris/star.hxx
+++ b/simgear/ephemeris/star.hxx
@@ -25,7 +25,7 @@
 #define _STAR_HXX_
 
 
-#include <Time/fg_time.hxx>
+// #include <Time/fg_time.hxx>
 #include "celestialBody.hxx"
 
 
diff --git a/simgear/ephemeris/uranus.hxx b/simgear/ephemeris/uranus.hxx
index 5773c0d5..c5cf448e 100644
--- a/simgear/ephemeris/uranus.hxx
+++ b/simgear/ephemeris/uranus.hxx
@@ -24,7 +24,8 @@
 #ifndef _URANUS_HXX_
 #define _URANUS_HXX_
 
-#include <Time/fg_time.hxx>
+#include <simgear/timing/fg_time.hxx>
+
 #include "celestialBody.hxx"
 #include "star.hxx"
 
diff --git a/simgear/ephemeris/venus.hxx b/simgear/ephemeris/venus.hxx
index 71b7dd04..aa2935b4 100644
--- a/simgear/ephemeris/venus.hxx
+++ b/simgear/ephemeris/venus.hxx
@@ -24,7 +24,8 @@
 #ifndef _VENUS_HXX_
 #define _VENUS_HXX_
 
-#include <Time/fg_time.hxx>
+#include <simgear/timing/fg_time.hxx>
+
 #include "celestialBody.hxx"
 #include "star.hxx"