Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> --- examples/Makefile.am | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/examples/Makefile.am b/examples/Makefile.am index b9b914b..4a3b633 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -29,10 +29,12 @@ check_LIBRARIES = libgtest.a libxorg-gtest.a libxorg-gtest_main.a AM_CPPFLAGS = $(GTEST_CPPFLAGS) AM_CXXFLAGS = $(XSERVER_CFLAGS) $(BASE_CXXFLAGS) +# build googletest as static lib nodist_libgtest_a_SOURCES = $(GTEST_SOURCE)/src/gtest-all.cc libgtest_a_CPPFLAGS = $(AM_CPPFLAGS) -w libgtest_a_CXXFLAGS = $(GTEST_CXXFLAGS) $(AM_CXXFLAGS) +# build xorg-gtest as static lib libxorg_gtest_a_SOURCES = $(top_srcdir)/src/xorg-gtest-all.cpp libxorg_gtest_a_CPPFLAGS = \ $(AM_CPPFLAGS) \ @@ -41,6 +43,7 @@ libxorg_gtest_a_CPPFLAGS = \ -DDUMMY_CONF_PATH="\"$(top_srcdir)/data/xorg/gtest/dummy.conf\"" libxorg_gtest_a_CXXFLAGS = $(GTEST_CXXFLAGS) $(AM_CXXFLAGS) +# build xorg-gtest's main as separate lib for those that need it libxorg_gtest_main_a_SOURCES = $(top_srcdir)/src/xorg-gtest_main.cpp libxorg_gtest_main_a_CPPFLAGS = \ $(AM_CPPFLAGS) \ -- 1.7.10.2 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel