X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fmisc%2FMakefile.am;h=ae696e797011e28f4f35a706392a478d0b1cc864;hb=e4e31be7d43569a92a5d9fa7e784381b66cbd95a;hp=b11191802215a5b35e8570886d7009478e1e0067;hpb=a1bf8d22297416de9524370f4c0d4f0f0c9e89d4;p=simgear.git

diff --git a/simgear/misc/Makefile.am b/simgear/misc/Makefile.am
index b1119180..ae696e79 100644
--- a/simgear/misc/Makefile.am
+++ b/simgear/misc/Makefile.am
@@ -1,29 +1,49 @@
 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 \
+	ResourceManager.hxx \
+	sg_sleep.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 \
+	ResourceManager.cxx \
+	sg_sleep.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)