Move qt into examples directory and don't build examples by default. Fix tests build

Makefile.am

@@ -1,8 +1,12 @@
 
 EXTRA_DIST = m4/expansions.m4
 
-SUBDIRS = src examples qt
+SUBDIRS = src
 
 if ENABLE_DEBUG
  SUBDIRS += tests
 endif
+
+if ENABLE_EXAMPLES
+ SUBDIRS += examples
+endif

configure.ac

@@ -52,6 +52,11 @@ if test -z "$CONFIG_REQUESTED" ; then
 	enable_debug=yes
 fi
 
+AC_ARG_ENABLE(examples,
+	AC_HELP_STRING([--enable-examples],
+		[Build examples [default=NO]]),
+		enable_examples=yes, enable_examples=no)
+AM_CONDITIONAL(ENABLE_EXAMPLES, test x$enable_examples = xyes)
 
 dnl package checks, common for all configs
 
@@ -66,10 +71,10 @@ src/Mono.Cxxi/Makefile
 src/generator/generator
 src/generator/Makefile
 src/Makefile
-qt/Makefile
 tests/Makefile
 examples/Makefile
 examples/Hello/Makefile
+examples/qt/Makefile
 Makefile
 ])
 

examples/Makefile.am

@@ -1,2 +1,2 @@
 
-SUBDIRS = Hello
+SUBDIRS = Hello qt

tests/Makefile.am

@@ -42,6 +42,7 @@ generated: $(addsuffix .xml,$(NATIVE))
 	$(foreach X,$?, \
 		mono --debug $(BUILD_DIR)/generator.exe -o=$@ -ns=Tests -lib=Test -inline=surrogatelib $(X) && \
 	) \
+	$(RM) generated/__*.cs && \
 	echo Bindings generated successfully.
 
 $(TEST_DLL): generated $(MANAGED) $(BUILD_DIR)/libTest.so $(BUILD_DIR)/libTest-inline.so