Merge branch 'maint'

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

diff --git a/simgear/route/Makefile.am b/simgear/route/Makefile.am
index c1492f4b71aa2bfac71833b615a8754e0d14d834..80a9ea65dc39fcafc6aed844f709a8092e530b8e 100644 (file)
--- a/simgear/route/Makefile.am
+++ b/simgear/route/Makefile.am
@@ -8,27 +8,28 @@ libsgroute_a_SOURCES = \
        route.cxx \
        waypoint.cxx
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir)
-else
 INCLUDES = -I$(top_srcdir)
-endif
 
 noinst_PROGRAMS = waytest routetest
 
 waytest_SOURCES = waytest.cxx
 
 waytest_LDADD = \
-       $(top_builddir)/simgear/route/libsgroute.a \
+       libsgroute.a \
        $(top_builddir)/simgear/math/libsgmath.a \
        $(top_builddir)/simgear/debug/libsgdebug.a \
        $(top_builddir)/simgear/misc/libsgmisc.a \
+       $(top_builddir)/simgear/props/libsgprops.a \
+       $(top_builddir)/simgear/structure/libsgstructure.a \
        $(top_builddir)/simgear/xml/libsgxml.a \
+       $(base_LIBS) \
        -lz
 
 routetest_SOURCES = routetest.cxx
 
 routetest_LDADD = \
-       $(top_builddir)/simgear/route/libsgroute.a \
+       libsgroute.a \
        $(top_builddir)/simgear/math/libsgmath.a \
-       $(top_builddir)/simgear/debug/libsgdebug.a
+       $(top_builddir)/simgear/debug/libsgdebug.a \
+       $(top_builddir)/simgear/structure/libsgstructure.a \
+       $(base_LIBS)