[gstreamermm] Use non-recursive automake for examples.

[José Alburquerque <jaalburqu src gnome org>]

commit 605dd0e04d0befc8693516ad182ebaaf2c7581df
Author: José Alburquerque <jaalburqu svn gnome org>
Date:   Wed Sep 9 21:09:23 2009 -0400

    	Use non-recursive automake for examples.
    
    	* configure.ac:
    	* examples/Makefile.am: Modify so that non-recursive automake is used
    	for examples (adapted from glibmm).
    
    	* examples/Makefile.am_fragment:
    	* examples/element_link/Makefile.am:
    	* examples/ogg_player/Makefile.am:
    	* examples/optiongroup/Makefile.am:
    	* examples/typefind/Makefile.am: Delete these.
    
    	* tests/Makefile.am: Beautify.

 ChangeLog                         |   16 ++++++
 configure.ac                      |    6 --
 examples/Makefile.am              |   50 ++++++++++++++++--
 examples/Makefile.am_fragment     |   42 --------------
 examples/element_link/Makefile.am |    6 --
 examples/ogg_player/Makefile.am   |    6 --
 examples/optiongroup/Makefile.am  |    6 --
 examples/typefind/Makefile.am     |    6 --
 tests/Makefile.am                 |  109 +++++++++++--------------------------
 9 files changed, 93 insertions(+), 154 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9eeeb89..6daeffb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 2009-09-09  José Alburquerque  <jaalburqu svn gnome org>
 
+	Use non-recursive automake for examples.
+
+	* configure.ac:
+	* examples/Makefile.am: Modify so that non-recursive automake is used
+	for examples (adapted from glibmm).
+
+	* examples/Makefile.am_fragment:
+	* examples/element_link/Makefile.am:
+	* examples/ogg_player/Makefile.am:
+	* examples/optiongroup/Makefile.am:
+	* examples/typefind/Makefile.am: Delete these.
+
+	* tests/Makefile.am: Beautify.
+
+2009-09-09  José Alburquerque  <jaalburqu svn gnome org>
+
 	Add the tests and examples directory to the build.
 
 	* Makefile.am (SUBDIRS): Add test and examples directories.
diff --git a/configure.ac b/configure.ac
index 2964ccf..0b53d80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,12 +103,6 @@ MM_ARG_WITH_TAGFILE_DOC([gtkmm-2.4.tag], [gtkmm-2.4])
 EXAMPLE_SUBDIR="examples"
 AC_CONFIG_FILES([
     examples/Makefile
-    examples/optiongroup/Makefile
-    examples/element_link/Makefile
-    examples/ogg_player/Makefile
-    examples/ogg_player_gtkmm/Makefile
-    examples/media_player_gtkmm/Makefile
-    examples/typefind/Makefile
     ])
 AC_SUBST(EXAMPLE_SUBDIR)
 else
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 80b0aa5..de78b05 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,6 +1,48 @@
-example_dirs = element_link media_player_gtkmm ogg_player ogg_player_gtkmm \
-	       optiongroup typefind
+## Copyright 2009 The gstreamermm Development Team
+##
+## This library is free software: you can redistribute it and/or modify it
+## under the terms of the GNU Lesser General Public License as published
+## by the Free Software Foundation, either version 2.1 of the License,
+## or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public License
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-SUBDIRS = $(example_dirs)
-EXTRA_DIST = README Makefile.am_fragment
+AUTOMAKE_OPTIONS = subdir-objects
 
