diff --git a/Makefile.am b/Makefile.am
index 04cd63b..26ddab6 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,27 +30,27 @@
 endif
 
 dist-hook:
-    find $(distdir) -type f \( -iname ".DS_Store" -or -iname "._*" -or -iname ".gitignore" \) | xargs rm -rf
-    find $(distdir) -type d \( -iname ".deps" -or -iname ".libs" \) | xargs rm -rf
-    find $(distdir) -type d \( -iname ".svn" -or -iname ".git" \) | xargs rm -rf
+	find $(distdir) -type f \( -iname ".DS_Store" -or -iname "._*" -or -iname ".gitignore" \) | xargs rm -rf
+	find $(distdir) -type d \( -iname ".deps" -or -iname ".libs" \) | xargs rm -rf
+	find $(distdir) -type d \( -iname ".svn" -or -iname ".git" \) | xargs rm -rf
 
 print-version:
-    @echo $(VERSION)
+	@echo $(VERSION)
 
 
 cross: check
-    sh test/test.sh
+	sh test/test.sh
 
 EXTRA_DIST = \
-    .travis.yml \
-    bower.json \
-    composer.json \
-    contrib \
-    debian \
-    doc \
-    doap.rdf \
-    sonar-project.properties \
-    LICENSE \
-    CHANGES \
-    NOTICE \
-    README.md
+	.travis.yml \
+	bower.json \
+	composer.json \
+	contrib \
+	debian \
+	doc \
+	doap.rdf \
+	sonar-project.properties \
+	LICENSE \
+	CHANGES \
+	NOTICE \
+	README.md
diff --git a/compiler/cpp/Makefile.am b/compiler/cpp/Makefile.am
index 00b027d..601fd32 100644
--- a/compiler/cpp/Makefile.am
+++ b/compiler/cpp/Makefile.am
@@ -112,6 +112,6 @@
              $(WINDOWS_DIST)
 
 clean-local:
-    $(RM) thriftl.cc thrifty.cc thrifty.h thrifty.hh version.h windows/version.h
+	$(RM) thriftl.cc thrifty.cc thrifty.h thrifty.hh version.h windows/version.h
 
 src/main.cc: version.h
diff --git a/contrib/fb303/cpp/Makefile.am b/contrib/fb303/cpp/Makefile.am
index bb1cb60..748d329 100644
--- a/contrib/fb303/cpp/Makefile.am
+++ b/contrib/fb303/cpp/Makefile.am
@@ -38,7 +38,7 @@
 
 AM_CPPFLAGS = -I..
 AM_CPPFLAGS += -Igen-cpp
-AM_CPPFLAGS += -I$(thrift_home)/include/thrift
+AM_CPPFLAGS += -I$(thrift_home)/include/thrift 
 AM_CPPFLAGS += $(BOOST_CPPFLAGS)
 AM_CPPFLAGS += $(FB_CPPFLAGS) $(DEBUG_CPPFLAGS)
 
diff --git a/contrib/fb303/py/Makefile.am b/contrib/fb303/py/Makefile.am
index dc8c037..060495e 100644
--- a/contrib/fb303/py/Makefile.am
+++ b/contrib/fb303/py/Makefile.am
@@ -23,22 +23,22 @@
 all:
 
 all-local:
