Minor tweaks and clean ups.

diff --git a/simgear/scene/model/Makefile.am b/simgear/scene/model/Makefile.am
index 661f294caa32d75a78ee0ec418c0541d8ba529b3..f0dcd8e5acd34ec84630eb17e9171a1f1d15da06 100644 (file)
--- a/simgear/scene/model/Makefile.am
+++ b/simgear/scene/model/Makefile.am
@@ -4,8 +4,8 @@ lib_LIBRARIES = libsgmodel.a
 
 noinst_HEADERS =
 
-include_HEADERS = animation.hxx location.hxx
+include_HEADERS = animation.hxx location.hxx placement.hxx
 
-libsgmodel_a_SOURCES = animation.cxx location.cxx
+libsgmodel_a_SOURCES = animation.cxx location.cxx placement.cxx
 
 INCLUDES = -I$(top_srcdir)

diff --git a/simgear/scene/model/animation.hxx b/simgear/scene/model/animation.hxx
index a59c0404a7b7b542af190517ef2475d5ef35d8ab..76cf8233b552e6ed82bdc36195e9f3d65da32595 100644 (file)
--- a/simgear/scene/model/animation.hxx
+++ b/simgear/scene/model/animation.hxx
@@ -22,16 +22,8 @@ SG_USING_STD(vector);
 
 
 // Don't pull in the headers, since we don't need them here.
-class ssgBranch;
-class ssgCutout;
-class ssgEntity;
-class ssgRangeSelector;
-class ssgSelector;
-class ssgTransform;
-
 class SGInterpTable;
 class FGCondition;
-class FGLocation;
 
 
 // Has anyone done anything *really* stupid, like making min and max macros?

diff --git a/simgear/scene/model/location.hxx b/simgear/scene/model/location.hxx
index 0cba6378b4dd07c4a33d65a3cca1e86084df2a23..f7b141d0ab8ecf148b47eb303e42e24a0e99c2a2 100644 (file)
--- a/simgear/scene/model/location.hxx
+++ b/simgear/scene/model/location.hxx
@@ -21,8 +21,8 @@
 // $Id$
 
 
-#ifndef _LOCATION_HXX
-#define _LOCATION_HXX
+#ifndef _SG_LOCATION_HXX
+#define _SG_LOCATION_HXX
 
 
 #ifndef __cplusplus                                                          
@@ -35,8 +35,6 @@
 
 #include <plib/sg.h>           // plib include
 
-// #include "fgfs.hxx"
-
 
 // Define a structure containing view information
 class FGLocation
@@ -184,4 +182,4 @@ private:
 };
 
 
-#endif // _LOCATION_HXX
+#endif // _SG_LOCATION_HXX