+noinst_PROGRAMS =			\
+	element_link/example		\
+	media_player_gtkmm/example	\
+	ogg_player/example		\
+	ogg_player_gtkmm/example	\
+	optiongroup/example		\
+	typefind/example
+
+gstreamermm_includes = -I$(top_builddir)/gstreamer \
+		      $(if $(srcdir:.=),-I$(top_srcdir)/gstreamer) \
+		      $(GSTREAMERMM_EXAMPLES_CFLAGS) $(GSTREAMERMM_CFLAGS)
+local_cppflags       = -I$(top_builddir) $(gstreamermm_includes)
+
+AM_CPPFLAGS          = $(local_cppflags) $(GTHREAD_CFLAGS)
+AM_CXXFLAGS          = $(GSTREAMERMM_WXXFLAGS)
+
+local_libgstreamermm = $(top_builddir)/gstreamer/gstreamermm/libgstreamermm-$(GSTREAMERMM_API_VERSION).la
+
+LDADD                = $(GSTREAMERMM_EXAMPLES_LIBS) $(GSTREAMERMM_LIBS) \
+		       $(local_libgstreamermm)
+
+element_link_example_SOURCES 		= element_link/element_link.cc
+media_player_gtkmm_example_SOURCES 	= media_player_gtkmm/main.cc \
+				  	  media_player_gtkmm/player_window.cc \
+				  	  media_player_gtkmm/player_window.h
+ogg_player_example_SOURCES		= ogg_player/main.cc
+ogg_player_gtkmm_example_SOURCES	= ogg_player_gtkmm/main.cc \
+				  	  ogg_player_gtkmm/player_window.cc \
+				  	  ogg_player_gtkmm/player_window.h
+optiongroup_example_SOURCES		= optiongroup/main.cc
+typefind_example_SOURCES		= typefind/main.cc
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6164eb7..d7d2220 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,9 +1,11 @@
-INCLUDES= -I$(top_builddir)/gstreamer -I$(top_srcdir)/gstreamer \
-	  @GSTREAMERMM_CFLAGS@
+INCLUDES	= -I$(top_builddir)/gstreamer -I$(top_srcdir)/gstreamer \
+		  @GSTREAMERMM_CFLAGS@
 
-LDADD=$(top_builddir)/gstreamer/gstreamermm/libgstreamermm-0.10.la
+LDADD 		= $(top_builddir)/gstreamer/gstreamermm/libgstreamermm-0.10.la \
+		  $(GSTREAMERMM_LIBS)
 
-noinst_PROGRAMS = test-caps test-create-element test-pipeline-add-element \
+
+noinst_PROGRAMS  = test-caps test-create-element test-pipeline-add-element \
                   test-link-elements test-create-bin test-miniobject-wrap \
                   test-message-wrap test-event-wrap test-query-wrap \
 		  test-structure test-caps-structures test-interface \
@@ -12,77 +14,28 @@ noinst_PROGRAMS = test-caps test-create-element test-pipeline-add-element \
 		  test-init-check-noargs test-init-noargs test-iterator \
 		  test-property-caps test-plugin-gen test-plugin-signals
 
