includedir = @includedir@/misc
-if HAVE_ZLIB
-ZLIB_INCL =
-else
-ZLIB_INCL = -I$(top_srcdir)/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
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
+
+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
-noinst_PROGRAMS = props_test
+$(top_builddir)/simgear/debug/libsgdebug.a:
+ cd $(top_builddir)/simgear/debug && $(MAKE) $(AM_MAKEFLAGS) libsgdebug.a
-props_test_SOURCES = props_test.cxx props_test.hxx
-props_test_LDADD = libsgmisc.a ../xml/libsgxml.a ../debug/libsgdebug.a
+swap_test_SOURCES = swap_test.cpp
-INCLUDES += -I$(top_srcdir) $(ZLIB_INCL)
+INCLUDES = -I$(top_srcdir)