Migrated this source over to SimGear.

diff --git a/simgear/ephemeris/Makefile.am b/simgear/ephemeris/Makefile.am
index b10bf21ce70152a53efbefdfdbbe9c6a2cadc0fe..fa901de191c9a17b4a2114f59d4e44e17bbf4d0a 100644 (file)
--- 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 59611ef44839d6e6db720a8b0b78f86e3a1f029f..c9cda8b9e9ff93cfdc4c5dcf98e340fa44820681 100644 (file)
--- 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 f6658edd2de7cb3bd6bec81e52ffd597af12f534..063dcf54b00cd9fafb420532857f0de4d37f78da 100644 (file)
--- 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 a490fa2fdca153a999b280ad2c20c7c1e468c976..ddf74ddda8972132fea620865ca7dd02b03e7b14 100644 (file)
--- 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 9501f3c212fe6f9e2bf4ccb8874f3db0ae01e80b..d773e06efef65397a1507772fe0ca4497cd05ea6 100644 (file)
--- 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 2404785136026f89834dd78014008476335189b2..8f92f080818c16fb6aa32a2f283e0f35b47fabff 100644 (file)
--- 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 3b1d65f97d31a53e7b4c9a18eb801b897e973dee..79267dc351e6ca06d5c87eac6f6dedbb7c0877bf 100644 (file)
--- 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 91210753492df9c437d9ee003b0dd9361d4baf25..4f3ca4f8b84d5725d3869b84dd6d90e0f90af737 100644 (file)
--- 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 b837eab5cbc643d9e29d6dc38d9789a6c6c69ae7..17e6f7d106b929fc258d019f07c1addf26e7ee9f 100644 (file)
--- 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 1b5033772fec4008a5bf265fec7eac5f03bf225a..ab42adffb84e3d81a4e7afada25d93660aa9444d 100644 (file)
--- 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 5e1a443154b367d3e4b9459037f529dceefbb5b6..3aff95db49eb7d82ce07a712d138658808980092 100644 (file)
--- 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 7b3b02a51052b7b94ce83a04d3d081558698fa31..5c4ffa690aeb81078c2c98aa176d26dcebb9de28 100644 (file)
--- 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 5773c0d5d4dac4021b7bf0ebaa3c0916ffbb3e71..c5cf448ec80ccc7f16a60bee58ecc5f4b228295a 100644 (file)
--- 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 71b7dd04e87517663f625607da07e5c6644e1fad..aa2935b4d0df34db95b751238a5c32e472386e83 100644 (file)
--- 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"