James Turner:

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

diff --git a/simgear/misc/Makefile.am b/simgear/misc/Makefile.am
index 0691d537f84ba8d971e3df652f8dda51d0bc7715..d27727f560ec9b45a45657c8558f3fd34310a7ec 100644 (file)
--- a/simgear/misc/Makefile.am
+++ b/simgear/misc/Makefile.am
@@ -1,30 +1,38 @@
-## 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 \
+        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
 
 libsgmisc_a_SOURCES = \
-       fgpath.cxx \
-       fgstream.cxx \
+        commands.cxx \
+        exception.cxx \
+       props.cxx \
+        props_io.cxx \
+       sg_path.cxx \
+       sgstream.cxx \
        strutils.cxx \
+       tabbed_values.cxx \
        texcoord.cxx \
        zfstream.cxx
 
-INCLUDES += \
-       -I$(top_builddir) \
-       -I$(top_builddir)/bucket \
-       -I$(top_builddir)/math \
-       $(ZLIB_INCL)
+noinst_PROGRAMS = props_test tabbed_value_test
+
+props_test_SOURCES = props_test.cxx
+props_test_LDADD = libsgmisc.a ../xml/libsgxml.a ../debug/libsgdebug.a
+
+tabbed_value_test_SOURCES = tabbed_values_test.cxx
+tabbed_value_test_LDADD = libsgmisc.a ../debug/libsgdebug.a
+
+INCLUDES = -I$(top_srcdir)