You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by js...@apache.org on 2016/07/01 19:45:25 UTC
aurora git commit: Patch thrift to compile under modern gcc.
Repository: aurora
Updated Branches:
refs/heads/master 176c96a3f -> 5bdee77a8
Patch thrift to compile under modern gcc.
This also patches the thrift compiler Makefile.in to eliminate all
generators not used by Aurora to both work around their modern gcc
compiler errors and speed up the thrift compiler build.
Bugs closed: AURORA-1727
Reviewed at https://reviews.apache.org/r/49528/
Project: http://git-wip-us.apache.org/repos/asf/aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/5bdee77a
Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/5bdee77a
Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/5bdee77a
Branch: refs/heads/master
Commit: 5bdee77a8fc877c8e5684ff974235088e61521c7
Parents: 176c96a
Author: John Sirois <js...@apache.org>
Authored: Fri Jul 1 13:45:19 2016 -0600
Committer: John Sirois <jo...@gmail.com>
Committed: Fri Jul 1 13:45:19 2016 -0600
----------------------------------------------------------------------
.../AURORA-1727.compiler.cpp.Makefile.in.patch | 376 +++++++++++++++++++
...r.cpp.src.generate.t_java_generator.cc.patch | 14 +
build-support/thrift/Makefile | 2 +
3 files changed, 392 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aurora/blob/5bdee77a/build-support/thrift/AURORA-1727.compiler.cpp.Makefile.in.patch
----------------------------------------------------------------------
diff --git a/build-support/thrift/AURORA-1727.compiler.cpp.Makefile.in.patch b/build-support/thrift/AURORA-1727.compiler.cpp.Makefile.in.patch
new file mode 100644
index 0000000..b69e3fe
--- /dev/null
+++ b/build-support/thrift/AURORA-1727.compiler.cpp.Makefile.in.patch
@@ -0,0 +1,376 @@
+--- thrift-0.9.1/compiler/cpp/Makefile.in 2013-08-18 10:01:01.000000000 -0600
++++ thrift-0.9.1/compiler/cpp/Makefile.in.fix 2016-07-01 13:08:46.928563056 -0600
+@@ -96,27 +96,9 @@
+ PROGRAMS = $(bin_PROGRAMS)
+ am_thrift_OBJECTS = thrift-main.$(OBJEXT) thrift-md5.$(OBJEXT) \
+ thrift-t_generator.$(OBJEXT) thrift-parse.$(OBJEXT) \
+- thrift-t_c_glib_generator.$(OBJEXT) \
+- thrift-t_cpp_generator.$(OBJEXT) \
+ thrift-t_java_generator.$(OBJEXT) \
+- thrift-t_as3_generator.$(OBJEXT) \
+- thrift-t_csharp_generator.$(OBJEXT) \
+- thrift-t_py_generator.$(OBJEXT) \
+- thrift-t_rb_generator.$(OBJEXT) \
+- thrift-t_perl_generator.$(OBJEXT) \
+- thrift-t_php_generator.$(OBJEXT) \
+- thrift-t_erl_generator.$(OBJEXT) \
+- thrift-t_cocoa_generator.$(OBJEXT) \
+- thrift-t_st_generator.$(OBJEXT) \
+- thrift-t_ocaml_generator.$(OBJEXT) \
+- thrift-t_hs_generator.$(OBJEXT) \
+- thrift-t_xsd_generator.$(OBJEXT) \
+ thrift-t_html_generator.$(OBJEXT) \
+- thrift-t_js_generator.$(OBJEXT) \
+- thrift-t_javame_generator.$(OBJEXT) \
+- thrift-t_delphi_generator.$(OBJEXT) \
+- thrift-t_go_generator.$(OBJEXT) \
+- thrift-t_gv_generator.$(OBJEXT) thrift-t_d_generator.$(OBJEXT)
++ thrift-t_js_generator.$(OBJEXT)
+ thrift_OBJECTS = $(am_thrift_OBJECTS)
+ thrift_DEPENDENCIES = libparse.a
+ thrift_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+@@ -377,25 +359,10 @@
+ src/parse/t_const_value.h src/parse/parse.cc \
+ src/generate/t_generator.h src/generate/t_oop_generator.h \
+ src/generate/t_html_generator.h src/windows/config.h \
+- src/windows/version.h src/generate/t_c_glib_generator.cc \
+- src/generate/t_cpp_generator.cc \
++ src/windows/version.h \
+ src/generate/t_java_generator.cc \
+- src/generate/t_as3_generator.cc \
+- src/generate/t_csharp_generator.cc \
+- src/generate/t_py_generator.cc src/generate/t_rb_generator.cc \
+- src/generate/t_perl_generator.cc \
+- src/generate/t_php_generator.cc \
+- src/generate/t_erl_generator.cc \
+- src/generate/t_cocoa_generator.cc \
+- src/generate/t_st_generator.cc \
+- src/generate/t_ocaml_generator.cc \
+- src/generate/t_hs_generator.cc src/generate/t_xsd_generator.cc \
+ src/generate/t_html_generator.cc \
+- src/generate/t_js_generator.cc \
+- src/generate/t_javame_generator.cc \
+- src/generate/t_delphi_generator.cc \
+- src/generate/t_go_generator.cc src/generate/t_gv_generator.cc \
+- src/generate/t_d_generator.cc
++ src/generate/t_js_generator.cc
+ thrift_CPPFLAGS = -I$(srcdir)/src
+ thrift_CXXFLAGS = -Wall
+ thrift_LDADD = @LEXLIB@ libparse.a
+@@ -518,29 +485,10 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-main.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-md5.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-parse.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_as3_generator.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_c_glib_generator.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_cocoa_generator.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_cpp_generator.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_csharp_generator.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_d_generator.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_delphi_generator.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_erl_generator.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_generator.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_go_generator.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_gv_generator.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_hs_generator.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_html_generator.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_java_generator.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_javame_generator.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_js_generator.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_ocaml_generator.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_perl_generator.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_php_generator.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_py_generator.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_rb_generator.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_st_generator.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_xsd_generator.Po@am__quote@
+
+ .c.o:
+ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@@ -668,34 +616,6 @@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-parse.obj `if test -f 'src/parse/parse.cc'; then $(CYGPATH_W) 'src/parse/parse.cc'; else $(CYGPATH_W) '$(srcdir)/src/parse/parse.cc'; fi`
+
+-thrift-t_c_glib_generator.o: src/generate/t_c_glib_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_c_glib_generator.o -MD -MP -MF $(DEPDIR)/thrift-t_c_glib_generator.Tpo -c -o thrift-t_c_glib_generator.o `test -f 'src/generate/t_c_glib_generator.cc' || echo '$(srcdir)/'`src/generate/t_c_glib_generator.cc
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_c_glib_generator.Tpo $(DEPDIR)/thrift-t_c_glib_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_c_glib_generator.cc' object='thrift-t_c_glib_generator.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_c_glib_generator.o `test -f 'src/generate/t_c_glib_generator.cc' || echo '$(srcdir)/'`src/generate/t_c_glib_generator.cc
+-
+-thrift-t_c_glib_generator.obj: src/generate/t_c_glib_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_c_glib_generator.obj -MD -MP -MF $(DEPDIR)/thrift-t_c_glib_generator.Tpo -c -o thrift-t_c_glib_generator.obj `if test -f 'src/generate/t_c_glib_generator.cc'; then $(CYGPATH_W) 'src/generate/t_c_glib_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_c_glib_generator.cc'; fi`
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_c_glib_generator.Tpo $(DEPDIR)/thrift-t_c_glib_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_c_glib_generator.cc' object='thrift-t_c_glib_generator.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_c_glib_generator.obj `if test -f 'src/generate/t_c_glib_generator.cc'; then $(CYGPATH_W) 'src/generate/t_c_glib_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_c_glib_generator.cc'; fi`
+-
+-thrift-t_cpp_generator.o: src/generate/t_cpp_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_cpp_generator.o -MD -MP -MF $(DEPDIR)/thrift-t_cpp_generator.Tpo -c -o thrift-t_cpp_generator.o `test -f 'src/generate/t_cpp_generator.cc' || echo '$(srcdir)/'`src/generate/t_cpp_generator.cc
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_cpp_generator.Tpo $(DEPDIR)/thrift-t_cpp_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_cpp_generator.cc' object='thrift-t_cpp_generator.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_cpp_generator.o `test -f 'src/generate/t_cpp_generator.cc' || echo '$(srcdir)/'`src/generate/t_cpp_generator.cc
+-
+-thrift-t_cpp_generator.obj: src/generate/t_cpp_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_cpp_generator.obj -MD -MP -MF $(DEPDIR)/thrift-t_cpp_generator.Tpo -c -o thrift-t_cpp_generator.obj `if test -f 'src/generate/t_cpp_generator.cc'; then $(CYGPATH_W) 'src/generate/t_cpp_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_cpp_generator.cc'; fi`
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_cpp_generator.Tpo $(DEPDIR)/thrift-t_cpp_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_cpp_generator.cc' object='thrift-t_cpp_generator.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_cpp_generator.obj `if test -f 'src/generate/t_cpp_generator.cc'; then $(CYGPATH_W) 'src/generate/t_cpp_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_cpp_generator.cc'; fi`
+-
+ thrift-t_java_generator.o: src/generate/t_java_generator.cc
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_java_generator.o -MD -MP -MF $(DEPDIR)/thrift-t_java_generator.Tpo -c -o thrift-t_java_generator.o `test -f 'src/generate/t_java_generator.cc' || echo '$(srcdir)/'`src/generate/t_java_generator.cc
+ @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_java_generator.Tpo $(DEPDIR)/thrift-t_java_generator.Po
+@@ -710,174 +630,6 @@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_java_generator.obj `if test -f 'src/generate/t_java_generator.cc'; then $(CYGPATH_W) 'src/generate/t_java_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_java_generator.cc'; fi`
+
+-thrift-t_as3_generator.o: src/generate/t_as3_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_as3_generator.o -MD -MP -MF $(DEPDIR)/thrift-t_as3_generator.Tpo -c -o thrift-t_as3_generator.o `test -f 'src/generate/t_as3_generator.cc' || echo '$(srcdir)/'`src/generate/t_as3_generator.cc
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_as3_generator.Tpo $(DEPDIR)/thrift-t_as3_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_as3_generator.cc' object='thrift-t_as3_generator.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_as3_generator.o `test -f 'src/generate/t_as3_generator.cc' || echo '$(srcdir)/'`src/generate/t_as3_generator.cc
+-
+-thrift-t_as3_generator.obj: src/generate/t_as3_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_as3_generator.obj -MD -MP -MF $(DEPDIR)/thrift-t_as3_generator.Tpo -c -o thrift-t_as3_generator.obj `if test -f 'src/generate/t_as3_generator.cc'; then $(CYGPATH_W) 'src/generate/t_as3_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_as3_generator.cc'; fi`
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_as3_generator.Tpo $(DEPDIR)/thrift-t_as3_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_as3_generator.cc' object='thrift-t_as3_generator.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_as3_generator.obj `if test -f 'src/generate/t_as3_generator.cc'; then $(CYGPATH_W) 'src/generate/t_as3_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_as3_generator.cc'; fi`
+-
+-thrift-t_csharp_generator.o: src/generate/t_csharp_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_csharp_generator.o -MD -MP -MF $(DEPDIR)/thrift-t_csharp_generator.Tpo -c -o thrift-t_csharp_generator.o `test -f 'src/generate/t_csharp_generator.cc' || echo '$(srcdir)/'`src/generate/t_csharp_generator.cc
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_csharp_generator.Tpo $(DEPDIR)/thrift-t_csharp_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_csharp_generator.cc' object='thrift-t_csharp_generator.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_csharp_generator.o `test -f 'src/generate/t_csharp_generator.cc' || echo '$(srcdir)/'`src/generate/t_csharp_generator.cc
+-
+-thrift-t_csharp_generator.obj: src/generate/t_csharp_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_csharp_generator.obj -MD -MP -MF $(DEPDIR)/thrift-t_csharp_generator.Tpo -c -o thrift-t_csharp_generator.obj `if test -f 'src/generate/t_csharp_generator.cc'; then $(CYGPATH_W) 'src/generate/t_csharp_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_csharp_generator.cc'; fi`
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_csharp_generator.Tpo $(DEPDIR)/thrift-t_csharp_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_csharp_generator.cc' object='thrift-t_csharp_generator.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_csharp_generator.obj `if test -f 'src/generate/t_csharp_generator.cc'; then $(CYGPATH_W) 'src/generate/t_csharp_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_csharp_generator.cc'; fi`
+-
+-thrift-t_py_generator.o: src/generate/t_py_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_py_generator.o -MD -MP -MF $(DEPDIR)/thrift-t_py_generator.Tpo -c -o thrift-t_py_generator.o `test -f 'src/generate/t_py_generator.cc' || echo '$(srcdir)/'`src/generate/t_py_generator.cc
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_py_generator.Tpo $(DEPDIR)/thrift-t_py_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_py_generator.cc' object='thrift-t_py_generator.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_py_generator.o `test -f 'src/generate/t_py_generator.cc' || echo '$(srcdir)/'`src/generate/t_py_generator.cc
+-
+-thrift-t_py_generator.obj: src/generate/t_py_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_py_generator.obj -MD -MP -MF $(DEPDIR)/thrift-t_py_generator.Tpo -c -o thrift-t_py_generator.obj `if test -f 'src/generate/t_py_generator.cc'; then $(CYGPATH_W) 'src/generate/t_py_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_py_generator.cc'; fi`
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_py_generator.Tpo $(DEPDIR)/thrift-t_py_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_py_generator.cc' object='thrift-t_py_generator.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_py_generator.obj `if test -f 'src/generate/t_py_generator.cc'; then $(CYGPATH_W) 'src/generate/t_py_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_py_generator.cc'; fi`
+-
+-thrift-t_rb_generator.o: src/generate/t_rb_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_rb_generator.o -MD -MP -MF $(DEPDIR)/thrift-t_rb_generator.Tpo -c -o thrift-t_rb_generator.o `test -f 'src/generate/t_rb_generator.cc' || echo '$(srcdir)/'`src/generate/t_rb_generator.cc
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_rb_generator.Tpo $(DEPDIR)/thrift-t_rb_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_rb_generator.cc' object='thrift-t_rb_generator.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_rb_generator.o `test -f 'src/generate/t_rb_generator.cc' || echo '$(srcdir)/'`src/generate/t_rb_generator.cc
+-
+-thrift-t_rb_generator.obj: src/generate/t_rb_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_rb_generator.obj -MD -MP -MF $(DEPDIR)/thrift-t_rb_generator.Tpo -c -o thrift-t_rb_generator.obj `if test -f 'src/generate/t_rb_generator.cc'; then $(CYGPATH_W) 'src/generate/t_rb_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_rb_generator.cc'; fi`
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_rb_generator.Tpo $(DEPDIR)/thrift-t_rb_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_rb_generator.cc' object='thrift-t_rb_generator.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_rb_generator.obj `if test -f 'src/generate/t_rb_generator.cc'; then $(CYGPATH_W) 'src/generate/t_rb_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_rb_generator.cc'; fi`
+-
+-thrift-t_perl_generator.o: src/generate/t_perl_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_perl_generator.o -MD -MP -MF $(DEPDIR)/thrift-t_perl_generator.Tpo -c -o thrift-t_perl_generator.o `test -f 'src/generate/t_perl_generator.cc' || echo '$(srcdir)/'`src/generate/t_perl_generator.cc
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_perl_generator.Tpo $(DEPDIR)/thrift-t_perl_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_perl_generator.cc' object='thrift-t_perl_generator.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_perl_generator.o `test -f 'src/generate/t_perl_generator.cc' || echo '$(srcdir)/'`src/generate/t_perl_generator.cc
+-
+-thrift-t_perl_generator.obj: src/generate/t_perl_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_perl_generator.obj -MD -MP -MF $(DEPDIR)/thrift-t_perl_generator.Tpo -c -o thrift-t_perl_generator.obj `if test -f 'src/generate/t_perl_generator.cc'; then $(CYGPATH_W) 'src/generate/t_perl_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_perl_generator.cc'; fi`
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_perl_generator.Tpo $(DEPDIR)/thrift-t_perl_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_perl_generator.cc' object='thrift-t_perl_generator.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_perl_generator.obj `if test -f 'src/generate/t_perl_generator.cc'; then $(CYGPATH_W) 'src/generate/t_perl_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_perl_generator.cc'; fi`
+-
+-thrift-t_php_generator.o: src/generate/t_php_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_php_generator.o -MD -MP -MF $(DEPDIR)/thrift-t_php_generator.Tpo -c -o thrift-t_php_generator.o `test -f 'src/generate/t_php_generator.cc' || echo '$(srcdir)/'`src/generate/t_php_generator.cc
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_php_generator.Tpo $(DEPDIR)/thrift-t_php_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_php_generator.cc' object='thrift-t_php_generator.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_php_generator.o `test -f 'src/generate/t_php_generator.cc' || echo '$(srcdir)/'`src/generate/t_php_generator.cc
+-
+-thrift-t_php_generator.obj: src/generate/t_php_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_php_generator.obj -MD -MP -MF $(DEPDIR)/thrift-t_php_generator.Tpo -c -o thrift-t_php_generator.obj `if test -f 'src/generate/t_php_generator.cc'; then $(CYGPATH_W) 'src/generate/t_php_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_php_generator.cc'; fi`
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_php_generator.Tpo $(DEPDIR)/thrift-t_php_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_php_generator.cc' object='thrift-t_php_generator.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_php_generator.obj `if test -f 'src/generate/t_php_generator.cc'; then $(CYGPATH_W) 'src/generate/t_php_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_php_generator.cc'; fi`
+-
+-thrift-t_erl_generator.o: src/generate/t_erl_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_erl_generator.o -MD -MP -MF $(DEPDIR)/thrift-t_erl_generator.Tpo -c -o thrift-t_erl_generator.o `test -f 'src/generate/t_erl_generator.cc' || echo '$(srcdir)/'`src/generate/t_erl_generator.cc
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_erl_generator.Tpo $(DEPDIR)/thrift-t_erl_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_erl_generator.cc' object='thrift-t_erl_generator.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_erl_generator.o `test -f 'src/generate/t_erl_generator.cc' || echo '$(srcdir)/'`src/generate/t_erl_generator.cc
+-
+-thrift-t_erl_generator.obj: src/generate/t_erl_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_erl_generator.obj -MD -MP -MF $(DEPDIR)/thrift-t_erl_generator.Tpo -c -o thrift-t_erl_generator.obj `if test -f 'src/generate/t_erl_generator.cc'; then $(CYGPATH_W) 'src/generate/t_erl_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_erl_generator.cc'; fi`
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_erl_generator.Tpo $(DEPDIR)/thrift-t_erl_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_erl_generator.cc' object='thrift-t_erl_generator.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_erl_generator.obj `if test -f 'src/generate/t_erl_generator.cc'; then $(CYGPATH_W) 'src/generate/t_erl_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_erl_generator.cc'; fi`
+-
+-thrift-t_cocoa_generator.o: src/generate/t_cocoa_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_cocoa_generator.o -MD -MP -MF $(DEPDIR)/thrift-t_cocoa_generator.Tpo -c -o thrift-t_cocoa_generator.o `test -f 'src/generate/t_cocoa_generator.cc' || echo '$(srcdir)/'`src/generate/t_cocoa_generator.cc
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_cocoa_generator.Tpo $(DEPDIR)/thrift-t_cocoa_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_cocoa_generator.cc' object='thrift-t_cocoa_generator.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_cocoa_generator.o `test -f 'src/generate/t_cocoa_generator.cc' || echo '$(srcdir)/'`src/generate/t_cocoa_generator.cc
+-
+-thrift-t_cocoa_generator.obj: src/generate/t_cocoa_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_cocoa_generator.obj -MD -MP -MF $(DEPDIR)/thrift-t_cocoa_generator.Tpo -c -o thrift-t_cocoa_generator.obj `if test -f 'src/generate/t_cocoa_generator.cc'; then $(CYGPATH_W) 'src/generate/t_cocoa_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_cocoa_generator.cc'; fi`
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_cocoa_generator.Tpo $(DEPDIR)/thrift-t_cocoa_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_cocoa_generator.cc' object='thrift-t_cocoa_generator.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_cocoa_generator.obj `if test -f 'src/generate/t_cocoa_generator.cc'; then $(CYGPATH_W) 'src/generate/t_cocoa_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_cocoa_generator.cc'; fi`
+-
+-thrift-t_st_generator.o: src/generate/t_st_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_st_generator.o -MD -MP -MF $(DEPDIR)/thrift-t_st_generator.Tpo -c -o thrift-t_st_generator.o `test -f 'src/generate/t_st_generator.cc' || echo '$(srcdir)/'`src/generate/t_st_generator.cc
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_st_generator.Tpo $(DEPDIR)/thrift-t_st_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_st_generator.cc' object='thrift-t_st_generator.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_st_generator.o `test -f 'src/generate/t_st_generator.cc' || echo '$(srcdir)/'`src/generate/t_st_generator.cc
+-
+-thrift-t_st_generator.obj: src/generate/t_st_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_st_generator.obj -MD -MP -MF $(DEPDIR)/thrift-t_st_generator.Tpo -c -o thrift-t_st_generator.obj `if test -f 'src/generate/t_st_generator.cc'; then $(CYGPATH_W) 'src/generate/t_st_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_st_generator.cc'; fi`
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_st_generator.Tpo $(DEPDIR)/thrift-t_st_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_st_generator.cc' object='thrift-t_st_generator.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_st_generator.obj `if test -f 'src/generate/t_st_generator.cc'; then $(CYGPATH_W) 'src/generate/t_st_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_st_generator.cc'; fi`
+-
+-thrift-t_ocaml_generator.o: src/generate/t_ocaml_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_ocaml_generator.o -MD -MP -MF $(DEPDIR)/thrift-t_ocaml_generator.Tpo -c -o thrift-t_ocaml_generator.o `test -f 'src/generate/t_ocaml_generator.cc' || echo '$(srcdir)/'`src/generate/t_ocaml_generator.cc
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_ocaml_generator.Tpo $(DEPDIR)/thrift-t_ocaml_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_ocaml_generator.cc' object='thrift-t_ocaml_generator.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_ocaml_generator.o `test -f 'src/generate/t_ocaml_generator.cc' || echo '$(srcdir)/'`src/generate/t_ocaml_generator.cc
+-
+-thrift-t_ocaml_generator.obj: src/generate/t_ocaml_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_ocaml_generator.obj -MD -MP -MF $(DEPDIR)/thrift-t_ocaml_generator.Tpo -c -o thrift-t_ocaml_generator.obj `if test -f 'src/generate/t_ocaml_generator.cc'; then $(CYGPATH_W) 'src/generate/t_ocaml_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_ocaml_generator.cc'; fi`
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_ocaml_generator.Tpo $(DEPDIR)/thrift-t_ocaml_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_ocaml_generator.cc' object='thrift-t_ocaml_generator.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_ocaml_generator.obj `if test -f 'src/generate/t_ocaml_generator.cc'; then $(CYGPATH_W) 'src/generate/t_ocaml_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_ocaml_generator.cc'; fi`
+-
+-thrift-t_hs_generator.o: src/generate/t_hs_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_hs_generator.o -MD -MP -MF $(DEPDIR)/thrift-t_hs_generator.Tpo -c -o thrift-t_hs_generator.o `test -f 'src/generate/t_hs_generator.cc' || echo '$(srcdir)/'`src/generate/t_hs_generator.cc
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_hs_generator.Tpo $(DEPDIR)/thrift-t_hs_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_hs_generator.cc' object='thrift-t_hs_generator.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_hs_generator.o `test -f 'src/generate/t_hs_generator.cc' || echo '$(srcdir)/'`src/generate/t_hs_generator.cc
+-
+-thrift-t_hs_generator.obj: src/generate/t_hs_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_hs_generator.obj -MD -MP -MF $(DEPDIR)/thrift-t_hs_generator.Tpo -c -o thrift-t_hs_generator.obj `if test -f 'src/generate/t_hs_generator.cc'; then $(CYGPATH_W) 'src/generate/t_hs_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_hs_generator.cc'; fi`
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_hs_generator.Tpo $(DEPDIR)/thrift-t_hs_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_hs_generator.cc' object='thrift-t_hs_generator.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_hs_generator.obj `if test -f 'src/generate/t_hs_generator.cc'; then $(CYGPATH_W) 'src/generate/t_hs_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_hs_generator.cc'; fi`
+-
+-thrift-t_xsd_generator.o: src/generate/t_xsd_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_xsd_generator.o -MD -MP -MF $(DEPDIR)/thrift-t_xsd_generator.Tpo -c -o thrift-t_xsd_generator.o `test -f 'src/generate/t_xsd_generator.cc' || echo '$(srcdir)/'`src/generate/t_xsd_generator.cc
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_xsd_generator.Tpo $(DEPDIR)/thrift-t_xsd_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_xsd_generator.cc' object='thrift-t_xsd_generator.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_xsd_generator.o `test -f 'src/generate/t_xsd_generator.cc' || echo '$(srcdir)/'`src/generate/t_xsd_generator.cc
+-
+-thrift-t_xsd_generator.obj: src/generate/t_xsd_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_xsd_generator.obj -MD -MP -MF $(DEPDIR)/thrift-t_xsd_generator.Tpo -c -o thrift-t_xsd_generator.obj `if test -f 'src/generate/t_xsd_generator.cc'; then $(CYGPATH_W) 'src/generate/t_xsd_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_xsd_generator.cc'; fi`
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_xsd_generator.Tpo $(DEPDIR)/thrift-t_xsd_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_xsd_generator.cc' object='thrift-t_xsd_generator.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_xsd_generator.obj `if test -f 'src/generate/t_xsd_generator.cc'; then $(CYGPATH_W) 'src/generate/t_xsd_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_xsd_generator.cc'; fi`
+-
+ thrift-t_html_generator.o: src/generate/t_html_generator.cc
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_html_generator.o -MD -MP -MF $(DEPDIR)/thrift-t_html_generator.Tpo -c -o thrift-t_html_generator.o `test -f 'src/generate/t_html_generator.cc' || echo '$(srcdir)/'`src/generate/t_html_generator.cc
+ @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_html_generator.Tpo $(DEPDIR)/thrift-t_html_generator.Po
+@@ -906,76 +658,6 @@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_js_generator.obj `if test -f 'src/generate/t_js_generator.cc'; then $(CYGPATH_W) 'src/generate/t_js_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_js_generator.cc'; fi`
+
+-thrift-t_javame_generator.o: src/generate/t_javame_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_javame_generator.o -MD -MP -MF $(DEPDIR)/thrift-t_javame_generator.Tpo -c -o thrift-t_javame_generator.o `test -f 'src/generate/t_javame_generator.cc' || echo '$(srcdir)/'`src/generate/t_javame_generator.cc
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_javame_generator.Tpo $(DEPDIR)/thrift-t_javame_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_javame_generator.cc' object='thrift-t_javame_generator.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_javame_generator.o `test -f 'src/generate/t_javame_generator.cc' || echo '$(srcdir)/'`src/generate/t_javame_generator.cc
+-
+-thrift-t_javame_generator.obj: src/generate/t_javame_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_javame_generator.obj -MD -MP -MF $(DEPDIR)/thrift-t_javame_generator.Tpo -c -o thrift-t_javame_generator.obj `if test -f 'src/generate/t_javame_generator.cc'; then $(CYGPATH_W) 'src/generate/t_javame_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_javame_generator.cc'; fi`
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_javame_generator.Tpo $(DEPDIR)/thrift-t_javame_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_javame_generator.cc' object='thrift-t_javame_generator.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_javame_generator.obj `if test -f 'src/generate/t_javame_generator.cc'; then $(CYGPATH_W) 'src/generate/t_javame_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_javame_generator.cc'; fi`
+-
+-thrift-t_delphi_generator.o: src/generate/t_delphi_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_delphi_generator.o -MD -MP -MF $(DEPDIR)/thrift-t_delphi_generator.Tpo -c -o thrift-t_delphi_generator.o `test -f 'src/generate/t_delphi_generator.cc' || echo '$(srcdir)/'`src/generate/t_delphi_generator.cc
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_delphi_generator.Tpo $(DEPDIR)/thrift-t_delphi_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_delphi_generator.cc' object='thrift-t_delphi_generator.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_delphi_generator.o `test -f 'src/generate/t_delphi_generator.cc' || echo '$(srcdir)/'`src/generate/t_delphi_generator.cc
+-
+-thrift-t_delphi_generator.obj: src/generate/t_delphi_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_delphi_generator.obj -MD -MP -MF $(DEPDIR)/thrift-t_delphi_generator.Tpo -c -o thrift-t_delphi_generator.obj `if test -f 'src/generate/t_delphi_generator.cc'; then $(CYGPATH_W) 'src/generate/t_delphi_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_delphi_generator.cc'; fi`
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_delphi_generator.Tpo $(DEPDIR)/thrift-t_delphi_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_delphi_generator.cc' object='thrift-t_delphi_generator.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_delphi_generator.obj `if test -f 'src/generate/t_delphi_generator.cc'; then $(CYGPATH_W) 'src/generate/t_delphi_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_delphi_generator.cc'; fi`
+-
+-thrift-t_go_generator.o: src/generate/t_go_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_go_generator.o -MD -MP -MF $(DEPDIR)/thrift-t_go_generator.Tpo -c -o thrift-t_go_generator.o `test -f 'src/generate/t_go_generator.cc' || echo '$(srcdir)/'`src/generate/t_go_generator.cc
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_go_generator.Tpo $(DEPDIR)/thrift-t_go_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_go_generator.cc' object='thrift-t_go_generator.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_go_generator.o `test -f 'src/generate/t_go_generator.cc' || echo '$(srcdir)/'`src/generate/t_go_generator.cc
+-
+-thrift-t_go_generator.obj: src/generate/t_go_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_go_generator.obj -MD -MP -MF $(DEPDIR)/thrift-t_go_generator.Tpo -c -o thrift-t_go_generator.obj `if test -f 'src/generate/t_go_generator.cc'; then $(CYGPATH_W) 'src/generate/t_go_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_go_generator.cc'; fi`
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_go_generator.Tpo $(DEPDIR)/thrift-t_go_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_go_generator.cc' object='thrift-t_go_generator.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_go_generator.obj `if test -f 'src/generate/t_go_generator.cc'; then $(CYGPATH_W) 'src/generate/t_go_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_go_generator.cc'; fi`
+-
+-thrift-t_gv_generator.o: src/generate/t_gv_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_gv_generator.o -MD -MP -MF $(DEPDIR)/thrift-t_gv_generator.Tpo -c -o thrift-t_gv_generator.o `test -f 'src/generate/t_gv_generator.cc' || echo '$(srcdir)/'`src/generate/t_gv_generator.cc
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_gv_generator.Tpo $(DEPDIR)/thrift-t_gv_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_gv_generator.cc' object='thrift-t_gv_generator.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_gv_generator.o `test -f 'src/generate/t_gv_generator.cc' || echo '$(srcdir)/'`src/generate/t_gv_generator.cc
+-
+-thrift-t_gv_generator.obj: src/generate/t_gv_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_gv_generator.obj -MD -MP -MF $(DEPDIR)/thrift-t_gv_generator.Tpo -c -o thrift-t_gv_generator.obj `if test -f 'src/generate/t_gv_generator.cc'; then $(CYGPATH_W) 'src/generate/t_gv_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_gv_generator.cc'; fi`
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_gv_generator.Tpo $(DEPDIR)/thrift-t_gv_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_gv_generator.cc' object='thrift-t_gv_generator.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_gv_generator.obj `if test -f 'src/generate/t_gv_generator.cc'; then $(CYGPATH_W) 'src/generate/t_gv_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_gv_generator.cc'; fi`
+-
+-thrift-t_d_generator.o: src/generate/t_d_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_d_generator.o -MD -MP -MF $(DEPDIR)/thrift-t_d_generator.Tpo -c -o thrift-t_d_generator.o `test -f 'src/generate/t_d_generator.cc' || echo '$(srcdir)/'`src/generate/t_d_generator.cc
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_d_generator.Tpo $(DEPDIR)/thrift-t_d_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_d_generator.cc' object='thrift-t_d_generator.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_d_generator.o `test -f 'src/generate/t_d_generator.cc' || echo '$(srcdir)/'`src/generate/t_d_generator.cc
+-
+-thrift-t_d_generator.obj: src/generate/t_d_generator.cc
+-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_d_generator.obj -MD -MP -MF $(DEPDIR)/thrift-t_d_generator.Tpo -c -o thrift-t_d_generator.obj `if test -f 'src/generate/t_d_generator.cc'; then $(CYGPATH_W) 'src/generate/t_d_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_d_generator.cc'; fi`
+-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_d_generator.Tpo $(DEPDIR)/thrift-t_d_generator.Po
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_d_generator.cc' object='thrift-t_d_generator.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_d_generator.obj `if test -f 'src/generate/t_d_generator.cc'; then $(CYGPATH_W) 'src/generate/t_d_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_d_generator.cc'; fi`
+-
+ .ll.cc:
+ $(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
+
http://git-wip-us.apache.org/repos/asf/aurora/blob/5bdee77a/build-support/thrift/AURORA-1727.compiler.cpp.src.generate.t_java_generator.cc.patch
----------------------------------------------------------------------
diff --git a/build-support/thrift/AURORA-1727.compiler.cpp.src.generate.t_java_generator.cc.patch b/build-support/thrift/AURORA-1727.compiler.cpp.src.generate.t_java_generator.cc.patch
new file mode 100644
index 0000000..c7ad4bb
--- /dev/null
+++ b/build-support/thrift/AURORA-1727.compiler.cpp.src.generate.t_java_generator.cc.patch
@@ -0,0 +1,14 @@
+--- thrift-0.9.1/compiler/cpp/src/generate/t_java_generator.cc 2016-07-01 12:44:02.556421907 -0600
++++ thrift-0.9.1/compiler/cpp/src/generate/t_java_generator.cc.fix 2016-07-01 12:41:46.798444685 -0600
+@@ -2827,7 +2827,10 @@
+ bool first = true;
+ if (xceptions.size() > 0) {
+ for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
+- first ? first = false : indent(f_service_) << "else ";
++ if (first) {
++ indent(f_service_) << "else ";
++ }
++ first = false;
+ indent(f_service_) << "if (e instanceof " << type_name((*x_iter)->get_type(), false, false)<<") {" << endl;
+ indent(f_service_) << indent() << "result." << (*x_iter)->get_name() << " = (" << type_name((*x_iter)->get_type(), false, false) << ") e;" << endl;
+ indent(f_service_) << indent() << "result.set" << get_cap_name((*x_iter)->get_name()) << get_cap_name("isSet") << "(true);" << endl;
http://git-wip-us.apache.org/repos/asf/aurora/blob/5bdee77a/build-support/thrift/Makefile
----------------------------------------------------------------------
diff --git a/build-support/thrift/Makefile b/build-support/thrift/Makefile
index c28f414..48b174a 100644
--- a/build-support/thrift/Makefile
+++ b/build-support/thrift/Makefile
@@ -54,6 +54,8 @@ $(THRIFT):
sha256=$$(curl -s --show-error $(THRIFT_PATCH_URL) | tee thrift.patch | $(calculate_sha256)) && \
[ "$${sha256}" = "$(THRIFT_PATCH_SHA256)" ] && \
patch -p1 < thrift.patch && \
+ patch -p1 < ../AURORA-1727.compiler.cpp.Makefile.in.patch && \
+ patch -p1 < ../AURORA-1727.compiler.cpp.src.generate.t_java_generator.cc.patch && \
./configure $(THRIFT_CONFIGURE_FLAGS) && \
make -j4