From: Roger Meier <roger@apache.org>
Date: Thu, 10 May 2012 21:17:53 +0000 (+0000)
Subject: fix broken build introduced with THRIFT-1336
X-Git-Tag: 0.9.1~376
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=67377e7f3b05c0d2569316c65f9ee5a3456cce30;p=common%2Fthrift.git

fix broken build introduced with THRIFT-1336

git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1336895 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/lib/cpp/Makefile.am b/lib/cpp/Makefile.am
index 21f70dd9..6e2b2baf 100755
--- a/lib/cpp/Makefile.am
+++ b/lib/cpp/Makefile.am
@@ -224,8 +224,7 @@ processor_test_SOURCES = src/thrift/processor/test/ProcessorTest.cpp \
                         src/thrift/processor/test/ServerThread.cpp \
                         src/thrift/processor/test/EventLog.h \
                         src/thrift/processor/test/Handlers.h \
-                        src/thrift/processor/test/ServerThread.h \
-                        src/thrift/processor/test/gen-cpp/ChildService.h
+                        src/thrift/processor/test/ServerThread.h
 
 processor_test_LDADD = libprocessortest.la \
                        libthrift.la \
@@ -249,14 +248,14 @@ gen-cpp/ChildService.cpp: $(top_srcdir)/lib/cpp/src/thrift/processor/test/proc.t
 	$(THRIFT) --gen cpp:templates,cob_style $<
 
 nodist_libprocessortest_la_SOURCES = \
-       gen-cpp/ChildService.h \
-       gen-cpp/ChildService.cpp \
-       gen-cpp/ParentService.h \
-       gen-cpp/ParentService.cpp
+       src/thrift/processor/test/gen-cpp/ChildService.h \
+       src/thrift/processor/test/gen-cpp/ChildService.cpp \
+       src/thrift/processor/test/gen-cpp/ParentService.h \
+       src/thrift/processor/test/gen-cpp/ParentService.cpp
 
 WINDOWS_DIST = \
              README_WINDOWS \
-             src/windows \
+             src/thrift/windows \
              thrift.sln \
              libthrift.vcxproj \
              libthrift.vcxproj.filters \
diff --git a/test/Makefile.am b/test/Makefile.am
index 1ad9063e..e9d02e2e 100755
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -53,7 +53,6 @@ check-local:
 EXTRA_DIST = \
 	cpp \
 	csharp \
-	erl \
 	hs \
 	nodejs \
 	ocaml \