Patch from Cameron Moore:

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

diff --git a/simgear/misc/Makefile.am b/simgear/misc/Makefile.am
index f2166e1fdea6e0828f6f9ec7f1ca15d1668d80aa..865678b38eb05d9dbbb57bfbe976ed0670934dda 100644 (file)
--- a/simgear/misc/Makefile.am
+++ b/simgear/misc/Makefile.am
@@ -1,28 +1,37 @@
 includedir = @includedir@/misc
 
-if HAVE_ZLIB
-ZLIB_INCL =
-else
-ZLIB_INCL = -I$(top_builddir)/src/zlib
-endif
-
 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 \
        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 \
        texcoord.cxx \
        zfstream.cxx
 
-INCLUDES += -I$(top_builddir) $(ZLIB_INCL)
+noinst_PROGRAMS = props_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)
+else
+INCLUDES = -I$(top_srcdir)
+endif