Merge branch 'tat/framework'

[simgear.git] / simgear / math / Makefile.am

diff --git a/simgear/math/Makefile.am b/simgear/math/Makefile.am
index f187496c843256b92cf60847d53a47939ae7c7d8..466bb790723cf20be2fea7cc202e881821793f91 100644 (file)
--- a/simgear/math/Makefile.am
+++ b/simgear/math/Makefile.am
@@ -1,12 +1,13 @@
 includedir = @includedir@/math
 
-noinst_PROGRAMS = SGMathTest
-check_PROGRAMS  = SGMathTest
+check_PROGRAMS  = SGMathTest SGGeometryTest
 TESTS           = $(check_PROGRAMS)
 
 SGMathTest_SOURCES = SGMathTest.cxx
-SGMathTest_LDADD = libsgmath.a $(base_LIBS)
+SGMathTest_LDADD = libsgmath.a -lsgstructure $(base_LIBS)
 
+SGGeometryTest_SOURCES = SGGeometryTest.cxx
+SGGeometryTest_LDADD = libsgmath.a -lsgstructure $(base_LIBS)
 
 lib_LIBRARIES = libsgmath.a
 
@@ -16,31 +17,40 @@ include_HEADERS = \
        point3d.hxx \
        polar3d.hxx \
        sg_geodesy.hxx \
-       sg_memory.h \
        sg_random.h \
        sg_types.hxx \
        vector.hxx \
-       fastmath.hxx \
+       Math.hxx \
+       SGBox.hxx \
+       SGCMath.hxx \
        SGGeoc.hxx \
        SGGeod.hxx \
        SGGeodesy.hxx \
+       SGGeometry.hxx \
+       SGGeometryFwd.hxx \
+       SGIntersect.hxx \
        SGLimits.hxx \
+       SGLineSegment.hxx \
        SGMatrix.hxx \
        SGMath.hxx \
+       SGMathFwd.hxx \
        SGMisc.hxx \
+       SGPlane.hxx \
        SGQuat.hxx \
+       SGRay.hxx \
+       SGSphere.hxx \
+       SGTriangle.hxx \
+       SGVec2.hxx \
+       SGVec3.hxx \
        SGVec4.hxx \
-       SGVec3.hxx
-
+       beziercurve.hxx
 
 libsgmath_a_SOURCES = \
        interpolater.cxx \
        leastsqs.cxx \
-       polar3d.cxx \
-       sg_geodesy.cxx \
        sg_random.c \
        vector.cxx \
-       fastmath.cxx \
+       SGGeod.cxx \
        SGGeodesy.cxx
 
 INCLUDES = -I$(top_srcdir)