Removal of PLIB/SG from SimGear

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

diff --git a/simgear/misc/Makefile.am b/simgear/misc/Makefile.am
index b11191802215a5b35e8570886d7009478e1e0067..0e0fc94993a0833de1f8dcea4dd5ed0ec4674ae8 100644 (file)
--- a/simgear/misc/Makefile.am
+++ b/simgear/misc/Makefile.am
@@ -1,29 +1,45 @@
 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 \
-       props.hxx \
+       sg_path.hxx \
+       sgstream.hxx \
        stopwatch.hxx \
        strutils.hxx \
+       tabbed_values.hxx \
        texcoord.hxx \
-       zfstream.hxx
+       zfstream.hxx \
+       interpolator.hxx \
+       stdint.hxx \
+       PathOptions.hxx \
+       sg_dir.hxx
 
 libsgmisc_a_SOURCES = \
-       fgpath.cxx \
-       fgstream.cxx \
-       props.cxx \
-        props_io.cxx \
+       sg_path.cxx \
+       sgstream.cxx \
        strutils.cxx \
+       tabbed_values.cxx \
        texcoord.cxx \
-       zfstream.cxx
+       zfstream.cxx \
+       interpolator.cxx \
+       PathOptions.cxx \
+       sg_dir.cxx
+
+#noinst_PROGRAMS = tabbed_value_test swap_test
+
+#tabbed_value_test_SOURCES = tabbed_values_test.cxx
+#tabbed_value_test_LDADD = \
+#      libsgmisc.a \
+#      $(top_builddir)/simgear/xml/libsgxml.a \
+#      $(top_builddir)/simgear/debug/libsgdebug.a
+
+$(top_builddir)/simgear/xml/libsgxml.a:
+       cd $(top_builddir)/simgear/xml && $(MAKE) $(AM_MAKEFLAGS) libsgxml.a
+
+$(top_builddir)/simgear/debug/libsgdebug.a:
+       cd $(top_builddir)/simgear/debug && $(MAKE) $(AM_MAKEFLAGS) libsgdebug.a
+
+#swap_test_SOURCES = swap_test.cpp
 
-INCLUDES += -I$(top_builddir) $(ZLIB_INCL)
+INCLUDES = -I$(top_srcdir)