Added simgear/threads contributed by Bernie Bright.

diff --git a/SimGear.dsp b/SimGear.dsp
index d68ea377160ab27ee9ed9f7a91fac366a4469035..1e79a3ef44c13d0e35bf3eb6e68fdb8dc01891d3 100644 (file)
--- a/SimGear.dsp
+++ b/SimGear.dsp
@@ -243,6 +243,21 @@ SOURCE=.\simgear\ephemeris\neptune.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\simgear\ephemeris\pluto.hxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgephem"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgephem"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\simgear\ephemeris\saturn.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -416,6 +431,21 @@ SOURCE=.\simgear\io\sg_socket.cxx
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
+SOURCE=.\simgear\magvar\coremag.hxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgmagvar"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgmagvar"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\simgear\magvar\coremag.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -634,6 +664,36 @@ SOURCE=.\simgear\metar\Fracpart.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\simgear\metar\Local.h\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgmetar"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgmetar"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\metar\Metar.h\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgmetar"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgmetar"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\simgear\metar\MetarReport.cpp\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -871,6 +931,21 @@ SOURCE=.\simgear\screen\GLBitmaps.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\simgear\screen\GLBitmaps.h\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgscreen"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgscreen"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\simgear\screen\screen-dump.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -883,6 +958,21 @@ SOURCE=.\simgear\screen\screen-dump.cxx
 \r
 !ENDIF \r
 \r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\screen\win32-printer.h\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgscreen"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgscreen"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # Begin Group "Lib_sgserial"\r
@@ -1108,6 +1198,21 @@ SOURCE=.\simgear\timing\event.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\simgear\timing\event.hxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgtiming"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgtiming"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\simgear\timing\#\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1138,6 +1243,21 @@ SOURCE=.\simgear\timing\fg_timer.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\simgear\timing\fg_timer.hxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgtiming"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgtiming"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\simgear\timing\#\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1168,6 +1288,21 @@ SOURCE=.\simgear\timing\light.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\simgear\timing\light.hxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgtiming"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgtiming"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\simgear\timing\#\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1198,6 +1333,21 @@ SOURCE=.\simgear\timing\moonpos.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\simgear\timing\moonpos.hxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgtiming"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgtiming"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\simgear\timing\#\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1228,6 +1378,21 @@ SOURCE=.\simgear\timing\sunpos.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\simgear\timing\sunpos.hxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgtiming"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgtiming"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\simgear\timing\#\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1240,6 +1405,21 @@ SOURCE=.\simgear\timing\#
 \r
 !ENDIF \r
 \r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\timing\timestamp.hxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgtiming"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgtiming"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # Begin Group "Lib_sgxgl"\r
@@ -1281,6 +1461,21 @@ SOURCE=.\simgear\xgl\xglUtils.c
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
+SOURCE=.\simgear\xml\asciitab.h\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgxml"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\simgear\xml\easyxml.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1296,6 +1491,21 @@ SOURCE=.\simgear\xml\easyxml.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\simgear\xml\hashtable.h\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgxml"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\simgear\xml\hashtable.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1311,6 +1521,96 @@ SOURCE=.\simgear\xml\hashtable.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\simgear\xml\iasciitab.h\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgxml"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\xml\latin1tab.h\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgxml"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\xml\nametab.h\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgxml"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\xml\utf8tab.h\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgxml"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\xml\xmldef.h\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgxml"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\xml\xmlparse.h\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgxml"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\simgear\xml\xmlparse.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1326,6 +1626,21 @@ SOURCE=.\simgear\xml\xmlparse.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\simgear\xml\xmlrole.h\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgxml"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\simgear\xml\xmlrole.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1341,6 +1656,21 @@ SOURCE=.\simgear\xml\xmlrole.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\simgear\xml\xmltok.h\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgxml"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\simgear\xml\xmltok.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1353,6 +1683,21 @@ SOURCE=.\simgear\xml\xmltok.c
 \r
 !ENDIF \r
 \r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\xml\xmltok_impl.h\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgxml"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # Begin Group "Lib_z"\r
