[gstreamermm/devel-other-plugins: 7/10] build: fix compile flags
- From: Marcin Kolny <mkolny src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gstreamermm/devel-other-plugins: 7/10] build: fix compile flags
- Date: Wed, 29 Jul 2015 10:23:32 +0000 (UTC)
commit ef0727af49d22fce8f4ece792530104cd0c8aa0d
Author: Marcin Kolny <marcin kolny flytronic pl>
Date: Fri Jul 24 07:07:52 2015 +0200
build: fix compile flags
* gst-plugins-bad/gstreamermm-plugins-bad/Makefile.am: add
libgstreamermm dependency.
.../gstreamermm-plugins-bad/Makefile.am | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/gst-plugins-bad/gstreamermm-plugins-bad/Makefile.am
b/gst-plugins-bad/gstreamermm-plugins-bad/Makefile.am
index 2951641..5e6552d 100644
--- a/gst-plugins-bad/gstreamermm-plugins-bad/Makefile.am
+++ b/gst-plugins-bad/gstreamermm-plugins-bad/Makefile.am
@@ -1,4 +1,4 @@
-## Copyright 2009 The gstreamermm Development Team
+## Copyright 2015 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
@@ -15,15 +15,19 @@
lib_LTLIBRARIES = libgstreamermm-plugins-bad- GSTREAMERMM_API_VERSION@.la
binding_modulename = gstreamermm- GSTREAMERMM_API_VERSION@
+
include $(srcdir)/../src/filelist.am
include $(srcdir)/filelist.am
include $(top_srcdir)/build/compile-binding.am
-local_cppflags = -I$(top_srcdir)/gstreamer $(binding_includes) $(binding_cppflags) -DGSTREAMERMM_BUILD=1
+local_includes = -I$(top_builddir)/gstreamer $(if $(srcdir:.=),-I$(top_srcdir)/gstreamer)
+local_cppflags = $(binding_includes) $(local_includes) $(binding_cppflags) -DGSTREAMERMM_PLUGINS_BAD_BUILD=1
-AM_CPPFLAGS = $(local_cppflags) $(GSTREAMERMM_CFLAGS)
+AM_CPPFLAGS = $(local_cppflags) $(GSTREAMERMM_PLUGINS_BAD_CFLAGS)
AM_CXXFLAGS = $(GSTREAMERMM_WXXFLAGS)
+local_libadd = $(top_builddir)/gstreamer/gstreamermm/libgstreamermm-$(GSTREAMERMM_API_VERSION).la
+
libgstreamermm_plugins_bad_ GSTREAMERMM_API_VERSION@_la_SOURCES = $(binding_sources)
libgstreamermm_plugins_bad_ GSTREAMERMM_API_VERSION@_la_LDFLAGS = -no-undefined -version-info
$(GSTREAMERMM_SO_VERSION)
-libgstreamermm_plugins_bad_ GSTREAMERMM_API_VERSION@_la_LIBADD = $(GSTREAMERMM_LIBS)
+libgstreamermm_plugins_bad_ GSTREAMERMM_API_VERSION@_la_LIBADD = $(GSTREAMERMM_PLUGINS_BAD_LIBS)
$(local_libadd)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]