Merge branch 'master' into next

[flightgear.git] / src / Navaids / Makefile.am

diff --git a/src/Navaids/Makefile.am b/src/Navaids/Makefile.am
index 58b602bacfa04d5e709ca253c954dffd7491cadb..a1f38ed14b250e368f036d6e86b629527f6fe66f 100644 (file)
--- a/src/Navaids/Makefile.am
+++ b/src/Navaids/Makefile.am
@@ -1,10 +1,21 @@
-noinst_LIBRARIES = libNavAids.a
+noinst_LIBRARIES = libNavaids.a
 
-noinst_PROGRAMS = testnavs
+# noinst_PROGRAMS = testnavs
 
-libNavAids_a_SOURCES = navaid.hxx navaids.hxx navaids.cxx
+libNavaids_a_SOURCES = \
+       navdb.hxx navdb.cxx \
+       fix.hxx fixlist.hxx fixlist.cxx \
+       awynet.hxx awynet.cxx \
+       navrecord.hxx navrecord.cxx \
+       navlist.hxx navlist.cxx \
+       positioned.hxx positioned.cxx \
+       markerbeacon.hxx markerbeacon.cxx
 
-testnavs_SOURCES = testnavs.cxx
-testnavs_LDADD = libNavAids.a -lsgdebug -lsgmath -lsgmisc -lz
+#
+# testnavs_SOURCES = testnavs.cxx
+# testnavs_LDADD = \
+#      libNavaids.a \
+#      -lsgtiming -lsgmath -lsgmisc -lsgdebug -lsgmagvar -lsgxml \
+#      -lsgstructure $(base_LIBS) -lz
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/src
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src