Update the code a bit more, add a function to retreive the last error string and...

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

diff --git a/simgear/misc/Makefile.am b/simgear/misc/Makefile.am
index 0691d537f84ba8d971e3df652f8dda51d0bc7715..f54ba13987e918b01b9e01a1d327bcc3eae11362 100644 (file)
--- a/simgear/misc/Makefile.am
+++ b/simgear/misc/Makefile.am
@@ -1,30 +1,32 @@
-## Process this file with automake to produce Makefile.in
-
-if HAVE_ZLIB
-ZLIB_INCL =
-else
-ZLIB_INCL = -I$(top_builddir)/zlib
-endif
+includedir = @includedir@/misc
 
 lib_LIBRARIES = libsgmisc.a
 
 include_HEADERS = \
-       fgpath.hxx \
-       fgstream.hxx \
+       sg_path.hxx \
+       sgstream.hxx \
        stopwatch.hxx \
        strutils.hxx \
+       tabbed_values.hxx \
        texcoord.hxx \
-       zfstream.hxx
+       zfstream.hxx \
+       interpolator.hxx
 
 libsgmisc_a_SOURCES = \
-       fgpath.cxx \
-       fgstream.cxx \
+       sg_path.cxx \
+       sgstream.cxx \
        strutils.cxx \
+       tabbed_values.cxx \
        texcoord.cxx \
-       zfstream.cxx
+       zfstream.cxx \
+       interpolator.cxx
+
+noinst_PROGRAMS = tabbed_value_test
+
+tabbed_value_test_SOURCES = tabbed_values_test.cxx
+tabbed_value_test_LDADD = \
+       $(top_builddir)/simgear/misc/libsgmisc.a \
+       $(top_builddir)/simgear/xml/libsgxml.a \
+       $(top_builddir)/simgear/debug/libsgdebug.a
 
-INCLUDES += \
-       -I$(top_builddir) \
-       -I$(top_builddir)/bucket \
-       -I$(top_builddir)/math \
-       $(ZLIB_INCL)
+INCLUDES = -I$(top_srcdir)