[gstreamermm] build: fix 'configure' warnings



commit 52f1d38f75cb980e8d711f58fa58eb7abbab2d76
Author: Marcin Kolny <marcin kolny gmail com>
Date:   Thu Aug 20 22:04:47 2015 +0000

    build: fix 'configure' warnings
    
        * configure.ac: add subdir-objects parameter, minors.
        * examples/Makefile.am: conditionally set _SOURCES and _LDADD of
          optional examples.

 configure.ac         |    6 +++---
 examples/Makefile.am |   20 +++++++++++---------
 2 files changed, 14 insertions(+), 12 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index bec12ca..a1d3529 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ MM_CONFIG_DOCTOOL_DIR([docs])
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 AC_SUBST([GSTREAMERMM_SO_VERSION], [0:0:0])
 
-AM_INIT_AUTOMAKE([1.9 -Wno-portability check-news dist-bzip2 no-define nostdinc tar-ustar])
+AM_INIT_AUTOMAKE([1.9 subdir-objects -Wno-portability check-news dist-bzip2 no-define nostdinc tar-ustar])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 AM_MAINTAINER_MODE
 AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
@@ -96,11 +96,11 @@ MM_ARG_WITH_TAGFILE_DOC([glibmm-2.4.tag], [glibmm-2.4])
 MM_ARG_WITH_TAGFILE_DOC([cairomm-1.0.tag], [cairomm-1.0])
 MM_ARG_WITH_TAGFILE_DOC([pangomm-1.4.tag], [pangomm-1.4])
 
-enable_unittests=yes
 AC_ARG_ENABLE(unittests,
        AS_HELP_STRING([--disable-unittests], 
        [Disable unit tests]),
-       [enable_unittests = no])
+       [enable_unittests=no],
+       [enable_unittests=yes])
 
 AC_SUBST([ENABLE_UNITTESTS], ["$enable_unittests"])
 
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 11bf9b4..b7d00bc 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -22,6 +22,16 @@ local_libgstreamermm = $(top_builddir)/gstreamer/gstreamermm/libgstreamermm-$(GS
 if ENABLE_GUI_EXAMPLES
 gui_examples = media_player_gtkmm/example ogg_player_gtkmm/example
 examples_cppflags += $(GUI_EXAMPLES_CFLAGS)
+
+media_player_gtkmm_example_SOURCES                     = media_player_gtkmm/main.cc \
+                                                                                               
media_player_gtkmm/player_window.cc \
+                                                                                               
media_player_gtkmm/player_window.h
+media_player_gtkmm_example_LDADD                       = $(GUI_EXAMPLES_LIBS) $(local_libgstreamermm)
+
+ogg_player_gtkmm_example_SOURCES                       = ogg_player_gtkmm/main.cc \
+                                                                                               
ogg_player_gtkmm/player_window.cc \
+                                                                                               
ogg_player_gtkmm/player_window.h
+ogg_player_gtkmm_example_LDADD                         = $(GUI_EXAMPLES_LIBS) $(local_libgstreamermm)
 endif
 
 if ENABLE_GSTREAMERMM_PLUGINS_BAD
@@ -46,7 +56,7 @@ noinst_PROGRAMS =                                             \
        typefind/example                                        \
        optiongroup/example                                     \
        $(gl_examples)                                          \
-       $(optional_examples)
+       $(gui_examples)
 
 
 AM_CPPFLAGS = -I$(top_builddir) $(gstreamermm_includes) $(examples_cppflags)
@@ -60,15 +70,7 @@ dynamic_changing_source_example_SOURCES              = dynamic_changing_source/main.cc
 element_link_example_SOURCES                           = element_link/element_link.cc
 hello_world_example_SOURCES                            = hello_world/main.cc
 ogg_rewriter_example_SOURCES                           = ogg_rewriter/main.cc
-media_player_gtkmm_example_SOURCES                     = media_player_gtkmm/main.cc \
-                                                                                               
media_player_gtkmm/player_window.cc \
-                                                                                               
media_player_gtkmm/player_window.h
-media_player_gtkmm_example_LDADD                       = $(GUI_EXAMPLES_LIBS) $(local_libgstreamermm)
 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
-ogg_player_gtkmm_example_LDADD                         = $(GUI_EXAMPLES_LIBS) $(local_libgstreamermm)
 opengl_filter_example_SOURCES                          = opengl_filter/main.cc 
 optiongroup_example_SOURCES                                    = optiongroup/main.cc
 typefind_example_SOURCES                                       = typefind/main.cc


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]