From: Andrew Gallagher <agallagher@fb.com>
Date: Mon, 9 Jul 2012 03:11:11 +0000 (-0700)
Subject: folly: fix build on ubuntu and fedora platforms
X-Git-Tag: v0.22.0~1247
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=dcf79b80f522f1a6482b426d65829b1d033e794a;p=folly.git

folly: fix build on ubuntu and fedora platforms

Summary:
A boost regex dependency wasn't added to the Makefile.am file.  Also
the it appears that boost thread lib dependencies had a typo in the
makefile variable name.

Test Plan: ran builds on ubunutu and fedora VMs

Reviewed By: tudorb@fb.com

FB internal diff: D514039
---

diff --git a/folly/Makefile.am b/folly/Makefile.am
index baeec4ee..0d395a8b 100644
--- a/folly/Makefile.am
+++ b/folly/Makefile.am
@@ -107,7 +107,7 @@ libfolly_la_SOURCES = \
 	FormatTables.cpp \
 	String.cpp
 
-libfolly_la_LIBADD = $(BOOST_THREAD_LIBS) -lpthread
+libfolly_la_LIBADD = $(BOOST_THREAD_LIB) -lpthread
 
 FingerprintTables.cpp: generate_fingerprint_tables
 	./generate_fingerprint_tables
@@ -117,7 +117,7 @@ libfollyfingerprint_la_SOURCES = \
 libfollyfingerprint_la_LIBADD = libfolly.la
 
 libfollybenchmark_la_SOURCES = Benchmark.cpp
-libfollybenchmark_la_LIBADD = -lrt libfolly.la
+libfollybenchmark_la_LIBADD = $(BOOST_REGEX_LIB) -lrt libfolly.la
 
 libfollytimeout_queue_la_SOURCES = TimeoutQueue.cpp
 libfollytimeout_queue_la_LIBADD = libfolly.la
diff --git a/folly/test/Makefile.am b/folly/test/Makefile.am
index 73bf08cc..43e1ca9a 100644
--- a/folly/test/Makefile.am
+++ b/folly/test/Makefile.am
@@ -114,7 +114,7 @@ endian_test_LDADD = libgtestmain.la $(top_builddir)/libfolly.la
 TESTS += endian_test
 
 rw_spinlock_test_SOURCES = RWSpinLockTest.cpp
-rw_spinlock_test_LDADD = libgtestmain.la $(top_builddir)/libfollybenchmark.la $(top_builddir)/libfolly.la  $(BOOST_THREAD_LIBS)
+rw_spinlock_test_LDADD = libgtestmain.la $(top_builddir)/libfollybenchmark.la $(top_builddir)/libfolly.la  $(BOOST_THREAD_LIB)
 TESTS += rw_spinlock_test
 
 synchronized_test_SOURCES = SynchronizedTest.cpp
@@ -126,7 +126,7 @@ concurrent_skiplist_test_LDADD = libgtest.la $(top_builddir)/libfolly.la
 TESTS += concurrent_skiplist_test
 
 concurrent_skiplist_benchmark_SOURCES = ConcurrentSkipListBenchmark.cpp
-concurrent_skiplist_benchmark_LDADD = $(top_builddir)/libfollybenchmark.la $(top_builddir)/libfolly.la  $(BOOST_THREAD_LIBS)
+concurrent_skiplist_benchmark_LDADD = $(top_builddir)/libfollybenchmark.la $(top_builddir)/libfolly.la
 noinst_PROGRAMS += concurrent_skiplist_benchmark
 
 histogram_test_SOURCES = HistogramTest.cpp