X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fprops%2FMakefile.am;h=658fe126763a57ae8eb9dce1856eaac5dcf6f9e0;hb=fdcf53c6886bbb73eb5094a6a1a16378059ecd4c;hp=f3ad95d0b9387b1a4ac1e1142174dda748d185f9;hpb=7e7ce2f38e87d6244e05730fa4382da088bb25f1;p=simgear.git diff --git a/simgear/props/Makefile.am b/simgear/props/Makefile.am index f3ad95d0..658fe126 100644 --- a/simgear/props/Makefile.am +++ b/simgear/props/Makefile.am @@ -5,14 +5,17 @@ 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 +check_PROGRAMS = props_test props_test_SOURCES = props_test.cxx props_test_LDADD = \ @@ -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)