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

14 years ago · 4561c6182c
17 changed files with 13 additions and 3 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -1,8 +1,12 @@
				@@ -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
--- a/configure.ac
+++ b/configure.ac
@ -52,6 +52,11 @@ if test -z "$CONFIG_REQUESTED" ; then
				@@ -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
				@@ -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
 ])

--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@ -1,2 +1,2 @@
				@@ -1,2 +1,2 @@

-SUBDIRS = Hello
+SUBDIRS = Hello qt
--- a/examples/qt/Makefile.am
+++ b/examples/qt/Makefile.am
--- a/examples/qt/demos/hello.cs
+++ b/examples/qt/demos/hello.cs
--- a/examples/qt/qt-gui-filters.xml
+++ b/examples/qt/qt-gui-filters.xml
--- a/examples/qt/qt-gui.cpp
+++ b/examples/qt/qt-gui.cpp
--- a/examples/qt/qt-gui.h
+++ b/examples/qt/qt-gui.h
--- a/examples/qt/src/QApplication.cs
+++ b/examples/qt/src/QApplication.cs
--- a/examples/qt/src/QCoreApplication.cs
+++ b/examples/qt/src/QCoreApplication.cs
--- a/examples/qt/src/QFlags.cs
+++ b/examples/qt/src/QFlags.cs
--- a/examples/qt/src/QPoint.cs
+++ b/examples/qt/src/QPoint.cs
--- a/examples/qt/src/QPushButton.cs
+++ b/examples/qt/src/QPushButton.cs
--- a/examples/qt/src/QSize.cs
+++ b/examples/qt/src/QSize.cs
--- a/examples/qt/src/QString.cs
+++ b/examples/qt/src/QString.cs
--- a/examples/qt/src/QWidget.cs
+++ b/examples/qt/src/QWidget.cs
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@ -42,6 +42,7 @@ generated: $(addsuffix .xml,$(NATIVE))
				@@ -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