From 1c32f3e2831aefdf50fd226d3e1b314c804afc3b Mon Sep 17 00:00:00 2001
From: Chris Dyer <cdyer@cs.cmu.edu>
Date: Wed, 2 May 2012 02:30:52 -0400
Subject: remove dependency on gtest, remove all-static

---
 utils/Makefile.am | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'utils/Makefile.am')

diff --git a/utils/Makefile.am b/utils/Makefile.am
index 2fc6ae21..46650c75 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -4,7 +4,6 @@ bin_PROGRAMS = reconstruct_weights atools
 noinst_PROGRAMS = ts phmt mfcr_test
 TESTS = ts phmt mfcr_test
 
-if HAVE_GTEST
 noinst_PROGRAMS += \
   crp_test \
   dict_test \
@@ -14,7 +13,6 @@ noinst_PROGRAMS += \
   small_vector_test
 
 TESTS += crp_test small_vector_test logval_test weights_test dict_test m_test
-endif
 
 reconstruct_weights_SOURCES = reconstruct_weights.cc
 
@@ -44,23 +42,23 @@ endif
 phmt_SOURCES = phmt.cc
 ts_SOURCES = ts.cc
 m_test_SOURCES = m_test.cc
-m_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS)
+m_test_LDADD = $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS)
 dict_test_SOURCES = dict_test.cc
-dict_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS)
+dict_test_LDADD = $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS)
 mfcr_test_SOURCES = mfcr_test.cc
-mfcr_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS)
+mfcr_test_LDADD = $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS)
 weights_test_SOURCES = weights_test.cc
-weights_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS)
+weights_test_LDADD = $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS)
 crp_test_SOURCES = crp_test.cc
-crp_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS)
+crp_test_LDADD = $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS)
 logval_test_SOURCES = logval_test.cc
-logval_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS)
+logval_test_LDADD = $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS)
 small_vector_test_SOURCES = small_vector_test.cc
-small_vector_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS)
+small_vector_test_LDADD = $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS)
 
 AM_LDFLAGS = libutils.a -lz
 
 ################################################################
 # do NOT NOT NOT add any other -I includes NO NO NO NO NO ######
-AM_CPPFLAGS = -W -Wall -Wno-sign-compare $(GTEST_CPPFLAGS) -I.
+AM_CPPFLAGS = -DBOOST_TEST_DYN_LINK -W -Wall -Wno-sign-compare -I.
 ################################################################
-- 
cgit v1.2.3