You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by dr...@apache.org on 2010/08/31 18:51:20 UTC

svn commit: r991246 - in /incubator/thrift/trunk: ./ lib/cpp/ lib/cpp/test/ test/

Author: dreiss
Date: Tue Aug 31 16:51:19 2010
New Revision: 991246

URL: http://svn.apache.org/viewvc?rev=991246&view=rev
Log:
THRIFT-503. cpp: Move the tests built by "make check" under lib/cpp

Added:
    incubator/thrift/trunk/lib/cpp/test/
    incubator/thrift/trunk/lib/cpp/test/AllProtocolTests.cpp
      - copied, changed from r991245, incubator/thrift/trunk/test/AllProtocolTests.cpp
    incubator/thrift/trunk/lib/cpp/test/AllProtocolTests.tcc
      - copied, changed from r991245, incubator/thrift/trunk/test/AllProtocolTests.tcc
    incubator/thrift/trunk/lib/cpp/test/Benchmark.cpp
      - copied, changed from r991245, incubator/thrift/trunk/test/Benchmark.cpp
    incubator/thrift/trunk/lib/cpp/test/DebugProtoTest.cpp
      - copied, changed from r991245, incubator/thrift/trunk/test/DebugProtoTest.cpp
    incubator/thrift/trunk/lib/cpp/test/DebugProtoTest_extras.cpp
      - copied, changed from r991245, incubator/thrift/trunk/test/DebugProtoTest_extras.cpp
    incubator/thrift/trunk/lib/cpp/test/DenseProtoTest.cpp
      - copied, changed from r991245, incubator/thrift/trunk/test/DenseProtoTest.cpp
    incubator/thrift/trunk/lib/cpp/test/GenericHelpers.h
      - copied, changed from r991245, incubator/thrift/trunk/test/GenericHelpers.h
    incubator/thrift/trunk/lib/cpp/test/JSONProtoTest.cpp
      - copied, changed from r991245, incubator/thrift/trunk/test/JSONProtoTest.cpp
    incubator/thrift/trunk/lib/cpp/test/Makefile.am
      - copied, changed from r991245, incubator/thrift/trunk/test/Makefile.am
    incubator/thrift/trunk/lib/cpp/test/OptionalRequiredTest.cpp
      - copied, changed from r991245, incubator/thrift/trunk/test/OptionalRequiredTest.cpp
    incubator/thrift/trunk/lib/cpp/test/TBufferBaseTest.cpp
      - copied, changed from r991245, incubator/thrift/trunk/test/TBufferBaseTest.cpp
    incubator/thrift/trunk/lib/cpp/test/TFDTransportTest.cpp
      - copied, changed from r991245, incubator/thrift/trunk/test/TFDTransportTest.cpp
    incubator/thrift/trunk/lib/cpp/test/TMemoryBufferTest.cpp
      - copied, changed from r991245, incubator/thrift/trunk/test/TMemoryBufferTest.cpp
    incubator/thrift/trunk/lib/cpp/test/TPipedTransportTest.cpp
      - copied, changed from r991245, incubator/thrift/trunk/test/TPipedTransportTest.cpp
    incubator/thrift/trunk/lib/cpp/test/ThriftTest_extras.cpp
      - copied, changed from r991245, incubator/thrift/trunk/test/ThriftTest_extras.cpp
    incubator/thrift/trunk/lib/cpp/test/UnitTestMain.cpp
      - copied, changed from r991245, incubator/thrift/trunk/test/UnitTestMain.cpp
    incubator/thrift/trunk/lib/cpp/test/ZlibTest.cpp
      - copied, changed from r991245, incubator/thrift/trunk/test/ZlibTest.cpp