-    $(thrift_home)/bin/thrift --gen py $(top_srcdir)/if/fb303.thrift
-    mv gen-py/fb303/* fb303
-    $(PYTHON) setup.py build
+	$(thrift_home)/bin/thrift --gen py $(top_srcdir)/if/fb303.thrift
+	mv gen-py/fb303/* fb303
+	$(PYTHON) setup.py build
 
 # We're ignoring prefix here because site-packages seems to be
 # the equivalent of /usr/local/lib in Python land.
 # Old version (can't put inline because it's not portable).
 #$(PYTHON) setup.py install --prefix=$(prefix) --root=$(DESTDIR) $(PYTHON_SETUPUTIL_ARGS)
 install-exec-hook:
-    $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(PY_PREFIX) $(PYTHON_SETUPUTIL_ARGS)
+	$(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(PY_PREFIX) $(PYTHON_SETUPUTIL_ARGS)
 
 
 
-clean:    clean-local
+clean:	clean-local
 
 clean-local:
-    $(RM) -r build
+	$(RM) -r build
 
 check-local: all
diff --git a/lib/Makefile.am b/lib/Makefile.am
index ee919b4..5751a2c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -81,12 +81,12 @@
 # All of the libs that don't use Automake need to go in here
 # so they will end up in our release tarballs.
 EXTRA_DIST = \
-    as3 \
-    cocoa \
-    d \
-    delphi \
-    javame \
-    js \
-    ocaml \
-    st \
-    ts
+	as3 \
+	cocoa \
+	d \
+	delphi \
+	javame \
+	js \
+	ocaml \
+	st \
+	ts
diff --git a/lib/c_glib/test/Makefile.am b/lib/c_glib/test/Makefile.am
index e106bb1..72d0f64 100755
--- a/lib/c_glib/test/Makefile.am
+++ b/lib/c_glib/test/Makefile.am
@@ -159,16 +159,16 @@
 THRIFT = $(top_builddir)/compiler/cpp/thrift
 
 gen-c_glib/t_test_debug_proto_test_types.c gen-c_glib/t_test_debug_proto_test_types.h gen-c_glib/t_test_empty_service.c gen-c_glib/t_test_empty_service.h gen-c_glib/t_test_inherited.c gen-c_glib/t_test_inherited.h gen-c_glib/t_test_reverse_order_service.c gen-c_glib/t_test_reverse_order_service.h gen-c_glib/t_test_service_for_exception_with_a_map.c gen-c_glib/t_test_service_for_exception_with_a_map.h gen-c_glib/t_test_srv.c gen-c_glib/t_test_srv.h: ../../../test/DebugProtoTest.thrift
-    $(THRIFT) --gen c_glib $<
+	$(THRIFT) --gen c_glib $<
 
 gen-c_glib/t_test_optional_required_test_types.c gen-c_glib/t_test_optional_required_test_types.h: ../../../test/OptionalRequiredTest.thrift
-    $(THRIFT) --gen c_glib $<
+	$(THRIFT) --gen c_glib $<
 
 gen-c_glib/t_test_second_service.c gen-c_glib/t_test_thrift_test.c gen-c_glib/t_test_thrift_test_types.c gen-c_glib/t_test_second_service.h gen-c_glib/t_test_thrift_test-.h gen-c_glib/t_test_thrift_test_types.h: ../../../test/ThriftTest.thrift
-    $(THRIFT) --gen c_glib $<
+	$(THRIFT) --gen c_glib $<
 
 gen-cpp/ThriftTest.cpp gen-cpp/ThriftTest.h: ../../../test/ThriftTest.thrift
-    $(THRIFT) --gen cpp $<
+	$(THRIFT) --gen cpp $<
 
 TESTS = \
   $(check_PROGRAMS) \
@@ -191,39 +191,39 @@
                      ${myextravalgrindleakopts}
 
 memcheck: $(check_PROGRAMS)
-    @for x in $(check_PROGRAMS);                                     \
-      do                                                             \
-        $(MAKE) memcheck-$$x;                                        \
-      done
+	@for x in $(check_PROGRAMS);                                     \
+	  do                                                             \
+	    $(MAKE) memcheck-$$x;                                        \
+	  done
 
 leakcheck: $(check_PROGRAMS)
-    @for x in $(check_PROGRAMS);                                     \
-      do                                                             \
-        $(MAKE) leakcheck-$$x;                                       \
-    done
+	@for x in $(check_PROGRAMS);                                     \
+	  do                                                             \
+	    $(MAKE) leakcheck-$$x;                                       \
+	done
 
 memcheck-%: %
-    @echo "*****************************************";               \
-    echo "MEMCHECK: $<";                                             \
-    echo "ARGS: ${VALGRIND_OPTS} ${VALGRIND_MEM_OPTS} ${$<_VALGRIND_MEM_OPTS}";                                                                      \
-    $(LIBTOOL) --mode=execute                                        \
-      valgrind                                                       \
-        ${VALGRIND_OPTS}                                             \
-        ${VALGRIND_MEM_OPTS}                                         \
-        ${$<_VALGRIND_MEM_OPTS} ./$<
+	@echo "*****************************************";               \
+	echo "MEMCHECK: $<";                                             \
+	echo "ARGS: ${VALGRIND_OPTS} ${VALGRIND_MEM_OPTS} ${$<_VALGRIND_MEM_OPTS}";                                                                      \
+	$(LIBTOOL) --mode=execute                                        \
+	  valgrind                                                       \
+	    ${VALGRIND_OPTS}                                             \
+	    ${VALGRIND_MEM_OPTS}                                         \
+	    ${$<_VALGRIND_MEM_OPTS} ./$<
 
 leakcheck-%: %
-    @echo "*****************************************";              \
-    echo "LEAKCHECK: $<";                                           \
-    echo "ARGS: ${VALGRIND_OPTS} ${VALGRIND_LEAK_OPTS} ${$<_VALGRIND_LEAK_OPTS}";                                                                   \
-    G_SLICE=always-malloc $(LIBTOOL) --mode=execute                 \
-      valgrind                                                      \
-        ${VALGRIND_OPTS}                                            \
-        ${VALGRIND_LEAK_OPTS}                                       \
-        ${$<_VALGRIND_LEAK_OPTS}  ./$<
+	@echo "*****************************************";              \
+	echo "LEAKCHECK: $<";                                           \
+	echo "ARGS: ${VALGRIND_OPTS} ${VALGRIND_LEAK_OPTS} ${$<_VALGRIND_LEAK_OPTS}";                                                                   \
+	G_SLICE=always-malloc $(LIBTOOL) --mode=execute                 \
+	  valgrind                                                      \
+	    ${VALGRIND_OPTS}                                            \
+	    ${VALGRIND_LEAK_OPTS}                                       \
+	    ${$<_VALGRIND_LEAK_OPTS}  ./$<
 
 clean-local:
-    $(RM) -r gen-c_glib gen-cpp
+	$(RM) -r gen-c_glib gen-cpp
 
 CLEANFILES =                            \
     *.bb                                \
diff --git a/lib/cpp/Makefile.am b/lib/cpp/Makefile.am
index 2d77a34..4bd40fb 100755
--- a/lib/cpp/Makefile.am
+++ b/lib/cpp/Makefile.am
@@ -18,7 +18,7 @@
 #
 
 moc_%.cpp: %.h
-    $(QT_MOC) $(QT_CFLAGS) $< -o $@
+	$(QT_MOC) $(QT_CFLAGS) $< -o $@
 
 SUBDIRS = .
 
diff --git a/lib/cpp/test/Makefile.am b/lib/cpp/test/Makefile.am
index 3dbcb45..012d226 100755
--- a/lib/cpp/test/Makefile.am
+++ b/lib/cpp/test/Makefile.am
@@ -19,28 +19,28 @@
 .NOTPARALLEL:
 noinst_LTLIBRARIES = libtestgencpp.la libprocessortest.la
 nodist_libtestgencpp_la_SOURCES = \
-    gen-cpp/DebugProtoTest_types.cpp \
-    gen-cpp/DebugProtoTest_types.h \
-    gen-cpp/EnumTest_types.cpp \
-    gen-cpp/EnumTest_types.h \
-    gen-cpp/OptionalRequiredTest_types.cpp \
-    gen-cpp/OptionalRequiredTest_types.h \
-    gen-cpp/Recursive_types.cpp \
-    gen-cpp/Recursive_types.h \
-    gen-cpp/ThriftTest_types.cpp \
-    gen-cpp/ThriftTest_types.h \
-    gen-cpp/TypedefTest_types.cpp \
-    gen-cpp/TypedefTest_types.h \
-    ThriftTest_extras.cpp \
-    DebugProtoTest_extras.cpp
+	gen-cpp/DebugProtoTest_types.cpp \
+	gen-cpp/DebugProtoTest_types.h \
+	gen-cpp/EnumTest_types.cpp \
+	gen-cpp/EnumTest_types.h \
+	gen-cpp/OptionalRequiredTest_types.cpp \
+	gen-cpp/OptionalRequiredTest_types.h \
+	gen-cpp/Recursive_types.cpp \
+	gen-cpp/Recursive_types.h \
+	gen-cpp/ThriftTest_types.cpp \
+	gen-cpp/ThriftTest_types.h \
+	gen-cpp/TypedefTest_types.cpp \
+	gen-cpp/TypedefTest_types.h \
+	ThriftTest_extras.cpp \
+	DebugProtoTest_extras.cpp
 
 nodist_libprocessortest_la_SOURCES = \
-    gen-cpp/ChildService.cpp \
-    gen-cpp/ChildService.h \
-    gen-cpp/ParentService.cpp \
-    gen-cpp/ParentService.h \
-    gen-cpp/proc_types.cpp \
-    gen-cpp/proc_types.h
+	gen-cpp/ChildService.cpp \
+	gen-cpp/ChildService.h \
+	gen-cpp/ParentService.cpp \
+	gen-cpp/ParentService.h \
+	gen-cpp/proc_types.cpp \
+	gen-cpp/proc_types.h
 
 ThriftTest_extras.o: gen-cpp/ThriftTest_types.h
 DebugProtoTest_extras.o: gen-cpp/DebugProtoTest_types.h
@@ -50,45 +50,45 @@
 noinst_PROGRAMS = Benchmark
 
 Benchmark_SOURCES = \
-    Benchmark.cpp
+	Benchmark.cpp
 
 Benchmark_LDADD = libtestgencpp.la
 
 check_PROGRAMS = \
-    TFDTransportTest \
-    TPipedTransportTest \
-    DebugProtoTest \
-    JSONProtoTest \
-    OptionalRequiredTest \
-    RecursiveTest \
-    SpecializationTest \
-    AllProtocolsTest \
-    TransportTest \
-    ZlibTest \
-    TFileTransportTest \
-    UnitTests \
-    link_test \
-    OpenSSLManualInitTest \
-    EnumTest
+	TFDTransportTest \
+	TPipedTransportTest \
+	DebugProtoTest \
+	JSONProtoTest \
+	OptionalRequiredTest \
+	RecursiveTest \
+	SpecializationTest \
+	AllProtocolsTest \
+	TransportTest \
+	ZlibTest \
+	TFileTransportTest \
+	UnitTests \
+	link_test \
+	OpenSSLManualInitTest \
+	EnumTest
 # disable these test ... too strong
 #       processor_test
-#    concurrency_test
+#	concurrency_test
 
 TESTS_ENVIRONMENT= \
-    BOOST_TEST_LOG_SINK=tests.xml \
-    BOOST_TEST_LOG_LEVEL=test_suite \
-    BOOST_TEST_LOG_FORMAT=xml
+	BOOST_TEST_LOG_SINK=tests.xml \
+	BOOST_TEST_LOG_LEVEL=test_suite \
+	BOOST_TEST_LOG_FORMAT=xml
 
 TESTS = \
-    $(check_PROGRAMS)
+	$(check_PROGRAMS)
 
 UnitTests_SOURCES = \
-    UnitTestMain.cpp \
-    TMemoryBufferTest.cpp \
-    TBufferBaseTest.cpp \
-    Base64Test.cpp \
-    ToStringTest.cpp \
-    TypedefTest.cpp
+	UnitTestMain.cpp \
+	TMemoryBufferTest.cpp \
+	TBufferBaseTest.cpp \
+	Base64Test.cpp \
+	ToStringTest.cpp \
+	TypedefTest.cpp
 
 if !WITH_BOOSTTHREADS
 UnitTests_SOURCES += \
@@ -100,7 +100,7 @@
   -l:libboost_unit_test_framework.a
 
 TransportTest_SOURCES = \
-    TransportTest.cpp
+	TransportTest.cpp
 
 TransportTest_LDADD = \
   libtestgencpp.la \
@@ -109,7 +109,7 @@
   -lz
 
 ZlibTest_SOURCES = \
-    ZlibTest.cpp
+	ZlibTest.cpp
 
 ZlibTest_LDADD = \
   libtestgencpp.la \
@@ -125,7 +125,7 @@
   -l:libboost_unit_test_framework.a
 
 TFileTransportTest_SOURCES = \
-    TFileTransportTest.cpp
+	TFileTransportTest.cpp
 
 TFileTransportTest_LDADD = \
   libtestgencpp.la \
@@ -135,28 +135,28 @@
 # TFDTransportTest
 #
 TFDTransportTest_SOURCES = \
-    TFDTransportTest.cpp
+	TFDTransportTest.cpp
 
 TFDTransportTest_LDADD = \
-    $(top_builddir)/lib/cpp/libthrift.la
+	$(top_builddir)/lib/cpp/libthrift.la
 
 
 #
 # TPipedTransportTest
 #
 TPipedTransportTest_SOURCES = \
-    TPipedTransportTest.cpp
+	TPipedTransportTest.cpp
 
 TPipedTransportTest_LDADD = \
-    $(top_builddir)/lib/cpp/libthrift.la
+	$(top_builddir)/lib/cpp/libthrift.la
 
 #
 # AllProtocolsTest
 #
 AllProtocolsTest_SOURCES = \
-    AllProtocolTests.cpp \
-    AllProtocolTests.tcc \
-    GenericHelpers.h
+	AllProtocolTests.cpp \
+	AllProtocolTests.tcc \
+	GenericHelpers.h
 
 AllProtocolsTest_LDADD = libtestgencpp.la
 
@@ -164,7 +164,7 @@
 # DebugProtoTest
 #
 DebugProtoTest_SOURCES = \
-    DebugProtoTest.cpp
+	DebugProtoTest.cpp
 
 DebugProtoTest_LDADD = libtestgencpp.la
 
@@ -173,7 +173,7 @@
 # JSONProtoTest
 #
 JSONProtoTest_SOURCES = \
-    JSONProtoTest.cpp
+	JSONProtoTest.cpp
 
 JSONProtoTest_LDADD = libtestgencpp.la
 
@@ -181,7 +181,7 @@
 # OptionalRequiredTest
 #
 OptionalRequiredTest_SOURCES = \
-    OptionalRequiredTest.cpp
+	OptionalRequiredTest.cpp
 
 OptionalRequiredTest_LDADD = libtestgencpp.la
 
@@ -189,7 +189,7 @@
 # OptionalRequiredTest
 #
 RecursiveTest_SOURCES = \
-    RecursiveTest.cpp
+	RecursiveTest.cpp
 
 RecursiveTest_LDADD = libtestgencpp.la
 
@@ -197,15 +197,15 @@
 # SpecializationTest
 #
 SpecializationTest_SOURCES = \
-    SpecializationTest.cpp
+	SpecializationTest.cpp
 
 SpecializationTest_LDADD = libtestgencpp.la
 
 concurrency_test_SOURCES = \
-    concurrency/Tests.cpp \
-    concurrency/ThreadFactoryTests.h \
-    concurrency/ThreadManagerTests.h \
-    concurrency/TimerManagerTests.h
+	concurrency/Tests.cpp \
+	concurrency/ThreadFactoryTests.h \
+	concurrency/ThreadManagerTests.h \
+	concurrency/TimerManagerTests.h
 
 concurrency_test_LDADD = \
   $(top_builddir)/lib/cpp/libthrift.la
@@ -216,12 +216,12 @@
   link/TemplatedService2.cpp
 
 processor_test_SOURCES = \
-    processor/ProcessorTest.cpp \
-    processor/EventLog.cpp \
-    processor/ServerThread.cpp \
-    processor/EventLog.h \
-    processor/Handlers.h \
-    processor/ServerThread.h
+	processor/ProcessorTest.cpp \
+	processor/EventLog.cpp \
+	processor/ServerThread.cpp \
+	processor/EventLog.h \
+	processor/Handlers.h \
+	processor/ServerThread.h
 
 processor_test_LDADD = libprocessortest.la \
                        $(top_builddir)/lib/cpp/libthrift.la \
@@ -231,11 +231,11 @@
                        -l:libboost_unit_test_framework.a
 
 OpenSSLManualInitTest_SOURCES = \
-    OpenSSLManualInitTest.cpp
+	OpenSSLManualInitTest.cpp
 
 OpenSSLManualInitTest_LDADD = \
-    $(top_builddir)/lib/cpp/libthrift.la \
-    -l:libboost_unit_test_framework.a
+	$(top_builddir)/lib/cpp/libthrift.la \
+	-l:libboost_unit_test_framework.a
 
 #
 # Common thrift code generation rules
@@ -243,39 +243,39 @@
 THRIFT = $(top_builddir)/compiler/cpp/thrift
 
 gen-cpp/DebugProtoTest_types.cpp gen-cpp/DebugProtoTest_types.h: $(top_srcdir)/test/DebugProtoTest.thrift
-    $(THRIFT) --gen cpp:dense $<
+	$(THRIFT) --gen cpp:dense $<
 
 gen-cpp/EnumTest_types.cpp gen-cpp/EnumTest_types.h: $(top_srcdir)/test/EnumTest.thrift
-    $(THRIFT) --gen cpp $<
+	$(THRIFT) --gen cpp $<
 
 gen-cpp/TypedefTest_types.cpp gen-cpp/TypedefTest_types.h: $(top_srcdir)/test/TypedefTest.thrift
-    $(THRIFT) --gen cpp $<
+	$(THRIFT) --gen cpp $<
 
 gen-cpp/OptionalRequiredTest_types.cpp gen-cpp/OptionalRequiredTest_types.h: $(top_srcdir)/test/OptionalRequiredTest.thrift
-    $(THRIFT) --gen cpp:dense $<
+	$(THRIFT) --gen cpp:dense $<
 
 gen-cpp/Recursive_types.cpp gen-cpp/Recursive_types.h: $(top_srcdir)/test/Recursive.thrift
-    $(THRIFT) --gen cpp $<
+	$(THRIFT) --gen cpp $<
 
 gen-cpp/Service.cpp gen-cpp/StressTest_types.cpp: $(top_srcdir)/test/StressTest.thrift
-    $(THRIFT) --gen cpp:dense $<
+	$(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: $(top_srcdir)/test/ThriftTest.thrift
-    $(THRIFT) --gen cpp:dense $<
+	$(THRIFT) --gen cpp:dense $<
 
 gen-cpp/ChildService.cpp: processor/proc.thrift
-    $(THRIFT) --gen cpp:templates,cob_style $<
+	$(THRIFT) --gen cpp:templates,cob_style $<
 
 AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(top_srcdir)/lib/cpp/src
 AM_LDFLAGS = $(BOOST_LDFLAGS)
 AM_CXXFLAGS = -Wall
 
 clean-local:
-    $(RM) -r gen-cpp
+	$(RM) -r gen-cpp
 
 EXTRA_DIST = \
-    DenseProtoTest.cpp \
-    ThriftTest_extras.cpp \
-    DebugProtoTest_extras.cpp \
-    concurrency \
-    processor
+	DenseProtoTest.cpp \
+	ThriftTest_extras.cpp \
+	DebugProtoTest_extras.cpp \
+	concurrency \
+	processor
diff --git a/lib/d/Makefile.am b/lib/d/Makefile.am
index 5e34f99..759677a 100644
--- a/lib/d/Makefile.am
+++ b/lib/d/Makefile.am
@@ -41,37 +41,37 @@
 d_async_DATA = $(addprefix src/, $(addsuffix .d, $(d_asyncmodules)))
 
 d_codegenmodules = $(addprefix thrift/codegen/, async_client \
-    async_client_pool base client client_pool idlgen processor)
+	async_client_pool base client client_pool idlgen processor)
 d_codegendir = $(d_thriftdir)/codegen
 d_codegen_DATA = $(addprefix src/, $(addsuffix .d, $(d_codegenmodules)))
 
 d_protocolmodules = $(addprefix thrift/protocol/, base binary compact json \
-    processor)
+	processor)
 d_protocoldir = $(d_thriftdir)/protocol
 d_protocol_DATA = $(addprefix src/, $(addsuffix .d, $(d_protocolmodules)))
 
 d_servermodules = $(addprefix thrift/server/, base simple nonblocking \
-    taskpool threaded)
+	taskpool threaded)
 d_serverdir = $(d_thriftdir)/server
 d_server_DATA = $(addprefix src/, $(addsuffix .d, $(d_servermodules)))
 
 d_servertransportmodules = $(addprefix thrift/server/transport/, base socket ssl)
 d_servertransportdir = $(d_thriftdir)/server/transport
 d_servertransport_DATA = $(addprefix src/, $(addsuffix .d, \
-    $(d_servertransportmodules)))
+	$(d_servertransportmodules)))
 
 d_transportmodules = $(addprefix thrift/transport/, base buffered file \
-    framed http memory piped range socket ssl zlib)
+	framed http memory piped range socket ssl zlib)
 d_transportdir = $(d_thriftdir)/transport
 d_transport_DATA = $(addprefix src/, $(addsuffix .d, $(d_transportmodules)))
 
 d_utilmodules = $(addprefix thrift/util/, awaitable cancellation future \
-    hashset)
+	hashset)
 d_utildir = $(d_thriftdir)/util
 d_util_DATA = $(addprefix src/, $(addsuffix .d, $(d_utilmodules)))
 
 d_internalmodules = $(addprefix thrift/internal/, algorithm codegen ctfe \
-    endian resource_pool socket ssl ssl_bio traits)
+	endian resource_pool socket ssl ssl_bio traits)
 d_internaldir = $(d_thriftdir)/internal
 d_internal_DATA = $(addprefix src/, $(addsuffix .d, $(d_internalmodules)))
 
@@ -80,8 +80,8 @@
 d_test_DATA = $(addprefix src/, $(addsuffix .d, $(d_testmodules)))
 
 d_publicmodules = $(d_thriftmodules) $(d_asyncmodules) \
-    $(d_codegenmodules) $(d_protocolmodules) $(d_servermodules) \
-    $(d_servertransportmodules) $(d_transportmodules) $(d_utilmodules)
+	$(d_codegenmodules) $(d_protocolmodules) $(d_servermodules) \
+	$(d_servertransportmodules) $(d_transportmodules) $(d_utilmodules)
 d_publicsources = $(addprefix src/, $(addsuffix .d, $(d_publicmodules)))
 
 d_modules = $(d_publicmodules) $(d_internalmodules) $(d_testmodules)
@@ -89,9 +89,9 @@
 # List modules with external dependencies and remove them from the main list
 d_libevent_dependent_modules = thrift/async/libevent thrift/server/nonblocking
 d_openssl_dependent_modules = thrift/async/ssl thrift/internal/ssl \
-    thrift/internal/ssl_bio thrift/transport/ssl thrift/server/transport/ssl
+	thrift/internal/ssl_bio thrift/transport/ssl thrift/server/transport/ssl
 d_main_modules = $(filter-out $(d_libevent_dependent_modules) \
-    $(d_openssl_dependent_modules),$(d_modules))
+	$(d_openssl_dependent_modules),$(d_modules))
 
 
 d_lib_flags = -w -wi -Isrc -lib
@@ -102,7 +102,7 @@
 #
 if HAVE_DEIMOS_EVENT2
 $(D_EVENT_LIB_NAME): $(addprefix src/, $(addsuffix .d, $(d_libevent_dependent_modules)))
-    $(DMD) -of$(D_EVENT_LIB_NAME) $(d_lib_flags) $^
+	$(DMD) -of$(D_EVENT_LIB_NAME) $(d_lib_flags) $^
 all_targets += $(D_EVENT_LIB_NAME)
 endif
 
@@ -111,7 +111,7 @@
 #
 if HAVE_DEIMOS_OPENSSL
 $(D_SSL_LIB_NAME): $(addprefix src/, $(addsuffix .d, $(d_openssl_dependent_modules)))
-    $(DMD) -of$(D_SSL_LIB_NAME) $(d_lib_flags) $^
+	$(DMD) -of$(D_SSL_LIB_NAME) $(d_lib_flags) $^
 all_targets += $(D_SSL_LIB_NAME)
 endif
 
@@ -119,7 +119,7 @@
 # Main library target.
 #
 $(D_LIB_NAME): $(addprefix src/, $(addsuffix .d, $(d_main_modules)))
-    $(DMD) -of$(D_LIB_NAME) $(d_lib_flags) $^
+	$(DMD) -of$(D_LIB_NAME) $(d_lib_flags) $^
 all_targets += $(D_LIB_NAME)
 
 
@@ -127,7 +127,7 @@
 # Documentation target (requires Dil).
 #
 docs: $(d_publicsources) src/thrift/index.d
-    dil ddoc docs -hl --kandil $^
+	dil ddoc docs -hl --kandil $^
 
 
 #
@@ -136,11 +136,11 @@
 all-local: $(all_targets)
 
 install-exec-local:
-    $(INSTALL_PROGRAM) $(all_targets) $(DESTDIR)$(libdir)
+	$(INSTALL_PROGRAM) $(all_targets) $(DESTDIR)$(libdir)
 
 
 clean-local:
-    $(RM) -rf docs $(D_LIB_NAME) $(D_EVENT_LIB_NAME) $(D_SSL_LIB_NAME) unittest
+	$(RM) -rf docs $(D_LIB_NAME) $(D_EVENT_LIB_NAME) $(D_SSL_LIB_NAME) unittest
 
 
 #
@@ -167,23 +167,23 @@
 endif
 
 unittest/emptymain.d: unittest/.directory
-    @echo 'void main(){}' >$@
+	@echo 'void main(){}' >$@
 
 unittest/.directory:
-    mkdir -p unittest || exists unittest
-    touch $@
+	mkdir -p unittest || exists unittest
+	touch $@
 
 unittest/debug/%: src/%.d $(all_targets) unittest/emptymain.d
-    $(DMD) -gc -of$(subst /,$(DMD_OF_DIRSEP),$@) $(d_test_flags) $^
+	$(DMD) -gc -of$(subst /,$(DMD_OF_DIRSEP),$@) $(d_test_flags) $^
 
 unittest/release/%: src/%.d $(all_targets) unittest/emptymain.d
-    $(DMD) -O -release -of$(subst /,$(DMD_OF_DIRSEP),$@) $(d_test_flags) $^
+	$(DMD) -O -release -of$(subst /,$(DMD_OF_DIRSEP),$@) $(d_test_flags) $^
 
 TESTS = $(addprefix unittest/debug/, $(d_test_modules)) \
-    $(addprefix unittest/release/, $(d_test_modules))
+	$(addprefix unittest/release/, $(d_test_modules))
 
 
 EXTRA_DIST = \
-    src \
-    test \
-    README.md
+	src \
+	test \
+	README.md
diff --git a/lib/d/test/Makefile.am b/lib/d/test/Makefile.am
index b2f5a4b..0482583 100755
--- a/lib/d/test/Makefile.am
+++ b/lib/d/test/Makefile.am
@@ -26,33 +26,33 @@
 debug_proto_gen = $(addprefix gen-d/, DebugProtoTest_types.d)
 
 $(debug_proto_gen): $(top_srcdir)/test/DebugProtoTest.thrift
-    $(THRIFT) --gen d -nowarn $<
+	$(THRIFT) --gen d -nowarn $<
 
 stress_test_gen = $(addprefix gen-d/thrift/test/stress/, Service.d \
-    StressTest_types.d)
+	StressTest_types.d)
 
 $(stress_test_gen): $(top_srcdir)/test/StressTest.thrift
-    $(THRIFT) --gen d $<
+	$(THRIFT) --gen d $<
 
 thrift_test_gen = $(addprefix gen-d/thrift/test/, SecondService.d \
-    ThriftTest.d ThriftTest_constants.d ThriftTest_types.d)
+	ThriftTest.d ThriftTest_constants.d ThriftTest_types.d)
 
 $(thrift_test_gen): $(top_srcdir)/test/ThriftTest.thrift
-    $(THRIFT) --gen d $<
+	$(THRIFT) --gen d $<
 
 
 # The actual test targets.
 # There just must be some way to reassign a variable without warnings in
 # Automake...
 targets__ = async_test client_pool_test serialization_benchmark \
-    stress_test_server thrift_test_client thrift_test_server transport_test
+	stress_test_server thrift_test_client thrift_test_server transport_test
 ran_tests__ = client_pool_test \
-    transport_test \
-    async_test_runner.sh \
-    thrift_test_runner.sh
+	transport_test \
+	async_test_runner.sh \
+	thrift_test_runner.sh
 
 libevent_dependent_targets = async_test_client client_pool_test \
-    stress_test_server thrift_test_server
+	stress_test_server thrift_test_server
 libevent_dependent_ran_tests = client_pool_test async_test_runner.sh thrift_test_runner.sh
 
 openssl_dependent_targets = async_test thrift_test_client thrift_test_server
@@ -79,23 +79,23 @@
 endif
 
 d_test_flags += -w -wi -O -release -inline -I$(top_srcdir)/lib/d/src -Igen-d \
-    $(top_builddir)/lib/d/$(D_LIB_NAME)
+	$(top_builddir)/lib/d/$(D_LIB_NAME)
 
 
 async_test client_pool_test transport_test: %: %.d
-    $(DMD) $(d_test_flags) -of$@ $^
+	$(DMD) $(d_test_flags) -of$@ $^
 
 serialization_benchmark: %: %.d $(debug_proto_gen)
-    $(DMD) $(d_test_flags) -of$@ $^
+	$(DMD) $(d_test_flags) -of$@ $^
 
 stress_test_server: %: %.d test_utils.d $(stress_test_gen)
-    $(DMD) $(d_test_flags) -of$@ $^
+	$(DMD) $(d_test_flags) -of$@ $^
 
 thrift_test_client: %: %.d thrift_test_common.d $(thrift_test_gen)
-    $(DMD) $(d_test_flags) -of$@ $^
+	$(DMD) $(d_test_flags) -of$@ $^
 
 thrift_test_server: %: %.d thrift_test_common.d test_utils.d $(thrift_test_gen)
-    $(DMD) $(d_test_flags) -of$@ $^
+	$(DMD) $(d_test_flags) -of$@ $^
 
 
 # Certificate generation targets (for the SSL tests).
@@ -103,22 +103,22 @@
 # replaced by a more elaborate mechanism.
 
 server-certificate.pem: openssl.test.cnf
-    openssl req -new -x509 -nodes -config openssl.test.cnf \
-        -out server-certificate.pem
+	openssl req -new -x509 -nodes -config openssl.test.cnf \
+		-out server-certificate.pem
 
 trusted-ca-certificate.pem: server-certificate.pem
-    cat server-certificate.pem > $@
+	cat server-certificate.pem > $@
 
 check-local: $(targets)
 
 clean-local:
-    $(RM) -rf gen-d $(targets) $(addsuffix .o, $(targets))
+	$(RM) -rf gen-d $(targets) $(addsuffix .o, $(targets))
 
 
 # Tests ran as part of make check.
 
 async_test_runner.sh: async_test trusted-ca-certificate.pem server-certificate.pem
 thrift_test_runner.sh: thrift_test_client thrift_test_server \
-    trusted-ca-certificate.pem server-certificate.pem
+	trusted-ca-certificate.pem server-certificate.pem
 
 TESTS = $(ran_tests)
diff --git a/lib/erl/Makefile.am b/lib/erl/Makefile.am
index 9614379..60c7e5a 100644
--- a/lib/erl/Makefile.am
+++ b/lib/erl/Makefile.am
@@ -19,47 +19,47 @@
 
 THRIFT = ../../compiler/cpp/thrift
 THRIFT_FILES = $(wildcard test/*.thrift) \
-          ../../test/ThriftTest.thrift
+		  ../../test/ThriftTest.thrift
 
 .generated: $(THRIFT_FILES)
-    for f in $(THRIFT_FILES) ; do \
-      $(THRIFT) --gen erl -o test $$f ; \
-    done ; \
-    touch .generated
+	for f in $(THRIFT_FILES) ; do \
+	  $(THRIFT) --gen erl -o test $$f ; \
+	done ; \
+	touch .generated
 
 all: .generated
-    ./rebar get-deps
-    ./rebar compile
+	./rebar get-deps
+	./rebar compile
 
 check: .generated
-    ./rebar skip_deps=true eunit
+	./rebar skip_deps=true eunit
 
 install: all
-    mkdir -p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift) ; \
-    mkdir -p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)/ebin ; \
-    mkdir -p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)/include ; \
-    mkdir -p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)/src ; \
-    for p in ebin/*.app* ebin/*.beam include/*.hrl src/*.erl ; \
-        do $(INSTALL) $$p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)/$$p ; \
-    done
+	mkdir -p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift) ; \
+	mkdir -p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)/ebin ; \
+	mkdir -p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)/include ; \
+	mkdir -p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)/src ; \
+	for p in ebin/*.app* ebin/*.beam include/*.hrl src/*.erl ; \
+		do $(INSTALL) $$p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)/$$p ; \
+	done
 
 uninstall:
-    rm -rf $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)
+	rm -rf $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)
 
 clean:
-    rm -f .generated
-    rm -rf test/gen-erl/
-    ./rebar clean
+	rm -f .generated
+	rm -rf test/gen-erl/
+	./rebar clean
 
 maintainer-clean-local:
-    rm -rf ebin
+	rm -rf ebin
 
 EXTRA_DIST = \
-    include \
-    src \
-    rebar \
-    rebar.config \
-    test \
-    README.md
+	include \
+	src \
+	rebar \
+	rebar.config \
+	test \
+	README.md
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/lib/go/Makefile.am b/lib/go/Makefile.am
index 05369b9..be2a2e5 100644
--- a/lib/go/Makefile.am
+++ b/lib/go/Makefile.am
@@ -24,17 +24,17 @@
 endif
 
 install:
-    @echo '##############################################################'
-    @echo '##############################################################'
-    @echo 'The Go client library should be installed via "go get", please see /lib/go/README.md'
-    @echo '##############################################################'
-    @echo '##############################################################'
+	@echo '##############################################################'
+	@echo '##############################################################'
+	@echo 'The Go client library should be installed via "go get", please see /lib/go/README.md'
+	@echo '##############################################################'
+	@echo '##############################################################'
 
 check-local:
-    $(GO) test ./thrift
+	$(GO) test ./thrift
 
 all-local: check-local
 
 EXTRA_DIST = \
-    thrift \
-    README.md
+	thrift \
+	README.md
diff --git a/lib/go/test/Makefile.am b/lib/go/test/Makefile.am
index b319d4f..c13ba74 100644
--- a/lib/go/test/Makefile.am
+++ b/lib/go/test/Makefile.am
@@ -22,55 +22,55 @@
 
 # Thrift for GO has problems with complex map keys: THRIFT-2063
 gopath: $(top_srcdir)/compiler/cpp/thrift $(THRIFTTEST) \
-                IncludesTest.thrift \
-                NamespacedTest.thrift \
-                MultiplexedProtocolTest.thrift \
-                OnewayTest.thrift \
-                OptionalFieldsTest.thrift \
-                ServicesTest.thrift \
-                GoTagTest.thrift \
-                TypedefFieldTest.thrift \
-                RefAnnotationFieldsTest.thrift
-    mkdir -p gopath/src
-    grep -v list.*map.*list.*map $(THRIFTTEST) | grep -v 'set<Insanity>' > ThriftTest.thrift
-    $(THRIFT) -r IncludesTest.thrift
-    $(THRIFT) BinaryKeyTest.thrift
-    $(THRIFT) MultiplexedProtocolTest.thrift
-    $(THRIFT) OnewayTest.thrift
-    $(THRIFT) OptionalFieldsTest.thrift
-    $(THRIFT) ServicesTest.thrift
-    $(THRIFT) GoTagTest.thrift
-    $(THRIFT) TypedefFieldTest.thrift
-    $(THRIFT) RefAnnotationFieldsTest.thrift
-    GOPATH=`pwd`/gopath $(GO) get code.google.com/p/gomock/gomock
-    ln -nfs ../../../thrift gopath/src/thrift
-    ln -nfs ../../tests gopath/src/tests
-    touch gopath
+				IncludesTest.thrift \
+				NamespacedTest.thrift \
+				MultiplexedProtocolTest.thrift \
+				OnewayTest.thrift \
+				OptionalFieldsTest.thrift \
+				ServicesTest.thrift \
+				GoTagTest.thrift \
+				TypedefFieldTest.thrift \
+				RefAnnotationFieldsTest.thrift
+	mkdir -p gopath/src
+	grep -v list.*map.*list.*map $(THRIFTTEST) | grep -v 'set<Insanity>' > ThriftTest.thrift
+	$(THRIFT) -r IncludesTest.thrift
+	$(THRIFT) BinaryKeyTest.thrift
+	$(THRIFT) MultiplexedProtocolTest.thrift
+	$(THRIFT) OnewayTest.thrift
+	$(THRIFT) OptionalFieldsTest.thrift
+	$(THRIFT) ServicesTest.thrift
+	$(THRIFT) GoTagTest.thrift
+	$(THRIFT) TypedefFieldTest.thrift
+	$(THRIFT) RefAnnotationFieldsTest.thrift
+	GOPATH=`pwd`/gopath $(GO) get code.google.com/p/gomock/gomock
+	ln -nfs ../../../thrift gopath/src/thrift
+	ln -nfs ../../tests gopath/src/tests
+	touch gopath
 
 check: gopath
-    GOPATH=`pwd`/gopath $(GO) build \
-                includestest \
-                binarykeytest \
-                servicestest \
-                typedeffieldtest \
-                refannotationfieldstest
-    GOPATH=`pwd`/gopath $(GO) test thrift tests
+	GOPATH=`pwd`/gopath $(GO) build \
+				includestest \
+				binarykeytest \
+				servicestest \
+				typedeffieldtest \
+				refannotationfieldstest
+	GOPATH=`pwd`/gopath $(GO) test thrift tests
 
 clean-local:
-    $(RM) -r gopath ThriftTest.thrift gen-go
+	$(RM) -r gopath ThriftTest.thrift gen-go
 
 client: stubs
-    $(GO) run TestClient.go
+	$(GO) run TestClient.go
 
 EXTRA_DIST = \
-    tests \
-    BinaryKeyTest.thrift \
-    GoTagTest.thrift \
-    IncludesTest.thrift \
-    MultiplexedProtocolTest.thrift \
-    NamespacedTest.thrift \
-    OnewayTest.thrift \
-    OptionalFieldsTest.thrift \
-    RefAnnotationFieldsTest.thrift \
-    ServicesTest.thrift \
-    TypedefFieldTest.thrift
+	tests \
+	BinaryKeyTest.thrift \
+	GoTagTest.thrift \
+	IncludesTest.thrift \
+	MultiplexedProtocolTest.thrift \
+	NamespacedTest.thrift \
+	OnewayTest.thrift \
+	OptionalFieldsTest.thrift \
+	RefAnnotationFieldsTest.thrift \
+	ServicesTest.thrift \
+	TypedefFieldTest.thrift
diff --git a/lib/hs/Makefile.am b/lib/hs/Makefile.am
index 54e4bc9..3c891f4 100755
--- a/lib/hs/Makefile.am
+++ b/lib/hs/Makefile.am
@@ -26,17 +26,17 @@
   src
 
 all-local:
-    $(CABAL) install
+	$(CABAL) install
 
 install-exec-hook:
-    $(CABAL) install
+	$(CABAL) install
 
 # Make sure this doesn't fail if Haskell is not configured.
 clean-local:
-    $(CABAL) clean
+	$(CABAL) clean
 
 maintainer-clean-local:
-    $(CABAL) clean
+	$(CABAL) clean
 
 check-local:
-    $(CABAL) check
+	$(CABAL) check
diff --git a/lib/java/Makefile.am b/lib/java/Makefile.am
index e93f43e..cbec7af 100644
--- a/lib/java/Makefile.am
+++ b/lib/java/Makefile.am
@@ -20,23 +20,23 @@
 export CLASSPATH
 
 all-local:
-    $(ANT) $(ANT_FLAGS)
+	$(ANT) $(ANT_FLAGS)
 
 install-exec-hook:
-    $(ANT) $(ANT_FLAGS) install -Dinstall.path=$(DESTDIR)$(JAVA_PREFIX) \
-        -Dinstall.javadoc.path=$(DESTDIR)$(docdir)/java
+	$(ANT) $(ANT_FLAGS) install -Dinstall.path=$(DESTDIR)$(JAVA_PREFIX) \
+		-Dinstall.javadoc.path=$(DESTDIR)$(docdir)/java
 
 # Make sure this doesn't fail if ant is not configured.
 clean-local:
-    ANT=$(ANT) ; if test -z "$$ANT" ; then ANT=: ; fi ; \
-    $$ANT $(ANT_FLAGS) clean
+	ANT=$(ANT) ; if test -z "$$ANT" ; then ANT=: ; fi ; \
+	$$ANT $(ANT_FLAGS) clean
 
 check-local: all
-    $(ANT) $(ANT_FLAGS) test
+	$(ANT) $(ANT_FLAGS) test
 
 EXTRA_DIST = \
-    build.xml \
-    build.properties \
-    src \
-    test \
-    README.md
\ No newline at end of file
+	build.xml \
+	build.properties \
+	src \
+	test \
+	README.md
\ No newline at end of file
diff --git a/lib/js/test/Makefile.am b/lib/js/test/Makefile.am
index d8f1159..14927c4 100755
--- a/lib/js/test/Makefile.am
+++ b/lib/js/test/Makefile.am
@@ -21,9 +21,9 @@
 
 # Make sure this doesn't fail if ant is not configured.
 clean-local:
-    ANT=$(ANT) ; if test -z "$$ANT" ; then ANT=: ; fi ; \
-    $$ANT $(ANT_FLAGS) clean
+	ANT=$(ANT) ; if test -z "$$ANT" ; then ANT=: ; fi ; \
+	$$ANT $(ANT_FLAGS) clean
 
 check-local: all
-    $(ANT) $(ANT_FLAGS) test
+	$(ANT) $(ANT_FLAGS) test
 
diff --git a/lib/lua/Makefile.am b/lib/lua/Makefile.am
index fe6c936..364a25d 100644
--- a/lib/lua/Makefile.am
+++ b/lib/lua/Makefile.am
@@ -20,14 +20,14 @@
 SUBDIRS = .
 
 lib_LTLIBRARIES = \
-            libluasocket.la \
-            libluabpack.la \
-            libluabitwise.la \
-            liblualongnumber.la
+			libluasocket.la \
+			libluabpack.la \
+			libluabitwise.la \
+			liblualongnumber.la
 
 libluasocket_la_SOURCES = \
-            src/luasocket.c \
-            src/usocket.c
+			src/luasocket.c \
+			src/usocket.c
 
 nobase_include_HEADERS = src/socket.h
 
@@ -46,18 +46,18 @@
 libluabitwise_la_LDFLAGS = $(AM_LDFLAGS) -llua5.2 -lm
 
 liblualongnumber_la_SOURCES = \
-        src/lualongnumber.c \
-        src/longnumberutils.c
+		src/lualongnumber.c \
+		src/longnumberutils.c
 
 liblualongnumber_la_CPPFLAGS = $(AM_CPPFLAGS) -I/usr/include/lua5.2 -DLUA_COMPAT_MODULE
 liblualongnumber_la_LDFLAGS = $(AM_LDFLAGS) -llua5.2 -lm
 
 EXTRA_DIST = TBinaryProtocol.lua \
-        TBufferedTransport.lua \
-        TFramedTransport.lua \
-        Thrift.lua \
-        TMemoryBuffer.lua \
-        TProtocol.lua \
-        TServer.lua \
-        TSocket.lua \
-        TTransport.lua
\ No newline at end of file
+		TBufferedTransport.lua \
+		TFramedTransport.lua \
+		Thrift.lua \
+		TMemoryBuffer.lua \
+		TProtocol.lua \
+		TServer.lua \
+		TSocket.lua \
+		TTransport.lua
\ No newline at end of file
diff --git a/lib/nodejs/Makefile.am b/lib/nodejs/Makefile.am
index bdd6ca2..3868905 100755
--- a/lib/nodejs/Makefile.am
+++ b/lib/nodejs/Makefile.am
@@ -19,20 +19,20 @@
 THRIFT = $(top_srcdir)/compiler/cpp/thrift
 
 #stubs: $(top_srcdir)/test/ThriftTest.thrift
-#    $(THRIFT) --gen js:node -o test/ $(top_srcdir)/test/ThriftTest.thrift
+#	$(THRIFT) --gen js:node -o test/ $(top_srcdir)/test/ThriftTest.thrift
 
 deps: package.json
-    $(NPM) install --no-bin-links
+	$(NPM) install --no-bin-links
 
 check: deps
-    $(NPM) test
+	$(NPM) test
 
 clean-local:
-    $(RM) -r test/gen-nodejs
+	$(RM) -r test/gen-nodejs
 
 EXTRA_DIST = \
-    examples \
-    lib \
-    package.json \
-    test \
-    README.md
+	examples \
+	lib \
+	package.json \
+	test \
+	README.md
diff --git a/lib/perl/Makefile.am b/lib/perl/Makefile.am
index 26f7c07..067ed69 100644
--- a/lib/perl/Makefile.am
+++ b/lib/perl/Makefile.am
@@ -20,37 +20,37 @@
 SUBDIRS = test
 
 Makefile-perl.mk : Makefile.PL
-    $(PERL) Makefile.PL MAKEFILE=Makefile-perl.mk INSTALLDIRS=$(INSTALLDIRS) INSTALL_BASE=$(PERL_PREFIX)
+	$(PERL) Makefile.PL MAKEFILE=Makefile-perl.mk INSTALLDIRS=$(INSTALLDIRS) INSTALL_BASE=$(PERL_PREFIX)
 
 all-local: Makefile-perl.mk
-    $(MAKE) -f Makefile-perl.mk
-    find blib -name 'Makefile*' -exec rm -f {} \;
+	$(MAKE) -f Makefile-perl.mk
+	find blib -name 'Makefile*' -exec rm -f {} \;
 
 check-local:
-    $(PERL) -Iblib/lib -I@abs_srcdir@ -I@builddir@/test/gen-perl \
-        @abs_srcdir@/test.pl @abs_srcdir@/test/*.t
+	$(PERL) -Iblib/lib -I@abs_srcdir@ -I@builddir@/test/gen-perl \
+		@abs_srcdir@/test.pl @abs_srcdir@/test/*.t
 
 install-exec-local: Makefile-perl.mk
-    $(MAKE) -f Makefile-perl.mk install DESTDIR=$(DESTDIR)/
+	$(MAKE) -f Makefile-perl.mk install DESTDIR=$(DESTDIR)/
 
 clean-local:
-    if test -f Makefile-perl.mk ; then \
-        $(MAKE) -f Makefile-perl.mk clean ; \
-    fi
-    rm -f Makefile-perl.mk.old
+	if test -f Makefile-perl.mk ; then \
+		$(MAKE) -f Makefile-perl.mk clean ; \
+	fi
+	rm -f Makefile-perl.mk.old
 
 EXTRA_DIST = \
-    Makefile.PL \
-    test.pl \
-    lib/Thrift.pm \
-    lib/Thrift.pm \
-    lib/Thrift/BinaryProtocol.pm \
-    lib/Thrift/BufferedTransport.pm \
-    lib/Thrift/FramedTransport.pm \
-    lib/Thrift/HttpClient.pm \
-    lib/Thrift/MemoryBuffer.pm \
-    lib/Thrift/Protocol.pm \
-    lib/Thrift/Server.pm \
-    lib/Thrift/Socket.pm \
-    lib/Thrift/Transport.pm \
-    README.md
+	Makefile.PL \
+	test.pl \
+	lib/Thrift.pm \
+	lib/Thrift.pm \
+	lib/Thrift/BinaryProtocol.pm \
+	lib/Thrift/BufferedTransport.pm \
+	lib/Thrift/FramedTransport.pm \
+	lib/Thrift/HttpClient.pm \
+	lib/Thrift/MemoryBuffer.pm \
+	lib/Thrift/Protocol.pm \
+	lib/Thrift/Server.pm \
+	lib/Thrift/Socket.pm \
+	lib/Thrift/Transport.pm \
+	README.md
diff --git a/lib/perl/test/Makefile.am b/lib/perl/test/Makefile.am
index 6a20319..795aaed 100644
--- a/lib/perl/test/Makefile.am
+++ b/lib/perl/test/Makefile.am
@@ -23,9 +23,9 @@
 check-local: gen-perl/ThriftTest/Types.pm
 
 gen-perl/ThriftTest/Types.pm: $(THRIFT_IF)
-    $(THRIFT) --gen perl $(THRIFT_IF)
+	$(THRIFT) --gen perl $(THRIFT_IF)
 
 clean-local:
-    rm -rf gen-perl
+	rm -rf gen-perl
 
 EXTRA_DIST = memory_buffer.t processor.t
diff --git a/lib/php/Makefile.am b/lib/php/Makefile.am
index da8ffdd..e9d673c 100755
--- a/lib/php/Makefile.am
+++ b/lib/php/Makefile.am
@@ -24,7 +24,7 @@
 
 if WITH_PHP_EXTENSION
 %.so:
-    cd src/ext/thrift_protocol/ && $(MAKE)
+	cd src/ext/thrift_protocol/ && $(MAKE)
 
 phpconfdir=$(PHP_CONFIG_PREFIX)
 phpconf_DATA=thrift_protocol.ini
diff --git a/lib/php/test/Makefile.am b/lib/php/test/Makefile.am
index 66e69d5..a529d8c 100755
--- a/lib/php/test/Makefile.am
+++ b/lib/php/test/Makefile.am
@@ -20,29 +20,29 @@
 THRIFT = $(top_builddir)/compiler/cpp/thrift
 
 stubs: ../../../test/ThriftTest.thrift  TestValidators.thrift
-    mkdir -p ./packages
-    $(THRIFT) --gen php -r --out ./packages ../../../test/ThriftTest.thrift
-    mkdir -p ./packages/phpv
-    mkdir -p ./packages/phpvo
-    $(THRIFT) --gen php:validate     -r --out ./packages/phpv   TestValidators.thrift
-    $(THRIFT) --gen php:validate,oop -r --out ./packages/phpvo  TestValidators.thrift
+	mkdir -p ./packages
+	$(THRIFT) --gen php -r --out ./packages ../../../test/ThriftTest.thrift
+	mkdir -p ./packages/phpv
+	mkdir -p ./packages/phpvo
+	$(THRIFT) --gen php:validate     -r --out ./packages/phpv   TestValidators.thrift 
+	$(THRIFT) --gen php:validate,oop -r --out ./packages/phpvo  TestValidators.thrift 
+	
+check-validator: stubs 
+	php Test/Thrift/TestValidators.php 
+	php Test/Thrift/TestValidators.php -oop 
 
-check-validator: stubs
-    php Test/Thrift/TestValidators.php
-    php Test/Thrift/TestValidators.php -oop
-
-check-protocol:    stubs
+check-protocol:	stubs
 if HAVE_PHPUNIT
-    $(PHPUNIT) --log-junit=phpunit.xml Test/Thrift/Protocol/TestTJSONProtocol.php
-    $(PHPUNIT) --log-junit=phpunit.xml Test/Thrift/Protocol/TestBinarySerializer.php
+	$(PHPUNIT) --log-junit=phpunit.xml Test/Thrift/Protocol/TestTJSONProtocol.php
+	$(PHPUNIT) --log-junit=phpunit.xml Test/Thrift/Protocol/TestBinarySerializer.php
 endif
-
+	
 check: stubs \
   check-protocol \
   check-validator
 
 clean-local:
-    $(RM) -r ./packages
+	$(RM) -r ./packages
 
 EXTRA_DIST = Test
 
diff --git a/lib/py/Makefile.am b/lib/py/Makefile.am
index d3e55fe..a504b5c 100755
--- a/lib/py/Makefile.am
+++ b/lib/py/Makefile.am
@@ -20,23 +20,23 @@
 DESTDIR ?= /
 
 all-local:
-    $(PYTHON) setup.py build
+	$(PYTHON) setup.py build
 
 # We're ignoring prefix here because site-packages seems to be
 # the equivalent of /usr/local/lib in Python land.
 # Old version (can't put inline because it's not portable).
 #$(PYTHON) setup.py install --prefix=$(prefix) --root=$(DESTDIR) $(PYTHON_SETUPUTIL_ARGS)
 install-exec-hook:
-    $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(PY_PREFIX) $(PYTHON_SETUPUTIL_ARGS)
+	$(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(PY_PREFIX) $(PYTHON_SETUPUTIL_ARGS)
 
 clean-local:
-    $(RM) -r build
+	$(RM) -r build
 
 check-local: all
 
 EXTRA_DIST = \
-    compat \
-    setup.py \
-    setup.cfg \
-    src \
-    README.md
+	compat \
+	setup.py \
+	setup.cfg \
+	src \
+	README.md
diff --git a/lib/rb/Makefile.am b/lib/rb/Makefile.am
index fc75146..2d0c12e 100755
--- a/lib/rb/Makefile.am
+++ b/lib/rb/Makefile.am
@@ -22,28 +22,28 @@
 if HAVE_BUNDLER
 
 all-local:
-    $(BUNDLER) install
-    $(BUNDLER) exec rake
+	$(BUNDLER) install
+	$(BUNDLER) exec rake
 
 install-exec-hook:
-    $(BUNDLER) exec rake install
+	$(BUNDLER) exec rake install
 
 clean-local:
-    $(BUNDLER) exec rake clean
+	$(BUNDLER) exec rake clean
 
 check-local: all
-    $(BUNDLER) install
-    $(BUNDLER) exec rake
+	$(BUNDLER) install
+	$(BUNDLER) exec rake
 
 endif
 
 EXTRA_DIST = \
-    Rakefile \
-    Gemfile \
-    thrift.gemspec \
-    lib \
-    ext \
-    benchmark \
-    script \
-    spec \
-    README.md
+	Rakefile \
+	Gemfile \
+	thrift.gemspec \
+	lib \
+	ext \
+	benchmark \
+	script \
+	spec \
+	README.md
diff --git a/test/Makefile.am b/test/Makefile.am
index 7745adc..cc1f43d 100755
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -61,42 +61,42 @@
 # generate html for ThriftTest.thrift
 #
 check-local:
-    $(top_builddir)/compiler/cpp/thrift --gen html -r $(top_srcdir)/test/ThriftTest.thrift
+	$(top_builddir)/compiler/cpp/thrift --gen html -r $(top_srcdir)/test/ThriftTest.thrift
 
 EXTRA_DIST = \
-    keys \
-    test.sh \
-    test.py \
-    tests.json \
-    c_glib \
-    cpp \
-    erl \
-    hs \
-    lua \
-    ocaml \
-    perl \
-    php \
-    py \
-    py.twisted \
-    py.tornado \
-    rb \
-    threads \
-    AnnotationTest.thrift \
-    BrokenConstants.thrift \
-    ConstantsDemo.thrift \
-    DebugProtoTest.thrift \
-    DenseLinkingTest.thrift \
-    DocTest.thrift \
-    Include.thrift \
-    JavaBeansTest.thrift \
-    ManyOptionals.thrift \
-    ManyTypedefs.thrift \
-    NameConflictTest.thrift \
-    OptionalRequiredTest.thrift \
-    Recursive.thrift \
-    ReuseObjects.thrift \
-    SmallTest.thrift \
-    StressTest.thrift \
-    ThriftTest.thrift \
-    FastbinaryTest.py \
-    README.md
+	keys \
+	test.sh \
+	test.py \
+	tests.json \
+	c_glib \
+	cpp \
+	erl \
+	hs \
+	lua \
+	ocaml \
+	perl \
+	php \
+	py \
+	py.twisted \
+	py.tornado \
+	rb \
+	threads \
+	AnnotationTest.thrift \
+	BrokenConstants.thrift \
+	ConstantsDemo.thrift \
+	DebugProtoTest.thrift \
+	DenseLinkingTest.thrift \
+	DocTest.thrift \
+	Include.thrift \
+	JavaBeansTest.thrift \
+	ManyOptionals.thrift \
+	ManyTypedefs.thrift \
+	NameConflictTest.thrift \
+	OptionalRequiredTest.thrift \
+	Recursive.thrift \
+	ReuseObjects.thrift \
+	SmallTest.thrift \
+	StressTest.thrift \
+	ThriftTest.thrift \
+	FastbinaryTest.py \
+	README.md
diff --git a/test/c_glib/Makefile.am b/test/c_glib/Makefile.am
index 7de3998..de23cb9 100755
--- a/test/c_glib/Makefile.am
+++ b/test/c_glib/Makefile.am
@@ -19,34 +19,34 @@
 .NOTPARALLEL:
 noinst_LTLIBRARIES = libtestcglib.la
 nodist_libtestcglib_la_SOURCES = \
-    gen-c_glib/t_test_second_service.c \
-    gen-c_glib/t_test_second_service.h \
-    gen-c_glib/t_test_thrift_test.c \
-    gen-c_glib/t_test_thrift_test.h \
-    gen-c_glib/t_test_thrift_test_types.c \
-    gen-c_glib/t_test_thrift_test_types.h
+	gen-c_glib/t_test_second_service.c \
+	gen-c_glib/t_test_second_service.h \
+	gen-c_glib/t_test_thrift_test.c \
+	gen-c_glib/t_test_thrift_test.h \
+	gen-c_glib/t_test_thrift_test_types.c \
+	gen-c_glib/t_test_thrift_test_types.h
 
 libtestcglib_la_LIBADD = $(top_builddir)/lib/c_glib/libthrift_c_glib.la
 
 check_PROGRAMS = \
-    test_client \
-    test_server
+	test_client \
+	test_server
 
 test_client_SOURCES = \
-    src/test_client.c
+	src/test_client.c
 
 test_client_LDADD = \
-    libtestcglib.la \
-    $(top_builddir)/lib/c_glib/libthrift_c_glib.la
+	libtestcglib.la \
+	$(top_builddir)/lib/c_glib/libthrift_c_glib.la
 
 test_server_SOURCES = \
-    src/thrift_test_handler.c \
-    src/thrift_test_handler.h \
-    src/test_server.c
+	src/thrift_test_handler.c \
+	src/thrift_test_handler.h \
+	src/test_server.c
 
 test_server_LDADD = \
-    libtestcglib.la \
-    $(top_builddir)/lib/c_glib/libthrift_c_glib.la
+	libtestcglib.la \
+	$(top_builddir)/lib/c_glib/libthrift_c_glib.la
 
 #
 # Common thrift code generation rules
@@ -54,7 +54,7 @@
 THRIFT = $(top_builddir)/compiler/cpp/thrift
 
 gen-c_glib/t_test_second_service.c  gen-c_glib/t_test_second_service.h  gen-c_glib/t_test_thrift_test.c  gen-c_glib/t_test_thrift_test.h  gen-c_glib/t_test_thrift_test_types.c  gen-c_glib/t_test_thrift_test_types.h: $(top_srcdir)/test/ThriftTest.thrift
-    $(THRIFT) --gen c_glib -r $<
+	$(THRIFT) --gen c_glib -r $<
 
 AM_CFLAGS = -g -Wall -Wextra $(GLIB_CFLAGS) $(GOBJECT_CFLAGS)
 AM_CXXFLAGS = $(AM_CFLAGS)
@@ -62,10 +62,10 @@
 AM_LDFLAGS = $(GLIB_LIBS) $(GOBJECT_LIBS) @GCOV_LDFLAGS@
 
 clean-local:
-    $(RM) -r gen-c_glib
+	$(RM) -r gen-c_glib
 
 EXTRA_DIST = \
-    src/test_client.c \
-    src/thrift_test_handler.c \
-    src/thrift_test_handler.h \
-    src/test_server.c
+	src/test_client.c \
+	src/thrift_test_handler.c \
+	src/thrift_test_handler.h \
+	src/test_server.c
diff --git a/test/cpp/Makefile.am b/test/cpp/Makefile.am
index d1086c0..3dbcaaa 100755
--- a/test/cpp/Makefile.am
+++ b/test/cpp/Makefile.am
@@ -19,94 +19,94 @@
 .NOTPARALLEL:
 noinst_LTLIBRARIES = libtestgencpp.la libstresstestgencpp.la
 nodist_libtestgencpp_la_SOURCES = \
-    gen-cpp/ThriftTest_constants.cpp \
-    gen-cpp/ThriftTest_constants.h \
-    gen-cpp/ThriftTest_types.cpp \
-    gen-cpp/ThriftTest_types.h \
-    gen-cpp/ThriftTest_types.tcc \
-    gen-cpp/ThriftTest.cpp \
-    gen-cpp/ThriftTest.h \
-    gen-cpp/ThriftTest.tcc \
-    src/ThriftTest_extras.cpp
+	gen-cpp/ThriftTest_constants.cpp \
+	gen-cpp/ThriftTest_constants.h \
+	gen-cpp/ThriftTest_types.cpp \
+	gen-cpp/ThriftTest_types.h \
+	gen-cpp/ThriftTest_types.tcc \
+	gen-cpp/ThriftTest.cpp \
+	gen-cpp/ThriftTest.h \
+	gen-cpp/ThriftTest.tcc \
+	src/ThriftTest_extras.cpp
 
 libtestgencpp_la_LIBADD = $(top_builddir)/lib/cpp/libthrift.la
 
 nodist_libstresstestgencpp_la_SOURCES = \
-    gen-cpp/StressTest_constants.cpp \
-    gen-cpp/StressTest_types.cpp \
-    gen-cpp/StressTest_constants.h \
-    gen-cpp/StressTest_types.h \
-    gen-cpp/Service.cpp \
-    gen-cpp/Service.h
+	gen-cpp/StressTest_constants.cpp \
+	gen-cpp/StressTest_types.cpp \
+	gen-cpp/StressTest_constants.h \
+	gen-cpp/StressTest_types.h \
+	gen-cpp/Service.cpp \
+	gen-cpp/Service.h
 
 libstresstestgencpp_la_LIBADD = $(top_builddir)/lib/cpp/libthrift.la
 
 check_PROGRAMS = \
-    TestServer \
-    TestClient \
-    StressTest \
-    StressTestNonBlocking
+	TestServer \
+	TestClient \
+	StressTest \
+	StressTestNonBlocking
 
 # we currently do not run the testsuite, stop c++ server issue
 # TESTS = \
-#    $(check_PROGRAMS)
+#	$(check_PROGRAMS)
 
 TestServer_SOURCES = \
-    src/TestServer.cpp
+	src/TestServer.cpp
 
 TestServer_LDADD = \
-    libtestgencpp.la \
-    $(top_builddir)/lib/cpp/libthrift.la \
-    $(top_builddir)/lib/cpp/libthriftz.la \
-    $(top_builddir)/lib/cpp/libthriftnb.la \
-    -levent -lboost_program_options -lboost_system -lboost_filesystem
+	libtestgencpp.la \
+	$(top_builddir)/lib/cpp/libthrift.la \
+	$(top_builddir)/lib/cpp/libthriftz.la \
+	$(top_builddir)/lib/cpp/libthriftnb.la \
+	-levent -lboost_program_options -lboost_system -lboost_filesystem
 
 TestClient_SOURCES = \
-    src/TestClient.cpp
+	src/TestClient.cpp
 
 TestClient_LDADD = \
-    libtestgencpp.la \
-    $(top_builddir)/lib/cpp/libthrift.la \
-    $(top_builddir)/lib/cpp/libthriftz.la \
-    $(top_builddir)/lib/cpp/libthriftnb.la \
-    -levent -lboost_program_options -lboost_system -lboost_filesystem
+	libtestgencpp.la \
+	$(top_builddir)/lib/cpp/libthrift.la \
+	$(top_builddir)/lib/cpp/libthriftz.la \
+	$(top_builddir)/lib/cpp/libthriftnb.la \
+	-levent -lboost_program_options -lboost_system -lboost_filesystem
 
 StressTest_SOURCES = \
-    src/StressTest.cpp
+	src/StressTest.cpp
 
 StressTest_LDADD = \
-    libstresstestgencpp.la \
-    $(top_builddir)/lib/cpp/libthrift.la
+	libstresstestgencpp.la \
+	$(top_builddir)/lib/cpp/libthrift.la
 
 StressTestNonBlocking_SOURCES = \
-    src/StressTestNonBlocking.cpp
+	src/StressTestNonBlocking.cpp
 
 StressTestNonBlocking_LDADD = \
-    libstresstestgencpp.la \
-    $(top_builddir)/lib/cpp/libthriftnb.la \
-    -levent
+	libstresstestgencpp.la \
+	$(top_builddir)/lib/cpp/libthriftnb.la \
+	-levent
 #
 # Common thrift code generation rules
 #
 THRIFT = $(top_builddir)/compiler/cpp/thrift
 
 gen-cpp/ThriftTest.cpp gen-cpp/ThriftTest_types.cpp gen-cpp/ThriftTest_constants.cpp: $(top_srcdir)/test/ThriftTest.thrift
-    $(THRIFT) --gen cpp:templates,cob_style -r $<
+	$(THRIFT) --gen cpp:templates,cob_style -r $<
 
 gen-cpp/StressTest_types.cpp gen-cpp/StressTest_constants.cpp: $(top_srcdir)/test/StressTest.thrift
-    $(THRIFT) --gen cpp $<
+	$(THRIFT) --gen cpp $<
 
 AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(LIBEVENT_CPPFLAGS) -I$(top_srcdir)/lib/cpp/src -Igen-cpp
 AM_CXXFLAGS = -Wall
 AM_LDFLAGS = $(BOOST_LDFLAGS) $(LIBEVENT_LDFLAGS)
 
 clean-local:
-    $(RM) -r gen-cpp
+	$(RM) -r gen-cpp
 
 EXTRA_DIST = \
-    src/TestClient.cpp \
-    src/TestServer.cpp \
-    src/StressTest.cpp \
-    src/StressTestNonBlocking.cpp \
-    realloc/realloc_test.c \
-    realloc/Makefile
+	src/TestClient.cpp \
+	src/TestServer.cpp \
+	src/StressTest.cpp \
+	src/StressTestNonBlocking.cpp \
+	realloc/realloc_test.c \
+	realloc/Makefile
diff --git a/test/erl/Makefile.am b/test/erl/Makefile.am
index 030c6fb..309d07e 100644
--- a/test/erl/Makefile.am
+++ b/test/erl/Makefile.am
@@ -23,16 +23,16 @@
 THRIFT_FILES = $(wildcard ../*.thrift)
 
 .generated: $(THRIFT_FILES)
-    for f in $(THRIFT_FILES) ; do \
-      $(THRIFT) --gen erl $$f ; \
-    done ; \
-    $(THRIFT) --gen erl:legacynames LegacyNames.thrift
-    touch .generated
+	for f in $(THRIFT_FILES) ; do \
+	  $(THRIFT) --gen erl $$f ; \
+	done ; \
+	$(THRIFT) --gen erl:legacynames LegacyNames.thrift
+	touch .generated
 
 check: .generated
-    $(REBAR) eunit
+	$(REBAR) eunit
 
 clean:
-    rm -f .generated
-    rm -rf gen-erl
-    $(REBAR) clean
+	rm -f .generated
+	rm -rf gen-erl
+	$(REBAR) clean
diff --git a/test/go/Makefile.am b/test/go/Makefile.am
index afea106..66f81ad 100644
--- a/test/go/Makefile.am
+++ b/test/go/Makefile.am
@@ -24,36 +24,36 @@
 all: bin/testclient bin/testserver bin/stress
 
 ThriftTest.thrift: $(THRIFTTEST)
-    grep -v list.*map.*list.*map $(THRIFTTEST) > ThriftTest.thrift
+	grep -v list.*map.*list.*map $(THRIFTTEST) > ThriftTest.thrift
 
 # Thrift for GO has problems with complex map keys: THRIFT-2063
 gopath: $(THRIFT) ThriftTest.thrift
-    mkdir -p src/gen
-    $(THRIFTCMD) ThriftTest.thrift
-    $(THRIFTCMD) ../StressTest.thrift
-    ln -nfs ../../../lib/go/thrift src/thrift
-    GOPATH=`pwd` $(GO) get code.google.com/p/gomock/gomock
-    touch gopath
+	mkdir -p src/gen
+	$(THRIFTCMD) ThriftTest.thrift
+	$(THRIFTCMD) ../StressTest.thrift
+	ln -nfs ../../../lib/go/thrift src/thrift
+	GOPATH=`pwd` $(GO) get code.google.com/p/gomock/gomock
+	touch gopath
 
 bin/testclient: gopath
-    GOPATH=`pwd` $(GO) install bin/testclient
+	GOPATH=`pwd` $(GO) install bin/testclient
 
 bin/testserver: gopath
-    GOPATH=`pwd` $(GO) install bin/testserver
+	GOPATH=`pwd` $(GO) install bin/testserver
 
 bin/stress: gopath
-    GOPATH=`pwd` $(GO) install bin/stress
+	GOPATH=`pwd` $(GO) install bin/stress
 
 clean-local:
-    $(RM) -r src/gen src/code.google.com src/thrift bin pkg gopath ThriftTest.thrift
+	$(RM) -r src/gen src/code.google.com src/thrift bin pkg gopath ThriftTest.thrift
 
 check: gopath
-    GOPATH=`pwd` $(GO) test -v common/...
+	GOPATH=`pwd` $(GO) test -v common/...
 
 genmock: gopath
-    GOPATH=`pwd` $(GO) install code.google.com/p/gomock/mockgen
-    GOPATH=`pwd` bin/mockgen -destination=src/common/mock_handler.go -package=common gen/thrifttest ThriftTest
+	GOPATH=`pwd` $(GO) install code.google.com/p/gomock/mockgen
+	GOPATH=`pwd` bin/mockgen -destination=src/common/mock_handler.go -package=common gen/thrifttest ThriftTest
 
 EXTRA_DIST = \
-    src/bin \
-    src/common
+	src/bin \
+	src/common
diff --git a/test/hs/Makefile.am b/test/hs/Makefile.am
index a39d025..2629ca1 100644
--- a/test/hs/Makefile.am
+++ b/test/hs/Makefile.am
@@ -20,24 +20,24 @@
 THRIFT = $(top_srcdir)/compiler/cpp/thrift
 
 stubs: ../ConstantsDemo.thrift ../DebugProtoTest.thrift ../ThriftTest.thrift ../Include.thrift ../NameConflictTest.thrift
-    $(THRIFT) --gen hs ../ConstantsDemo.thrift
-    $(THRIFT) --gen hs ../DebugProtoTest.thrift
-    $(THRIFT) --gen hs ../ThriftTest.thrift
-    $(THRIFT) --gen hs ../Include.thrift
-    $(THRIFT) --gen hs ../NameConflictTest.thrift
+	$(THRIFT) --gen hs ../ConstantsDemo.thrift
+	$(THRIFT) --gen hs ../DebugProtoTest.thrift
+	$(THRIFT) --gen hs ../ThriftTest.thrift
+	$(THRIFT) --gen hs ../Include.thrift
+	$(THRIFT) --gen hs ../NameConflictTest.thrift
 
 check: stubs
-    sh run-test.sh ConstantsDemo
-    sh run-test.sh DebugProtoTest
-    sh run-test.sh ThriftTest
-    sh run-test.sh Include
-    sh run-test.sh NameConflictTest
+	sh run-test.sh ConstantsDemo
+	sh run-test.sh DebugProtoTest
+	sh run-test.sh ThriftTest
+	sh run-test.sh Include
+	sh run-test.sh NameConflictTest
 
 clean-local:
-    $(RM) -r gen-hs
-    $(RM) *.hi
-    $(RM) *.o
+	$(RM) -r gen-hs
+	$(RM) *.hi
+	$(RM) *.o
 
 all: check
-    ghc -igen-hs TestServer.hs
-    ghc -igen-hs TestClient.hs
\ No newline at end of file
+	ghc -igen-hs TestServer.hs
+	ghc -igen-hs TestClient.hs
\ No newline at end of file
diff --git a/test/perl/Makefile.am b/test/perl/Makefile.am
index 7fd151a..291106b 100644
--- a/test/perl/Makefile.am
+++ b/test/perl/Makefile.am
@@ -20,10 +20,10 @@
 THRIFT = $(top_srcdir)/compiler/cpp/thrift
 
 stubs: ../ThriftTest.thrift
-    $(THRIFT) --gen perl ../ThriftTest.thrift
+	$(THRIFT) --gen perl ../ThriftTest.thrift
 
 check: stubs
 
 clean-local:
-    $(RM) -r gen-perl
+	$(RM) -r gen-perl
 
diff --git a/test/php/Makefile.am b/test/php/Makefile.am
index d3f38f8..1625903 100755
--- a/test/php/Makefile.am
+++ b/test/php/Makefile.am
@@ -20,13 +20,13 @@
 THRIFT = $(top_srcdir)/compiler/cpp/thrift
 
 stubs: ../ThriftTest.thrift
-    $(THRIFT) --gen php ../ThriftTest.thrift
-    $(THRIFT) --gen php:inlined ../ThriftTest.thrift
+	$(THRIFT) --gen php ../ThriftTest.thrift
+	$(THRIFT) --gen php:inlined ../ThriftTest.thrift
 
 check: stubs
 
 clean-local:
-    $(RM) -r gen-php gen-phpi
+	$(RM) -r gen-php gen-phpi
 
 client: stubs
-    php TestClient.php
+	php TestClient.php
diff --git a/test/py.tornado/Makefile.am b/test/py.tornado/Makefile.am
index a33b725..a8e680a 100644
--- a/test/py.tornado/Makefile.am
+++ b/test/py.tornado/Makefile.am
@@ -20,11 +20,11 @@
 THRIFT = $(top_srcdir)/compiler/cpp/thrift
 
 thrift_gen: ../ThriftTest.thrift ../SmallTest.thrift
-    $(THRIFT) --gen py:tornado ../ThriftTest.thrift
-    $(THRIFT) --gen py:tornado ../SmallTest.thrift
+	$(THRIFT) --gen py:tornado ../ThriftTest.thrift
+	$(THRIFT) --gen py:tornado ../SmallTest.thrift
 
 check: thrift_gen
-    ./test_suite.py
+	./test_suite.py
 
 clean-local:
-    $(RM) -r gen-py.tornado
+	$(RM) -r gen-py.tornado
diff --git a/test/py.twisted/Makefile.am b/test/py.twisted/Makefile.am
index 414c5c4..4723b7d 100644
--- a/test/py.twisted/Makefile.am
+++ b/test/py.twisted/Makefile.am
@@ -20,11 +20,11 @@
 THRIFT = $(top_srcdir)/compiler/cpp/thrift
 
 stubs: ../ThriftTest.thrift ../SmallTest.thrift
-    $(THRIFT) --gen py:twisted ../ThriftTest.thrift
-    $(THRIFT) --gen py:twisted ../SmallTest.thrift
+	$(THRIFT) --gen py:twisted ../ThriftTest.thrift
+	$(THRIFT) --gen py:twisted ../SmallTest.thrift
 
 check: stubs
-    $(TRIAL) test_suite.py
+	$(TRIAL) test_suite.py
 
 clean-local:
-    $(RM) -r gen-py.twisted
+	$(RM) -r gen-py.twisted
diff --git a/test/py/Makefile.am b/test/py/Makefile.am
index 318196a..6b31769 100755
--- a/test/py/Makefile.am
+++ b/test/py/Makefile.am
@@ -50,29 +50,29 @@
 
 
 gen-py/%/__init__.py: ../%.thrift
-    $(THRIFT) --gen py  $<
-    test -d gen-py-default || mkdir gen-py-default
-    $(THRIFT) --gen py -out gen-py-default $<
+	$(THRIFT) --gen py  $<
+	test -d gen-py-default || mkdir gen-py-default
+	$(THRIFT) --gen py -out gen-py-default $<
 
 gen-py-slots/%/__init__.py: ../%.thrift
-    test -d gen-py-slots || mkdir gen-py-slots
-    $(THRIFT) --gen py:slots -out gen-py-slots $<
+	test -d gen-py-slots || mkdir gen-py-slots
+	$(THRIFT) --gen py:slots -out gen-py-slots $<
 
 gen-py-newstyle/%/__init__.py: ../%.thrift
-    test -d gen-py-newstyle || mkdir gen-py-newstyle
-    $(THRIFT) --gen py:new_style -out gen-py-newstyle $<
+	test -d gen-py-newstyle || mkdir gen-py-newstyle
+	$(THRIFT) --gen py:new_style -out gen-py-newstyle $<
 
 gen-py-newstyleslots/%/__init__.py: ../%.thrift
-    test -d gen-py-newstyleslots || mkdir gen-py-newstyleslots
-    $(THRIFT) --gen py:new_style,slots -out gen-py-newstyleslots $<
+	test -d gen-py-newstyleslots || mkdir gen-py-newstyleslots
+	$(THRIFT) --gen py:new_style,slots -out gen-py-newstyleslots $<
 
 gen-py-dynamic/%/__init__.py: ../%.thrift
-    test -d gen-py-dynamic || mkdir gen-py-dynamic
-    $(THRIFT) --gen py:dynamic -out gen-py-dynamic $<
+	test -d gen-py-dynamic || mkdir gen-py-dynamic
+	$(THRIFT) --gen py:dynamic -out gen-py-dynamic $<
 
 gen-py-dynamicslots/%/__init__.py: ../%.thrift
-    test -d gen-py-dynamicslots || mkdir gen-py-dynamicslots
-    $(THRIFT) --gen py:dynamic,slots -out gen-py-dynamicslots $<
+	test -d gen-py-dynamicslots || mkdir gen-py-dynamicslots
+	$(THRIFT) --gen py:dynamic,slots -out gen-py-dynamicslots $<
 
 clean-local:
-    $(RM) -r gen-py gen-py-slots gen-py-default gen-py-newstyle gen-py-newstyleslots gen-py-dynamic gen-py-dynamicslots
+	$(RM) -r gen-py gen-py-slots gen-py-default gen-py-newstyle gen-py-newstyleslots gen-py-dynamic gen-py-dynamicslots
diff --git a/test/rb/Makefile.am b/test/rb/Makefile.am
index eb91293..9cdd99b 100644
--- a/test/rb/Makefile.am
+++ b/test/rb/Makefile.am
@@ -20,12 +20,12 @@
 THRIFT = $(top_srcdir)/compiler/cpp/thrift
 
 stubs: ../ThriftTest.thrift ../SmallTest.thrift
-    $(THRIFT) --gen rb ../ThriftTest.thrift
-    $(THRIFT) --gen rb ../SmallTest.thrift
+	$(THRIFT) --gen rb ../ThriftTest.thrift
+	$(THRIFT) --gen rb ../SmallTest.thrift
 
 check: stubs
 if HAVE_BUNDLER
-    $(BUNDLER) install
-    $(BUNDLER) exec $(RUBY) -I. test_suite.rb
+	$(BUNDLER) install
+	$(BUNDLER) exec $(RUBY) -I. test_suite.rb
 endif
 
diff --git a/tutorial/Makefile.am b/tutorial/Makefile.am
index ab968b2..2b9be52 100755
--- a/tutorial/Makefile.am
+++ b/tutorial/Makefile.am
@@ -62,21 +62,21 @@
 # generate html for ThriftTest.thrift
 #
 all-local:
-    $(top_builddir)/compiler/cpp/thrift --gen html -r $(top_srcdir)/tutorial/tutorial.thrift
+	$(top_builddir)/compiler/cpp/thrift --gen html -r $(top_srcdir)/tutorial/tutorial.thrift
 endif
 
 # Any folders or files not listed above being added to SUBDIR need to be placed here in
 # EXTRA_DIST to be included in the release
 EXTRA_DIST = \
-    as3 \
-    csharp \
-    d \
-    delphi \
-    erl \
-    hs \
-    ocaml \
-    perl \
-    php \
-    shared.thrift \
-    tutorial.thrift \
-    README.md
+	as3 \
+	csharp \
+	d \
+	delphi \
+	erl \
+	hs \
+	ocaml \
+	perl \
+	php \
+	shared.thrift \
+	tutorial.thrift \
+	README.md
diff --git a/tutorial/c_glib/Makefile.am b/tutorial/c_glib/Makefile.am
index a1d28ff..24075dd 100755
--- a/tutorial/c_glib/Makefile.am
+++ b/tutorial/c_glib/Makefile.am
@@ -26,53 +26,53 @@
 
 .NOTPARALLEL:
 noinst_LTLIBRARIES = \
-    libtutorialgencglib.la
+	libtutorialgencglib.la
 
 nodist_libtutorialgencglib_la_SOURCES = \
-    gen-c_glib/calculator.c \
-    gen-c_glib/calculator.h \
-    gen-c_glib/shared_service.c \
-    gen-c_glib/shared_service.h \
-    gen-c_glib/shared_types.c \
-    gen-c_glib/shared_types.h \
-    gen-c_glib/tutorial_types.c \
-    gen-c_glib/tutorial_types.h
+	gen-c_glib/calculator.c \
+	gen-c_glib/calculator.h \
+	gen-c_glib/shared_service.c \
+	gen-c_glib/shared_service.h \
+	gen-c_glib/shared_types.c \
+	gen-c_glib/shared_types.h \
+	gen-c_glib/tutorial_types.c \
+	gen-c_glib/tutorial_types.h
 
 libtutorialgencglib_la_LIBADD = \
-    $(top_builddir)/lib/c_glib/libthrift_c_glib.la
+	$(top_builddir)/lib/c_glib/libthrift_c_glib.la
 
 
 noinst_PROGRAMS = \
-    tutorial_server \
-    tutorial_client
+	tutorial_server \
+	tutorial_client
 
 tutorial_server_SOURCES = \
-    c_glib_server.c
+	c_glib_server.c
 
 tutorial_server_LDADD = \
-    libtutorialgencglib.la \
-    $(top_builddir)/lib/c_glib/libthrift_c_glib.la
+	libtutorialgencglib.la \
+	$(top_builddir)/lib/c_glib/libthrift_c_glib.la
 
 tutorial_client_SOURCES = \
-    c_glib_client.c
+	c_glib_client.c
 
 tutorial_client_LDADD = \
-    libtutorialgencglib.la \
-    $(top_builddir)/lib/c_glib/libthrift_c_glib.la
+	libtutorialgencglib.la \
+	$(top_builddir)/lib/c_glib/libthrift_c_glib.la
 
 
 $(nodist_libtutorialgencglib_la_SOURCES): $(top_srcdir)/tutorial/tutorial.thrift
-    $(THRIFT) --gen c_glib -r $<
+	$(THRIFT) --gen c_glib -r $<
 
 clean-local:
-    $(RM) -r gen-c_glib
+	$(RM) -r gen-c_glib
 
 tutorialserver: all
-    ./tutorial_server
+	./tutorial_server
 
 tutorialclient: all
-    ./tutorial_client
+	./tutorial_client
 
 EXTRA_DIST = \
-    c_glib_server.c \
-    c_glib_client.c
+	c_glib_server.c \
+	c_glib_client.c
diff --git a/tutorial/cpp/Makefile.am b/tutorial/cpp/Makefile.am
index bff2417..918adb2 100755
--- a/tutorial/cpp/Makefile.am
+++ b/tutorial/cpp/Makefile.am
@@ -19,40 +19,40 @@
 .NOTPARALLEL:
 noinst_LTLIBRARIES = libtutorialgencpp.la
 nodist_libtutorialgencpp_la_SOURCES = \
-    gen-cpp/Calculator.cpp \
-    gen-cpp/Calculator.h \
-    gen-cpp/SharedService.cpp \
-    gen-cpp/SharedService.h \
-    gen-cpp/shared_constants.cpp \
-    gen-cpp/shared_constants.h \
-    gen-cpp/shared_types.cpp \
-    gen-cpp/shared_types.h \
-    gen-cpp/tutorial_constants.cpp \
-    gen-cpp/tutorial_constants.h \
-    gen-cpp/tutorial_types.cpp \
-    gen-cpp/tutorial_types.h
+	gen-cpp/Calculator.cpp \
+	gen-cpp/Calculator.h \
+	gen-cpp/SharedService.cpp \
+	gen-cpp/SharedService.h \
+	gen-cpp/shared_constants.cpp \
+	gen-cpp/shared_constants.h \
+	gen-cpp/shared_types.cpp \
+	gen-cpp/shared_types.h \
+	gen-cpp/tutorial_constants.cpp \
+	gen-cpp/tutorial_constants.h \
+	gen-cpp/tutorial_types.cpp \
+	gen-cpp/tutorial_types.h
 
 
 
 libtutorialgencpp_la_LIBADD = $(top_builddir)/lib/cpp/libthrift.la
 
 noinst_PROGRAMS = \
-    TutorialServer \
-    TutorialClient
+	TutorialServer \
+	TutorialClient
 
 TutorialServer_SOURCES = \
-    CppServer.cpp
+	CppServer.cpp
 
 TutorialServer_LDADD = \
-    libtutorialgencpp.la \
-    $(top_builddir)/lib/cpp/libthrift.la
+	libtutorialgencpp.la \
+	$(top_builddir)/lib/cpp/libthrift.la
 
 TutorialClient_SOURCES = \
-    CppClient.cpp
+	CppClient.cpp
 
 TutorialClient_LDADD = \
-    libtutorialgencpp.la \
-    $(top_builddir)/lib/cpp/libthrift.la
+	libtutorialgencpp.la \
+	$(top_builddir)/lib/cpp/libthrift.la
 
 #
 # Common thrift code generation rules
@@ -60,21 +60,21 @@
 THRIFT = $(top_builddir)/compiler/cpp/thrift
 
 gen-cpp/Calculator.cpp gen-cpp/tutorial_types.cpp gen-cpp/tutorial_constants.cpp: $(top_srcdir)/tutorial/tutorial.thrift
-    $(THRIFT) --gen cpp -r $<
+	$(THRIFT) --gen cpp -r $<
 
 AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(LIBEVENT_CPPFLAGS) -I$(top_srcdir)/lib/cpp/src -Igen-cpp
 AM_CXXFLAGS = -Wall
 AM_LDFLAGS = $(BOOST_LDFLAGS) $(LIBEVENT_LDFLAGS)
 
 clean-local:
-    $(RM) -r gen-cpp
+	$(RM) -r gen-cpp
 
 tutorialserver: all
-    ./TutorialServer
+	./TutorialServer
 
 tutorialclient: all
-    ./TutorialClient
+	./TutorialClient
 
 EXTRA_DIST = \
-    CppClient.cpp \
-    CppServer.cpp
+	CppClient.cpp \
+	CppServer.cpp
diff --git a/tutorial/go/Makefile.am b/tutorial/go/Makefile.am
index 6a6ee51..a707d5d 100644
--- a/tutorial/go/Makefile.am
+++ b/tutorial/go/Makefile.am
@@ -20,42 +20,42 @@
 THRIFT = $(top_builddir)/compiler/cpp/thrift
 
 gen-go/tutorial/calculator.go gen-go/shared/shared_service.go: $(top_srcdir)/tutorial/tutorial.thrift
-    $(THRIFT) --gen go -r $<
+	$(THRIFT) --gen go -r $<
 
 all-local: gen-go/tutorial/calculator.go
 
 
 check: src/git.apache.org/thrift.git/lib/go/thrift
-    $(THRIFT) -r --gen go $(top_srcdir)/tutorial/tutorial.thrift
-    cp -r gen-go/* src/
-    GOPATH=`pwd` $(GO) build ./...
-    GOPATH=`pwd` $(GO) build -o go-tutorial src/*.go
-    GOPATH=`pwd` $(GO) build -o calculator-remote src/tutorial/calculator-remote/calculator-remote.go
+	$(THRIFT) -r --gen go $(top_srcdir)/tutorial/tutorial.thrift
+	cp -r gen-go/* src/
+	GOPATH=`pwd` $(GO) build ./...
+	GOPATH=`pwd` $(GO) build -o go-tutorial src/*.go
+	GOPATH=`pwd` $(GO) build -o calculator-remote src/tutorial/calculator-remote/calculator-remote.go
 
 src/git.apache.org/thrift.git/lib/go/thrift:
-    mkdir -p src/git.apache.org/thrift.git/lib/go
-    ln -sf $(realpath $(top_srcdir)/lib/go/thrift) src/git.apache.org/thrift.git/lib/go/thrift
+	mkdir -p src/git.apache.org/thrift.git/lib/go
+	ln -sf $(realpath $(top_srcdir)/lib/go/thrift) src/git.apache.org/thrift.git/lib/go/thrift
 
 tutorialserver: all
-    GOPATH=`pwd` $(GO) run src/*.go -server=true
+	GOPATH=`pwd` $(GO) run src/*.go -server=true
 
 tutorialclient: all
-    GOPATH=`pwd` $(GO) run src/*.go
+	GOPATH=`pwd` $(GO) run src/*.go 
 
 tutorialsecureserver: all
-    GOPATH=`pwd` $(GO) run src/*.go -server=true -secure=true
+	GOPATH=`pwd` $(GO) run src/*.go -server=true -secure=true
 
 tutorialsecureclient: all
-    GOPATH=`pwd` $(GO) run src/*.go -secure=true
+	GOPATH=`pwd` $(GO) run src/*.go -secure=true
 
 clean-local:
-    $(RM) -r gen-* src/shared src/tutorial src/git.apache.org go-tutorial calculator-remote
+	$(RM) -r gen-* src/shared src/tutorial src/git.apache.org go-tutorial calculator-remote
 
 EXTRA_DIST = \
-    src/client.go \
-    src/handler.go \
-    src/server.go \
-    src/main.go \
-    server.crt \
-    server.key
+	src/client.go \
+	src/handler.go \
+	src/server.go \
+	src/main.go \
+	server.crt \
+	server.key
 
diff --git a/tutorial/hs/Makefile.am b/tutorial/hs/Makefile.am
index 943cb23..f274eb6 100755
--- a/tutorial/hs/Makefile.am
+++ b/tutorial/hs/Makefile.am
@@ -18,22 +18,22 @@
 #
 
 all-local:
-    $(top_builddir)/compiler/cpp/thrift --gen hs -r $(top_srcdir)/tutorial/tutorial.thrift
-    $(CABAL) install
+	$(top_builddir)/compiler/cpp/thrift --gen hs -r $(top_srcdir)/tutorial/tutorial.thrift
+	$(CABAL) install
 
 install-exec-hook:
-    $(CABAL) install
+	$(CABAL) install
 
 # Make sure this doesn't fail if Haskell is not configured.
 clean-local:
-    $(CABAL) clean
-    $(RM) -r gen-*
+	$(CABAL) clean
+	$(RM) -r gen-*
 
 check-local:
-    $(CABAL) check
+	$(CABAL) check
 
 tutorialserver: all
-    dist/build/HaskellServer/HaskellServer
+	dist/build/HaskellServer/HaskellServer
 
 tutorialclient: all
-    dist/build/HaskellClient/HaskellClient
+	dist/build/HaskellClient/HaskellClient
diff --git a/tutorial/java/Makefile.am b/tutorial/java/Makefile.am
index e755c0a..95908b1 100755
--- a/tutorial/java/Makefile.am
+++ b/tutorial/java/Makefile.am
@@ -21,25 +21,25 @@
 
 # Make sure this doesn't fail if ant is not configured.
 clean-local:
-    ANT=$(ANT) ; if test -z "$$ANT" ; then ANT=: ; fi ; \
-    $$ANT $(ANT_FLAGS) clean
+	ANT=$(ANT) ; if test -z "$$ANT" ; then ANT=: ; fi ; \
+	$$ANT $(ANT_FLAGS) clean
 
 all-local:
-    $(ANT) $(ANT_FLAGS) compile
+	$(ANT) $(ANT_FLAGS) compile
 
 check-local: all
-    $(ANT) $(ANT_FLAGS) test
+	$(ANT) $(ANT_FLAGS) test
 
 tutorial: all
-    $(ANT) $(ANT_FLAGS) tutorial
+	$(ANT) $(ANT_FLAGS) tutorial
 
 tutorialserver: all
-    $(ANT) $(ANT_FLAGS) tutorialserver
+	$(ANT) $(ANT_FLAGS) tutorialserver
 
 tutorialclient: all
-    $(ANT) $(ANT_FLAGS) tutorialclient
+	$(ANT) $(ANT_FLAGS) tutorialclient
 
 EXTRA_DIST = \
-    build.xml \
-    src \
-    README.md
+	build.xml \
+	src \
+	README.md
diff --git a/tutorial/js/Makefile.am b/tutorial/js/Makefile.am
index 2a899d0..3fe0888 100755
--- a/tutorial/js/Makefile.am
+++ b/tutorial/js/Makefile.am
@@ -21,19 +21,19 @@
 
 # Make sure this doesn't fail if ant is not configured.
 clean-local:
-    ANT=$(ANT) ; if test -z "$$ANT" ; then ANT=: ; fi ; \
-    $$ANT $(ANT_FLAGS) clean
+	ANT=$(ANT) ; if test -z "$$ANT" ; then ANT=: ; fi ; \
+	$$ANT $(ANT_FLAGS) clean
 
 all-local:
-    $(ANT) $(ANT_FLAGS) compile
+	$(ANT) $(ANT_FLAGS) compile
 
 check-local: all
-    $(ANT) $(ANT_FLAGS) test
+	$(ANT) $(ANT_FLAGS) test
 
 tutorialserver: all
-    $(ANT) $(ANT_FLAGS) tutorialserver
+	$(ANT) $(ANT_FLAGS) tutorialserver
 
 EXTRA_DIST = \
-    build.xml \
-    src \
-    tutorial.html
+	build.xml \
+	src \
+	tutorial.html
diff --git a/tutorial/nodejs/Makefile.am b/tutorial/nodejs/Makefile.am
index 0113e1a..ecf3b2b 100644
--- a/tutorial/nodejs/Makefile.am
+++ b/tutorial/nodejs/Makefile.am
@@ -20,28 +20,28 @@
 THRIFT = $(top_builddir)/compiler/cpp/thrift
 
 gen-nodejs/Calculator.js gen-nodejs/SharedService.js: $(top_srcdir)/tutorial/tutorial.thrift
-    $(THRIFT) --gen js:node -r $<
+	$(THRIFT) --gen js:node -r $<
 
 all-local: gen-nodejs/Calculator.js
 
 tutorialserver: all
-    NODE_PATH="$(top_builddir)/lib/nodejs:$(top_builddir)/lib/nodejs/lib:$(NODEPATH)" $(NODEJS) NodeServer.js
+	NODE_PATH="$(top_builddir)/lib/nodejs:$(top_builddir)/lib/nodejs/lib:$(NODEPATH)" $(NODEJS) NodeServer.js
 
 tutorialclient: all
-    NODE_PATH="$(top_builddir)/lib/nodejs:$(top_builddir)/lib/nodejs/lib:$(NODEPATH)" $(NODEJS) NodeClient.js
+	NODE_PATH="$(top_builddir)/lib/nodejs:$(top_builddir)/lib/nodejs/lib:$(NODEPATH)" $(NODEJS) NodeClient.js
 
 tutorialserver_promise: all
-    NODE_PATH="$(top_builddir)/lib/nodejs:$(top_builddir)/lib/nodejs/lib:$(NODEPATH)" $(NODEJS) NodeServerPromise.js
+	NODE_PATH="$(top_builddir)/lib/nodejs:$(top_builddir)/lib/nodejs/lib:$(NODEPATH)" $(NODEJS) NodeServerPromise.js
 
 tutorialclient_promise: all
-    NODE_PATH="$(top_builddir)/lib/nodejs:$(top_builddir)/lib/nodejs/lib:$(NODEPATH)" $(NODEJS) NodeClientPromise.js
+	NODE_PATH="$(top_builddir)/lib/nodejs:$(top_builddir)/lib/nodejs/lib:$(NODEPATH)" $(NODEJS) NodeClientPromise.js
 
 
 clean-local:
-    $(RM) -r gen-*
+	$(RM) -r gen-*
 
 EXTRA_DIST = \
-    NodeServer.js \
-    NodeClient.js \
-    NodeServerPromise.js \
-    NodeClientPromise.js
+	NodeServer.js \
+	NodeClient.js \
+	NodeServerPromise.js \
+	NodeClientPromise.js
diff --git a/tutorial/py.tornado/Makefile.am b/tutorial/py.tornado/Makefile.am
index 97e7027..6ac6023 100755
--- a/tutorial/py.tornado/Makefile.am
+++ b/tutorial/py.tornado/Makefile.am
@@ -20,19 +20,19 @@
 THRIFT = $(top_builddir)/compiler/cpp/thrift
 
 gen-py.tornado/tutorial/Calculator.py gen-py.tornado/shared/SharedService.py: $(top_srcdir)/tutorial/tutorial.thrift
-    $(THRIFT) --gen py:tornado -r $<
+	$(THRIFT) --gen py:tornado -r $<
 
 all-local: gen-py.tornado/tutorial/Calculator.py
 
 tutorialserver: all
-    ${PYTHON} PythonServer.py
+	${PYTHON} PythonServer.py
 
 tutorialclient: all
-    ${PYTHON} PythonClient.py
+	${PYTHON} PythonClient.py
 
 clean-local:
-    $(RM) -r gen-*
+	$(RM) -r gen-*
 
 EXTRA_DIST = \
-    PythonServer.py \
-    PythonClient.py
+	PythonServer.py \
+	PythonClient.py
diff --git a/tutorial/py.twisted/Makefile.am b/tutorial/py.twisted/Makefile.am
index 5dac658..c6cbd45 100755
--- a/tutorial/py.twisted/Makefile.am
+++ b/tutorial/py.twisted/Makefile.am
@@ -20,20 +20,20 @@
 THRIFT = $(top_builddir)/compiler/cpp/thrift
 
 gen-py/tutorial/Calculator.py gen-py/shared/SharedService.py: $(top_srcdir)/tutorial/tutorial.thrift
-    $(THRIFT) --gen py:twisted -r $<
+	$(THRIFT) --gen py:twisted -r $<
 
 all-local: gen-py/tutorial/Calculator.py
 
 tutorialserver: all
-    ${PYTHON} PythonServer.py
+	${PYTHON} PythonServer.py
 
 tutorialclient: all
-    ${PYTHON} PythonClient.py
+	${PYTHON} PythonClient.py
 
 clean-local:
-    $(RM) -r gen-*
+	$(RM) -r gen-*
 
 EXTRA_DIST = \
-    PythonClient.py \
-    PythonServer.py \
-    PythonServer.tac
+	PythonClient.py \
+	PythonServer.py \
+	PythonServer.tac
diff --git a/tutorial/py/Makefile.am b/tutorial/py/Makefile.am
index 51f89c8..2397a12 100755
--- a/tutorial/py/Makefile.am
+++ b/tutorial/py/Makefile.am
@@ -20,19 +20,19 @@
 THRIFT = $(top_builddir)/compiler/cpp/thrift
 
 gen-py/tutorial/Calculator.py gen-py/shared/SharedService.py: $(top_srcdir)/tutorial/tutorial.thrift
-    $(THRIFT) --gen py -r $<
+	$(THRIFT) --gen py -r $<
 
 all-local: gen-py/tutorial/Calculator.py
 
 tutorialserver: all
-    ${PYTHON} PythonServer.py
+	${PYTHON} PythonServer.py
 
 tutorialclient: all
-    ${PYTHON} PythonClient.py
+	${PYTHON} PythonClient.py
 
 clean-local:
-    $(RM) -r gen-*
+	$(RM) -r gen-*
 
 EXTRA_DIST = \
-    PythonServer.py \
-    PythonClient.py
+	PythonServer.py \
+	PythonClient.py
diff --git a/tutorial/rb/Makefile.am b/tutorial/rb/Makefile.am
index f4942a9..369e903 100755
--- a/tutorial/rb/Makefile.am
+++ b/tutorial/rb/Makefile.am
@@ -20,19 +20,19 @@
 THRIFT = $(top_builddir)/compiler/cpp/thrift
 
 gen-py/calculator.rb gen-py/shared_service.rb: $(top_srcdir)/tutorial/tutorial.thrift
-    $(THRIFT) --gen rb -r $<
+	$(THRIFT) --gen rb -r $<
 
 all-local: gen-py/calculator.rb
 
 tutorialserver: all
-    ${RUBY} RubyServer.rb
+	${RUBY} RubyServer.rb
 
 tutorialclient: all
-    ${RUBY} RubyClient.rb
+	${RUBY} RubyClient.rb
 
 clean-local:
-    $(RM) -r gen-*
+	$(RM) -r gen-*
 
 EXTRA_DIST = \
-    RubyServer.rb \
-    RubyClient.rb
+	RubyServer.rb \
+	RubyClient.rb