Merge branch 'timoore/clipgroup'

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

diff --git a/simgear/props/Makefile.am b/simgear/props/Makefile.am
index f3ad95d0b9387b1a4ac1e1142174dda748d185f9..acf5201711ec4dfc6eda70fd44fa4af07335467d 100644 (file)
--- a/simgear/props/Makefile.am
+++ b/simgear/props/Makefile.am
@@ -5,12 +5,15 @@ lib_LIBRARIES = libsgprops.a
 include_HEADERS = \
        condition.hxx \
        props.hxx \
-       props_io.hxx
+       props_io.hxx \
+       AtomicChangeListener.hxx \
+       ExtendedPropertyAdapter.hxx
 
 libsgprops_a_SOURCES = \
        condition.cxx \
        props.cxx \
-       props_io.cxx
+       props_io.cxx \
+       AtomicChangeListener.cxx
 
 noinst_PROGRAMS = props_test
 
@@ -20,7 +23,12 @@ props_test_LDADD = \
        $(top_builddir)/simgear/xml/libsgxml.a \
        $(top_builddir)/simgear/misc/libsgmisc.a \
        $(top_builddir)/simgear/debug/libsgdebug.a \
-       $(top_builddir)/simgear/structure/libsgstructure.a \
-       -lOpenThreads
+       $(top_builddir)/simgear/structure/libsgstructure.a
+
+if HAVE_FRAMEWORK_OSG
+props_test_LDFLAGS = $(openthreads_FRAMEWORK)
+else
+props_test_LDFLAGS = -lOpenThreads
+endif
 
 INCLUDES = -I$(top_srcdir)