From: Dan Mick <dan.mick@dreamhost.com>
Date: Sat, 28 Apr 2012 01:04:34 +0000 (-0700)
Subject: Stop rebuild of libcommon.la on "make dist"
X-Git-Tag: v0.47~90^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f922dc4355dff2d8de1540aa8bcdfd1c93e74e29;p=ceph.git

Stop rebuild of libcommon.la on "make dist"

Fixes: 2356
Reviewed-by: Josh Durgin <josh.durgin@dreamhost.com>
---

diff --git a/src/Makefile.am b/src/Makefile.am
index bfbf5e648a32..2a7e0bd30222 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -534,9 +534,9 @@ unittest_ceph_argparse_LDADD = libglobal.la ${UNITTEST_LDADD}
 unittest_ceph_argparse_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
 check_PROGRAMS += unittest_ceph_argparse
 
-unittest_osd_types_SOURCES = test/test_osd_types.cc libcommon.la
+unittest_osd_types_SOURCES = test/test_osd_types.cc
 unittest_osd_types_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
-unittest_osd_types_LDADD = libglobal.la $(PTHREAD_LIBS) -lm ${UNITTEST_LDADD} $(CRYPTO_LIBS) $(EXTRALIBS)
+unittest_osd_types_LDADD = libglobal.la libcommon.la $(PTHREAD_LIBS) -lm ${UNITTEST_LDADD} $(CRYPTO_LIBS) $(EXTRALIBS)
 check_PROGRAMS += unittest_osd_types
 
 unittest_gather_SOURCES = test/gather.cc