Move SGReadFileCallback from model.cxx to public class ModelRegistry

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

diff --git a/simgear/misc/Makefile.am b/simgear/misc/Makefile.am
index f54ba13987e918b01b9e01a1d327bcc3eae11362..980e032164ce1b5310b9df485e8659fe79ec0d14 100644 (file)
--- a/simgear/misc/Makefile.am
+++ b/simgear/misc/Makefile.am
@@ -10,7 +10,8 @@ include_HEADERS = \
        tabbed_values.hxx \
        texcoord.hxx \
        zfstream.hxx \
-       interpolator.hxx
+       interpolator.hxx \
+       stdint.hxx
 
 libsgmisc_a_SOURCES = \
        sg_path.cxx \
@@ -21,12 +22,20 @@ libsgmisc_a_SOURCES = \
        zfstream.cxx \
        interpolator.cxx
 
-noinst_PROGRAMS = tabbed_value_test
+noinst_PROGRAMS = tabbed_value_test swap_test
 
 tabbed_value_test_SOURCES = tabbed_values_test.cxx
 tabbed_value_test_LDADD = \
-       $(top_builddir)/simgear/misc/libsgmisc.a \
+       libsgmisc.a \
        $(top_builddir)/simgear/xml/libsgxml.a \
        $(top_builddir)/simgear/debug/libsgdebug.a
 
+$(top_builddir)/simgear/xml/libsgxml.a:
+       cd $(top_builddir)/simgear/xml && $(MAKE) $(AM_MAKEFLAGS) libsgxml.a
+
+$(top_builddir)/simgear/debug/libsgdebug.a:
+       cd $(top_builddir)/simgear/debug && $(MAKE) $(AM_MAKEFLAGS) libsgdebug.a
+
+swap_test_SOURCES = swap_test.cpp
+
 INCLUDES = -I$(top_srcdir)