Removed:
    incubator/thrift/trunk/test/AllProtocolTests.cpp
    incubator/thrift/trunk/test/AllProtocolTests.tcc
    incubator/thrift/trunk/test/Benchmark.cpp
    incubator/thrift/trunk/test/DebugProtoTest.cpp
    incubator/thrift/trunk/test/DebugProtoTest_extras.cpp
    incubator/thrift/trunk/test/DenseProtoTest.cpp
    incubator/thrift/trunk/test/GenericHelpers.h
    incubator/thrift/trunk/test/JSONProtoTest.cpp
    incubator/thrift/trunk/test/OptionalRequiredTest.cpp
    incubator/thrift/trunk/test/TBufferBaseTest.cpp
    incubator/thrift/trunk/test/TFDTransportTest.cpp
    incubator/thrift/trunk/test/TMemoryBufferTest.cpp
    incubator/thrift/trunk/test/TPipedTransportTest.cpp
    incubator/thrift/trunk/test/ThriftTest_extras.cpp
    incubator/thrift/trunk/test/UnitTestMain.cpp
    incubator/thrift/trunk/test/ZlibTest.cpp
Modified:
    incubator/thrift/trunk/.gitignore
    incubator/thrift/trunk/configure.ac
    incubator/thrift/trunk/lib/cpp/Makefile.am
    incubator/thrift/trunk/test/Makefile.am

Modified: incubator/thrift/trunk/.gitignore
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/.gitignore?rev=991246&r1=991245&r2=991246&view=diff
==============================================================================
--- incubator/thrift/trunk/.gitignore (original)
+++ incubator/thrift/trunk/.gitignore Tue Aug 31 16:51:19 2010
@@ -32,6 +32,22 @@
 /lib/cpp/.libs
 /lib/cpp/Makefile
 /lib/cpp/Makefile.in
