X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fprops%2FMakefile.am;h=23666451fc20960f24cd53bab0109612ec77f901;hb=203d1c2b45a3b45319c38c5302dfcdee6fd42ee4;hp=f3ad95d0b9387b1a4ac1e1142174dda748d185f9;hpb=6723ef95c2a71b2be52c87abbb206eae563efaa7;p=simgear.git

diff --git a/simgear/props/Makefile.am b/simgear/props/Makefile.am
index f3ad95d0..23666451 100644
--- a/simgear/props/Makefile.am
+++ b/simgear/props/Makefile.am
@@ -5,14 +5,20 @@ lib_LIBRARIES = libsgprops.a
 include_HEADERS = \
 	condition.hxx \
 	props.hxx \
-	props_io.hxx
+	props_io.hxx \
+	AtomicChangeListener.hxx \
+	ExtendedPropertyAdapter.hxx \
+	propertyObject.hxx
 
 libsgprops_a_SOURCES = \
 	condition.cxx \
 	props.cxx \
-	props_io.cxx
+	props_io.cxx \
+	AtomicChangeListener.cxx \
+	propertyObject.cxx
 
-noinst_PROGRAMS = props_test
+check_PROGRAMS = props_test propertyObject_test
+TESTS           = propertyObject_test
 
 props_test_SOURCES = props_test.cxx
 props_test_LDADD = \
@@ -20,7 +26,21 @@ 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
+
+propertyObject_test_SOURCES = propertyObject_test.cxx
+propertyObject_test_LDADD = \
+	libsgprops.a \
+	$(top_builddir)/simgear/xml/libsgxml.a \
+	$(top_builddir)/simgear/misc/libsgmisc.a \
+	$(top_builddir)/simgear/debug/libsgdebug.a \
+	$(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)