-test_caps_SOURCES=test-caps.cc
-test_caps_LDFLAGS= GSTREAMERMM_LIBS@
-
-test_create_element_SOURCES=test-create-element.cc
-test_create_element_LDFLAGS= GSTREAMERMM_LIBS@
-
-test_pipeline_add_element_SOURCES=test-pipeline-add-element.cc
-test_pipeline_add_element_LDFLAGS= GSTREAMERMM_LIBS@
-
-test_link_elements_SOURCES=test-link-elements.cc
-test_link_elements_LDFLAGS= GSTREAMERMM_LIBS@
-
-test_create_bin_SOURCES=test-create-bin.cc
-test_create_bin_LDFLAGS= GSTREAMERMM_LIBS@
-
-test_miniobject_wrap_SOURCES=test-miniobject-wrap.cc
-test_miniobject_wrap_LDFLAGS= GSTREAMERMM_LIBS@
-
-test_message_wrap_SOURCES=test-message-wrap.cc
-test_message_wrap_LDFLAGS= GSTREAMERMM_LIBS@
-
-test_event_wrap_SOURCES=test-event-wrap.cc
-test_event_wrap_LDFLAGS= GSTREAMERMM_LIBS@
-
-test_query_wrap_SOURCES=test-query-wrap.cc
-test_query_wrap_LDFLAGS= GSTREAMERMM_LIBS@
-
-test_structure_SOURCES=test-structure.cc
-test_structure_LDFLAGS= GSTREAMERMM_LIBS@
-
-test_caps_structures_SOURCES=test-caps-structures.cc
-test_caps_structures_LDFLAGS= GSTREAMERMM_LIBS@
-
-test_interface_SOURCES=test-interface.cc
-test_interface_LDFLAGS= GSTREAMERMM_LIBS@
-
-test_create_bus_SOURCES=test-create-bus.cc
-test_create_bus_LDFLAGS= GSTREAMERMM_LIBS@
-
-test_taglist_SOURCES=test-taglist.cc
-test_taglist_LDFLAGS= GSTREAMERMM_LIBS@
-
-test_tagsetter_SOURCES=test-tagsetter.cc
-test_tagsetter_LDFLAGS= GSTREAMERMM_LIBS@
-
-test_pad_SOURCES=test-pad.cc
-test_pad_LDFLAGS= GSTREAMERMM_LIBS@
-
-test_ghost_pad_SOURCES=test-ghost-pad.cc
-test_ghost_pad_LDFLAGS= GSTREAMERMM_LIBS@
-
-test_init_check_SOURCES=test-init-check.cc
-test_init_check_LDFLAGS= GSTREAMERMM_LIBS@
-
-test_init_SOURCES=test-init.cc
-test_init_LDFLAGS= GSTREAMERMM_LIBS@
-
-test_init_check_noargs_SOURCES=test-init-check-noargs.cc
-test_init_check_noargs_LDFLAGS= GSTREAMERMM_LIBS@
-
-test_init_noargs_SOURCES=test-init-noargs.cc
-test_init_noargs_LDFLAGS= GSTREAMERMM_LIBS@
-
-test_iterator_SOURCES=test-iterator.cc
-test_iterator_LDFLAGS= GSTREAMERMM_LIBS@
-
-test_property_caps_SOURCES=test-property-caps.cc
-test_property_caps_LDFLAGS= GSTREAMERMM_LIBS@
-
-test_plugin_gen_SOURCES=test-plugin-gen.cc
-test_plugin_gen_LDFLAGS= GSTREAMERMM_LIBS@
-
-test_plugin_signals_SOURCES=test-plugin-signals.cc
-test_plugin_signals_LDFLAGS= GSTREAMERMM_LIBS@
+test_caps_SOURCES			= test-caps.cc
+test_create_element_SOURCES		= test-create-element.cc
+test_pipeline_add_element_SOURCES	= test-pipeline-add-element.cc
+test_link_elements_SOURCES		= test-link-elements.cc
+test_create_bin_SOURCES			= test-create-bin.cc
+test_miniobject_wrap_SOURCES		= test-miniobject-wrap.cc
+test_message_wrap_SOURCES		= test-message-wrap.cc
+test_event_wrap_SOURCES			= test-event-wrap.cc
+test_query_wrap_SOURCES			= test-query-wrap.cc
+test_structure_SOURCES			= test-structure.cc
+test_caps_structures_SOURCES		= test-caps-structures.cc
+test_interface_SOURCES			= test-interface.cc
+test_create_bus_SOURCES			= test-create-bus.cc
+test_taglist_SOURCES			= test-taglist.cc
+test_tagsetter_SOURCES			= test-tagsetter.cc
+test_pad_SOURCES			= test-pad.cc
+test_ghost_pad_SOURCES			= test-ghost-pad.cc
+test_init_check_SOURCES			= test-init-check.cc
+test_init_SOURCES			= test-init.cc
+test_init_check_noargs_SOURCES		= test-init-check-noargs.cc
+test_init_noargs_SOURCES		= test-init-noargs.cc
+test_iterator_SOURCES			= test-iterator.cc
+test_property_caps_SOURCES		= test-property-caps.cc
+test_plugin_gen_SOURCES			= test-plugin-gen.cc
+test_plugin_signals_SOURCES		= test-plugin-signals.cc