From: Josh Durgin Date: Thu, 23 Jun 2016 00:38:58 +0000 (-0700) Subject: Makefile.am: do not build libraries for installing X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4b8433e25f10591a93a60616398717aac8bd943c;p=googletest.git Makefile.am: do not build libraries for installing ceph-test only needs the static versions to link against. Without this, the debian package build fails because some ceph-test binaries end up dynamically linked to libgtest and libgmock, which we do not want to distribute. Signed-off-by: Josh Durgin --- diff --git a/googlemock/Makefile.am b/googlemock/Makefile.am index 9adbc51..330bbf5 100644 --- a/googlemock/Makefile.am +++ b/googlemock/Makefile.am @@ -21,7 +21,7 @@ if HAVE_PTHREADS endif # Build rules for libraries. -lib_LTLIBRARIES = lib/libgmock.la lib/libgmock_main.la +noinst_LTLIBRARIES = lib/libgmock.la lib/libgmock_main.la lib_libgmock_la_SOURCES = src/gmock-all.cc diff --git a/googletest/Makefile.am b/googletest/Makefile.am index 29797e4..db93a67 100644 --- a/googletest/Makefile.am +++ b/googletest/Makefile.am @@ -180,7 +180,7 @@ else endif # Build rules for libraries. -lib_LTLIBRARIES = lib/libgtest.la lib/libgtest_main.la +noinst_LTLIBRARIES = lib/libgtest.la lib/libgtest_main.la lib_libgtest_la_SOURCES = src/gtest-all.cc @@ -223,7 +223,7 @@ lib_libgtest_main_la_LIBADD = lib/libgtest.la # TESTS -- Programs run automatically by "make check" # check_PROGRAMS -- Programs built by "make check" but not necessarily run -noinst_LTLIBRARIES = samples/libsamples.la +noinst_LTLIBRARIES += samples/libsamples.la samples_libsamples_la_SOURCES = \ samples/sample1.cc \