You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ro...@apache.org on 2012/05/10 23:17:53 UTC
svn commit: r1336895 - in /thrift/trunk: lib/cpp/Makefile.am test/Makefile.am

Author: roger
Date: Thu May 10 21:17:53 2012
New Revision: 1336895

URL: http://svn.apache.org/viewvc?rev=1336895&view=rev
Log:
fix broken build introduced with THRIFT-1336

Modified:
    thrift/trunk/lib/cpp/Makefile.am
    thrift/trunk/test/Makefile.am

Modified: thrift/trunk/lib/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/Makefile.am?rev=1336895&r1=1336894&r2=1336895&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/Makefile.am (original)
+++ thrift/trunk/lib/cpp/Makefile.am Thu May 10 21:17:53 2012
@@ -224,8 +224,7 @@ processor_test_SOURCES = src/thrift/proc
                         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)/
 	$(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 \

Modified: thrift/trunk/test/Makefile.am
URL: http://svn.apache.org/viewvc/thrift/trunk/test/Makefile.am?rev=1336895&r1=1336894&r2=1336895&view=diff
==============================================================================
--- thrift/trunk/test/Makefile.am (original)
+++ thrift/trunk/test/Makefile.am Thu May 10 21:17:53 2012
@@ -53,7 +53,6 @@ check-local:
 EXTRA_DIST = \
 	cpp \
 	csharp \
-	erl \
 	hs \
 	nodejs \
 	ocaml \