]> git-server-git.apps.pok.os.sepia.ceph.com Git - googletest.git/commitdiff
Makefile.am: do not build libraries for installing
authorJosh Durgin <jdurgin@redhat.com>
Thu, 23 Jun 2016 00:38:58 +0000 (17:38 -0700)
committerJosh Durgin <jdurgin@redhat.com>
Thu, 23 Jun 2016 01:17:02 +0000 (18:17 -0700)
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 <jdurgin@redhat.com>
googlemock/Makefile.am
googletest/Makefile.am

index 9adbc5163dd7191a14a887a384fb5d6d2956b44d..330bbf57d2147872725bbf3eaa7a79714705d05c 100644 (file)
@@ -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
 
index 29797e4e9de4e1d5e5f93bba14288de87f623946..db93a67fe73053f41e179ef52c74e472e906aac6 100644 (file)
@@ -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 \