@@ -1420,6 +1765,21 @@ SOURCE=.\simgear\zlib\deflate.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\simgear\zlib\deflate.h\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_z"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_z"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\simgear\zlib\gzio.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1450,6 +1810,21 @@ SOURCE=.\simgear\zlib\infblock.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\simgear\zlib\infblock.h\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_z"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_z"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\simgear\zlib\infcodes.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1465,6 +1840,21 @@ SOURCE=.\simgear\zlib\infcodes.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\simgear\zlib\infcodes.h\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_z"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_z"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\simgear\zlib\inffast.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1480,6 +1870,36 @@ SOURCE=.\simgear\zlib\inffast.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\simgear\zlib\inffast.h\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_z"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_z"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\zlib\inffixed.h\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_z"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_z"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\simgear\zlib\inflate.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1510,6 +1930,21 @@ SOURCE=.\simgear\zlib\inftrees.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\simgear\zlib\inftrees.h\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_z"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_z"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\simgear\zlib\infutil.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1525,6 +1960,21 @@ SOURCE=.\simgear\zlib\infutil.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\simgear\zlib\infutil.h\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_z"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_z"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\simgear\zlib\trees.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1540,6 +1990,21 @@ SOURCE=.\simgear\zlib\trees.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\simgear\zlib\trees.h\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_z"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_z"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\simgear\zlib\uncompr.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1567,6 +2032,21 @@ SOURCE=.\simgear\zlib\zutil.c
 \r
 !ENDIF \r
 \r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\zlib\zutil.h\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_z"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_z"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/configure.in b/configure.in
index 083e3a5530b7adf575c09920c2bca9607960cad8..07942fe7b01664b13f4872a6f8f5366ab6d6f7d6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -279,6 +279,7 @@ AC_OUTPUT( \
        simgear/screen/Makefile \
        simgear/serial/Makefile \
        simgear/sky/Makefile \
+       simgear/threads/Makefile \
        simgear/timing/Makefile \
        simgear/xgl/Makefile \
        simgear/xml/Makefile \

diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index 56d6c4bff310ead0daf872fcf39f617950978426..3078a18defcc88b36ade144de5736d935f03b4e8 100644 (file)
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -38,6 +38,7 @@ SUBDIRS = \
        screen \
        $(SERIAL_DIRS) \
        sky \
+        threads \
        timing \
        xgl \
        $(ZLIB_DIRS)

diff --git a/simgear/timing/Makefile.am b/simgear/timing/Makefile.am
index 9bd6bfff2ff740eb53448cb17d5f180b372457b1..ffe602fe836d924044f2bda3023004e929fdb74e 100644 (file)
--- a/simgear/timing/Makefile.am
+++ b/simgear/timing/Makefile.am
@@ -13,12 +13,6 @@ libsgtiming_a_SOURCES = \
        geocoord.cxx \
        lowleveltime.cxx \
        sg_time.cxx \
-       timezone.cxx \
-       # event.cxx event.hxx \
-       # fg_timer.cxx fg_timer.hxx \
-       # light.cxx light.hxx \
-       # moonpos.cxx moonpos.hxx \
-       # sunpos.cxx sunpos.hxx \
-       # timestamp.hxx
+       timezone.cxx
 
 INCLUDES += -I$(top_srcdir)

diff --git a/simgear/xml/easyxml.hxx b/simgear/xml/easyxml.hxx
index b042ab395c29cee48a730b4d95a3aaf66ce1c886..1eee84eb8a23c41599f02d0f47a12ef8a213bc09 100644 (file)
--- a/simgear/xml/easyxml.hxx
+++ b/simgear/xml/easyxml.hxx
@@ -376,6 +376,7 @@ public:
 
 
 /**
+ * @relates XMLVisitor
  * Read an XML document.
  *
  * This function reads an XML document from the input stream provided,