+/lib/cpp/test/.deps
+/lib/cpp/test/.libs
+/lib/cpp/test/gen-cpp
+/lib/cpp/test/Makefile
+/lib/cpp/test/Makefile.in
+/lib/cpp/test/Benchmark
+/lib/cpp/test/DebugProtoTest
+/lib/cpp/test/JSONProtoTest
+/lib/cpp/test/OptionalRequiredTest
+/lib/cpp/test/ReflectionTest
+/lib/cpp/test/TFDTransportTest
+/lib/cpp/test/TPipedTransportTest
+/lib/cpp/test/UnitTests
+/lib/cpp/test/*.la
+/lib/cpp/test/*.lo
+/lib/cpp/test/*.o
 /lib/cpp/concurrency_test
 /lib/cpp/*.o
 /lib/cpp/*.la
@@ -68,22 +84,8 @@
 /ltmain.sh
 /missing
 /stamp-h1
-/test/.deps
-/test/.libs
-/test/*.o
-/test/*.la
-/test/*.lo
-/test/Benchmark
-/test/DebugProtoTest
-/test/JSONProtoTest
-/test/TFDTransportTest
-/test/TPipedTransportTest
-/test/UnitTests
 /test/Makefile
 /test/Makefile.in
-/test/OptionalRequiredTest
-/test/ReflectionTest
-/test/gen-cpp
 /test/py/Makefile
 /test/py/Makefile.in
 /test/py/gen-py

Modified: incubator/thrift/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/configure.ac?rev=991246&r1=991245&r2=991246&view=diff
==============================================================================
--- incubator/thrift/trunk/configure.ac (original)
+++ incubator/thrift/trunk/configure.ac Tue Aug 31 16:51:19 2010
@@ -292,6 +292,7 @@ AC_CONFIG_FILES([
   compiler/cpp/version.h
   lib/Makefile
   lib/cpp/Makefile
+  lib/cpp/test/Makefile
   lib/cpp/thrift.pc
   lib/cpp/thrift-nb.pc
   lib/cpp/thrift-z.pc

Modified: incubator/thrift/trunk/lib/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/Makefile.am?rev=991246&r1=991245&r2=991246&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/cpp/Makefile.am (original)
+++ incubator/thrift/trunk/lib/cpp/Makefile.am Tue Aug 31 16:51:19 2010
@@ -17,6 +17,8 @@
 # under the License.
 #
 
+SUBDIRS = . test
+
 pkgconfigdir = $(libdir)/pkgconfig
 
 lib_LTLIBRARIES = libthrift.la

Copied: incubator/thrift/trunk/lib/cpp/test/AllProtocolTests.cpp (from r991245, incubator/thrift/trunk/test/AllProtocolTests.cpp)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/test/AllProtocolTests.cpp?p2=incubator/thrift/trunk/lib/cpp/test/AllProtocolTests.cpp&p1=incubator/thrift/trunk/test/AllProtocolTests.cpp&r1=991245&r2=991246&rev=991246&view=diff
==============================================================================
    (empty)

Copied: incubator/thrift/trunk/lib/cpp/test/AllProtocolTests.tcc (from r991245, incubator/thrift/trunk/test/AllProtocolTests.tcc)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/test/AllProtocolTests.tcc?p2=incubator/thrift/trunk/lib/cpp/test/AllProtocolTests.tcc&p1=incubator/thrift/trunk/test/AllProtocolTests.tcc&r1=991245&r2=991246&rev=991246&view=diff
==============================================================================
    (empty)

Copied: incubator/thrift/trunk/lib/cpp/test/Benchmark.cpp (from r991245, incubator/thrift/trunk/test/Benchmark.cpp)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/test/Benchmark.cpp?p2=incubator/thrift/trunk/lib/cpp/test/Benchmark.cpp&p1=incubator/thrift/trunk/test/Benchmark.cpp&r1=991245&r2=991246&rev=991246&view=diff
==============================================================================
    (empty)

Copied: incubator/thrift/trunk/lib/cpp/test/DebugProtoTest.cpp (from r991245, incubator/thrift/trunk/test/DebugProtoTest.cpp)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/test/DebugProtoTest.cpp?p2=incubator/thrift/trunk/lib/cpp/test/DebugProtoTest.cpp&p1=incubator/thrift/trunk/test/DebugProtoTest.cpp&r1=991245&r2=991246&rev=991246&view=diff
==============================================================================
    (empty)

Copied: incubator/thrift/trunk/lib/cpp/test/DebugProtoTest_extras.cpp (from r991245, incubator/thrift/trunk/test/DebugProtoTest_extras.cpp)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/test/DebugProtoTest_extras.cpp?p2=incubator/thrift/trunk/lib/cpp/test/DebugProtoTest_extras.cpp&p1=incubator/thrift/trunk/test/DebugProtoTest_extras.cpp&r1=991245&r2=991246&rev=991246&view=diff
==============================================================================
    (empty)

Copied: incubator/thrift/trunk/lib/cpp/test/DenseProtoTest.cpp (from r991245, incubator/thrift/trunk/test/DenseProtoTest.cpp)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/test/DenseProtoTest.cpp?p2=incubator/thrift/trunk/lib/cpp/test/DenseProtoTest.cpp&p1=incubator/thrift/trunk/test/DenseProtoTest.cpp&r1=991245&r2=991246&rev=991246&view=diff
==============================================================================
    (empty)

Copied: incubator/thrift/trunk/lib/cpp/test/GenericHelpers.h (from r991245, incubator/thrift/trunk/test/GenericHelpers.h)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/test/GenericHelpers.h?p2=incubator/thrift/trunk/lib/cpp/test/GenericHelpers.h&p1=incubator/thrift/trunk/test/GenericHelpers.h&r1=991245&r2=991246&rev=991246&view=diff
==============================================================================
    (empty)

Copied: incubator/thrift/trunk/lib/cpp/test/JSONProtoTest.cpp (from r991245, incubator/thrift/trunk/test/JSONProtoTest.cpp)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/test/JSONProtoTest.cpp?p2=incubator/thrift/trunk/lib/cpp/test/JSONProtoTest.cpp&p1=incubator/thrift/trunk/test/JSONProtoTest.cpp&r1=991245&r2=991246&rev=991246&view=diff
==============================================================================
    (empty)

Copied: incubator/thrift/trunk/lib/cpp/test/Makefile.am (from r991245, incubator/thrift/trunk/test/Makefile.am)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/test/Makefile.am?p2=incubator/thrift/trunk/lib/cpp/test/Makefile.am&p1=incubator/thrift/trunk/test/Makefile.am&r1=991245&r2=991246&rev=991246&view=diff
==============================================================================
--- incubator/thrift/trunk/test/Makefile.am (original)
+++ incubator/thrift/trunk/lib/cpp/test/Makefile.am Tue Aug 31 16:51:19 2010
@@ -17,16 +17,6 @@
 # under the License.
 #
 
-SUBDIRS =
-
-if WITH_PYTHON
-SUBDIRS += py
-endif
-
-if WITH_RUBY
-SUBDIRS += rb
-endif
-
 noinst_LTLIBRARIES = libtestgencpp.la
 nodist_libtestgencpp_la_SOURCES = \
 	gen-cpp/DebugProtoTest_types.cpp \
@@ -130,16 +120,16 @@ OptionalRequiredTest_LDADD = libtestgenc
 #
 THRIFT = $(top_builddir)/compiler/cpp/thrift
 
-gen-cpp/DebugProtoTest_types.cpp gen-cpp/DebugProtoTest_types.h: DebugProtoTest.thrift
+gen-cpp/DebugProtoTest_types.cpp gen-cpp/DebugProtoTest_types.h: $(top_srcdir)/test/DebugProtoTest.thrift
 	$(THRIFT) --gen cpp:dense $<
 
-gen-cpp/OptionalRequiredTest_types.cpp gen-cpp/OptionalRequiredTest_types.h: OptionalRequiredTest.thrift
+gen-cpp/OptionalRequiredTest_types.cpp gen-cpp/OptionalRequiredTest_types.h: $(top_srcdir)/test/OptionalRequiredTest.thrift
 	$(THRIFT) --gen cpp:dense $<
 
-gen-cpp/Service.cpp gen-cpp/StressTest_types.cpp: StressTest.thrift
+gen-cpp/Service.cpp gen-cpp/StressTest_types.cpp: $(top_srcdir)/test/StressTest.thrift
 	$(THRIFT) --gen cpp:dense $<
 
-gen-cpp/SecondService.cpp gen-cpp/ThriftTest_constants.cpp gen-cpp/ThriftTest.cpp gen-cpp/ThriftTest_types.cpp gen-cpp/ThriftTest_types.h: ThriftTest.thrift
+gen-cpp/SecondService.cpp gen-cpp/ThriftTest_constants.cpp gen-cpp/ThriftTest.cpp gen-cpp/ThriftTest_types.cpp gen-cpp/ThriftTest_types.h: $(top_srcdir)/test/ThriftTest.thrift
 	$(THRIFT) --gen cpp:dense $<
 
 INCLUDES = \
@@ -151,31 +141,7 @@ clean-local:
 	$(RM) -r gen-cpp
 
 EXTRA_DIST = \
-	cpp \
-	threads \
-	csharp \
-	py \
-	rb \
-	perl \
-	php \
-	erl \
-	hs \
-	ocaml \
-	AnnotationTest.thrift \
-	BrokenConstants.thrift \
-	ConstantsDemo.thrift \
-	DebugProtoTest.thrift \
-	DenseLinkingTest.thrift \
-	DocTest.thrift \
-	JavaBeansTest.thrift \
-	ManyTypedefs.thrift \
-	OptionalRequiredTest.thrift \
-	SmallTest.thrift \
-	StressTest.thrift \
-	ThriftTest.thrift \
 	ZlibTest.cpp \
 	DenseProtoTest.cpp \
-	FastbinaryTest.py \
 	ThriftTest_extras.cpp \
 	DebugProtoTest_extras.cpp
-

Copied: incubator/thrift/trunk/lib/cpp/test/OptionalRequiredTest.cpp (from r991245, incubator/thrift/trunk/test/OptionalRequiredTest.cpp)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/test/OptionalRequiredTest.cpp?p2=incubator/thrift/trunk/lib/cpp/test/OptionalRequiredTest.cpp&p1=incubator/thrift/trunk/test/OptionalRequiredTest.cpp&r1=991245&r2=991246&rev=991246&view=diff
==============================================================================
    (empty)

Copied: incubator/thrift/trunk/lib/cpp/test/TBufferBaseTest.cpp (from r991245, incubator/thrift/trunk/test/TBufferBaseTest.cpp)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/test/TBufferBaseTest.cpp?p2=incubator/thrift/trunk/lib/cpp/test/TBufferBaseTest.cpp&p1=incubator/thrift/trunk/test/TBufferBaseTest.cpp&r1=991245&r2=991246&rev=991246&view=diff
==============================================================================
    (empty)

Copied: incubator/thrift/trunk/lib/cpp/test/TFDTransportTest.cpp (from r991245, incubator/thrift/trunk/test/TFDTransportTest.cpp)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/test/TFDTransportTest.cpp?p2=incubator/thrift/trunk/lib/cpp/test/TFDTransportTest.cpp&p1=incubator/thrift/trunk/test/TFDTransportTest.cpp&r1=991245&r2=991246&rev=991246&view=diff
==============================================================================
    (empty)

Copied: incubator/thrift/trunk/lib/cpp/test/TMemoryBufferTest.cpp (from r991245, incubator/thrift/trunk/test/TMemoryBufferTest.cpp)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/test/TMemoryBufferTest.cpp?p2=incubator/thrift/trunk/lib/cpp/test/TMemoryBufferTest.cpp&p1=incubator/thrift/trunk/test/TMemoryBufferTest.cpp&r1=991245&r2=991246&rev=991246&view=diff
==============================================================================
    (empty)

Copied: incubator/thrift/trunk/lib/cpp/test/TPipedTransportTest.cpp (from r991245, incubator/thrift/trunk/test/TPipedTransportTest.cpp)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/test/TPipedTransportTest.cpp?p2=incubator/thrift/trunk/lib/cpp/test/TPipedTransportTest.cpp&p1=incubator/thrift/trunk/test/TPipedTransportTest.cpp&r1=991245&r2=991246&rev=991246&view=diff
==============================================================================
    (empty)

Copied: incubator/thrift/trunk/lib/cpp/test/ThriftTest_extras.cpp (from r991245, incubator/thrift/trunk/test/ThriftTest_extras.cpp)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/test/ThriftTest_extras.cpp?p2=incubator/thrift/trunk/lib/cpp/test/ThriftTest_extras.cpp&p1=incubator/thrift/trunk/test/ThriftTest_extras.cpp&r1=991245&r2=991246&rev=991246&view=diff
==============================================================================
    (empty)

Copied: incubator/thrift/trunk/lib/cpp/test/UnitTestMain.cpp (from r991245, incubator/thrift/trunk/test/UnitTestMain.cpp)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/test/UnitTestMain.cpp?p2=incubator/thrift/trunk/lib/cpp/test/UnitTestMain.cpp&p1=incubator/thrift/trunk/test/UnitTestMain.cpp&r1=991245&r2=991246&rev=991246&view=diff
==============================================================================
    (empty)

Copied: incubator/thrift/trunk/lib/cpp/test/ZlibTest.cpp (from r991245, incubator/thrift/trunk/test/ZlibTest.cpp)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/test/ZlibTest.cpp?p2=incubator/thrift/trunk/lib/cpp/test/ZlibTest.cpp&p1=incubator/thrift/trunk/test/ZlibTest.cpp&r1=991245&r2=991246&rev=991246&view=diff
==============================================================================
    (empty)

Modified: incubator/thrift/trunk/test/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/test/Makefile.am?rev=991246&r1=991245&r2=991246&view=diff
==============================================================================
--- incubator/thrift/trunk/test/Makefile.am (original)
+++ incubator/thrift/trunk/test/Makefile.am Tue Aug 31 16:51:19 2010
@@ -27,128 +27,6 @@ if WITH_RUBY
 SUBDIRS += rb
 endif
 
-noinst_LTLIBRARIES = libtestgencpp.la
-nodist_libtestgencpp_la_SOURCES = \
-	gen-cpp/DebugProtoTest_types.cpp \
-	gen-cpp/OptionalRequiredTest_types.cpp \
-	gen-cpp/DebugProtoTest_types.cpp \
-	gen-cpp/ThriftTest_types.cpp \
-	gen-cpp/DebugProtoTest_types.h \
-	gen-cpp/OptionalRequiredTest_types.h \
-	gen-cpp/ThriftTest_types.h \
-	ThriftTest_extras.cpp \
-	DebugProtoTest_extras.cpp
-
-ThriftTest_extras.o: gen-cpp/ThriftTest_types.h
-DebugProtoTest_extras.o: gen-cpp/DebugProtoTest_types.h
-
-libtestgencpp_la_LIBADD = $(top_builddir)/lib/cpp/libthrift.la
-
-noinst_PROGRAMS = Benchmark
-
-Benchmark_SOURCES = \
-	Benchmark.cpp
-
-Benchmark_LDADD = libtestgencpp.la
-
-check_PROGRAMS = \
-	TFDTransportTest \
-	TPipedTransportTest \
-	DebugProtoTest \
-	JSONProtoTest \
-	OptionalRequiredTest \
-	AllProtocolsTest \
-	UnitTests
-
-TESTS = \
-	$(check_PROGRAMS)
-
-UnitTests_SOURCES = \
-	UnitTestMain.cpp \
-	TMemoryBufferTest.cpp \
-	TBufferBaseTest.cpp
-
-UnitTests_LDADD = libtestgencpp.la -lboost_unit_test_framework
-
-#
-# TFDTransportTest
-#
-TFDTransportTest_SOURCES = \
-	TFDTransportTest.cpp
-
-TFDTransportTest_LDADD = \
-	$(top_builddir)/lib/cpp/libthrift.la
-
-
-#
-# TPipedTransportTest
-#
-TPipedTransportTest_SOURCES = \
-	TPipedTransportTest.cpp
-
-TPipedTransportTest_LDADD = \
-	$(top_builddir)/lib/cpp/libthrift.la
-
-#
-# AllProtocolsTest
-#
-AllProtocolsTest_SOURCES = \
-	AllProtocolTests.cpp \
-	AllProtocolTests.tcc \
-	GenericHelpers.h
-
-AllProtocolsTest_LDADD = libtestgencpp.la
-
-#
-# DebugProtoTest
-#
-DebugProtoTest_SOURCES = \
-	DebugProtoTest.cpp
-
-DebugProtoTest_LDADD = libtestgencpp.la
-
-
-#
-# JSONProtoTest
-#
-JSONProtoTest_SOURCES = \
-	JSONProtoTest.cpp
-
-JSONProtoTest_LDADD = libtestgencpp.la
-
-#
-# OptionalRequiredTest
-#
-OptionalRequiredTest_SOURCES = \
-	OptionalRequiredTest.cpp
-
-OptionalRequiredTest_LDADD = libtestgencpp.la
-
-
-#
-# Common thrift code generation rules
-#
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-gen-cpp/DebugProtoTest_types.cpp gen-cpp/DebugProtoTest_types.h: DebugProtoTest.thrift
-	$(THRIFT) --gen cpp:dense $<
-
-gen-cpp/OptionalRequiredTest_types.cpp gen-cpp/OptionalRequiredTest_types.h: OptionalRequiredTest.thrift
-	$(THRIFT) --gen cpp:dense $<
-
-gen-cpp/Service.cpp gen-cpp/StressTest_types.cpp: StressTest.thrift
-	$(THRIFT) --gen cpp:dense $<
-
-gen-cpp/SecondService.cpp gen-cpp/ThriftTest_constants.cpp gen-cpp/ThriftTest.cpp gen-cpp/ThriftTest_types.cpp gen-cpp/ThriftTest_types.h: ThriftTest.thrift
-	$(THRIFT) --gen cpp:dense $<
-
-INCLUDES = \
-	-I$(top_srcdir)/lib/cpp/src
-
-AM_CPPFLAGS = $(BOOST_CPPFLAGS)
-
-clean-local:
-	$(RM) -r gen-cpp
 
 EXTRA_DIST = \
 	cpp \
@@ -173,9 +51,4 @@ EXTRA_DIST = \
 	SmallTest.thrift \
 	StressTest.thrift \
 	ThriftTest.thrift \
-	ZlibTest.cpp \
-	DenseProtoTest.cpp \
-	FastbinaryTest.py \
-	ThriftTest_extras.cpp \
-	DebugProtoTest_extras.cpp
-
+	FastbinaryTest.py