5 files changed, 17 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index d931a82e..e457ea31 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = gst-libs sys
+SUBDIRS = gst-libs sys tests
 
 # Extra clean files so that maintainer-clean removes *everything*
 MAINTAINERCLEANFILES = \
diff --git a/configure.ac b/configure.ac
index 862618a1..261817c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -135,4 +135,7 @@ AC_OUTPUT([
     gst-libs/gst/vaapi/Makefile
     sys/Makefile
     sys/vaapi/Makefile
+    tests/Makefile
+    tests/examples/Makefile
+    tests/examples/generic/Makefile
 ])
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 00000000..cbf577e6
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,4 @@
+SUBDIRS = examples
+
+# Extra clean files so that maintainer-clean removes *everything*
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/tests/examples/Makefile.am b/tests/examples/Makefile.am
new file mode 100644
index 00000000..f09ad590
--- /dev/null
+++ b/tests/examples/Makefile.am
@@ -0,0 +1,4 @@
+SUBDIRS = generic
+
+# Extra clean files so that maintainer-clean removes *everything*
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/tests/examples/generic/Makefile.am b/tests/examples/generic/Makefile.am
new file mode 100644
index 00000000..12a3966e
--- /dev/null
+++ b/tests/examples/generic/Makefile.am
@@ -0,0 +1,5 @@
+noinst_PROGRAMS = 	\
+	$(NULL)
+
+# Extra clean files so that maintainer-clean removes *everything*
+MAINTAINERCLEANFILES = Makefile.in