Updates to build system to better support automake-1.5

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

diff --git a/simgear/misc/Makefile.am b/simgear/misc/Makefile.am
index 002ffab8b70c7abf0b6cb38c3705de6f8a41801f..1be8887076397e5f14001a9b5976e8b2103e4863 100644 (file)
--- a/simgear/misc/Makefile.am
+++ b/simgear/misc/Makefile.am
@@ -9,21 +9,34 @@ endif
 lib_LIBRARIES = libsgmisc.a
 
 include_HEADERS = \
-       fgpath.hxx \
-       fgstream.hxx \
+        commands.hxx \
+        exception.hxx \
        props.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
 
+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) $(ZLIB_INCL)
+else
+INCLUDES = -I$(top_srcdir) $(ZLIB_INCL)
+endif