From: Dave Watson Date: Fri, 4 Apr 2014 19:17:54 +0000 (-0700) Subject: Fix make check X-Git-Tag: v0.22.0~615 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8e82fd3453e34da1fe504e5f716a9a268d4e7aae;p=folly.git Fix make check Summary: Fix make check. Benchmark.cpp was included twice, eventfd doesn't exist anymore. Test Plan: autoreconf -i; ./configure; make check on ubuntu Reviewed By: pgriess@fb.com FB internal diff: D1259706 --- diff --git a/folly/Makefile.am b/folly/Makefile.am index ceccd482..235387c2 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -167,7 +167,6 @@ GroupVarintTables.cpp: build/generate_varint_tables.py CLEANFILES += GroupVarintTables.cpp libfolly_la_SOURCES = \ - Benchmark.cpp \ Bits.cpp \ Conv.cpp \ Demangle.cpp \ diff --git a/folly/test/Makefile.am b/folly/test/Makefile.am index 57494e32..4d9d083f 100644 --- a/folly/test/Makefile.am +++ b/folly/test/Makefile.am @@ -61,12 +61,6 @@ fbstring_test_using_jemalloc_SOURCES = FBStringTest.cpp fbstring_test_using_jemalloc_LDADD = libgtestmain.la $(top_builddir)/libfollybenchmark.la $(top_builddir)/libfolly.la TESTS += fbstring_test_using_jemalloc -if HAVE_LINUX -eventfd_test_SOURCES = EventFDTest.cpp -eventfd_test_LDADD = libgtestmain.la $(top_builddir)/libfollybenchmark.la $(top_builddir)/libfolly.la -TESTS += eventfd_test -endif - thread_cached_int_test_SOURCES = ThreadCachedIntTest.cpp thread_cached_int_test_LDADD = libgtestmain.la $(top_builddir)/libfollybenchmark.la $(top_builddir)/libfolly.la