James Turner:

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

diff --git a/simgear/misc/Makefile.am b/simgear/misc/Makefile.am
index 1be8887076397e5f14001a9b5976e8b2103e4863..d27727f560ec9b45a45657c8558f3fd34310a7ec 100644 (file)
--- a/simgear/misc/Makefile.am
+++ b/simgear/misc/Makefile.am
@@ -1,21 +1,17 @@
 includedir = @includedir@/misc
 
-if HAVE_ZLIB
-ZLIB_INCL =
-else
-ZLIB_INCL = -I$(top_srcdir)/src/zlib
-endif
-
 lib_LIBRARIES = libsgmisc.a
 
 include_HEADERS = \
         commands.hxx \
         exception.hxx \
        props.hxx \
+  props_io.hxx \
        sg_path.hxx \
        sgstream.hxx \
        stopwatch.hxx \
        strutils.hxx \
+       tabbed_values.hxx \
        texcoord.hxx \
        zfstream.hxx
 
@@ -27,16 +23,16 @@ libsgmisc_a_SOURCES = \
        sg_path.cxx \
        sgstream.cxx \
        strutils.cxx \
+       tabbed_values.cxx \
        texcoord.cxx \
        zfstream.cxx
 
-noinst_PROGRAMS = props_test
+noinst_PROGRAMS = props_test tabbed_value_test
 
 props_test_SOURCES = props_test.cxx
 props_test_LDADD = libsgmisc.a ../xml/libsgxml.a ../debug/libsgdebug.a
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) $(ZLIB_INCL)
-else
-INCLUDES = -I$(top_srcdir) $(ZLIB_INCL)
-endif
+tabbed_value_test_SOURCES = tabbed_values_test.cxx
+tabbed_value_test_LDADD = libsgmisc.a ../debug/libsgdebug.a
+
+INCLUDES = -I$(top_srcdir)