[ekiga] Clean up dependencies
- From: Eugen Dedu <ededu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Clean up dependencies
- Date: Sat, 11 Jun 2016 17:19:24 +0000 (UTC)
commit dd6601190caab918212fa8017014cb1f6e3ad80b
Author: Eugen Dedu <eugen dedu univ-fcomte fr>
Date: Sat Jun 11 19:17:59 2016 +0200
Clean up dependencies
configure.ac | 9 +++------
lib/Makefile.am | 4 ++--
2 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9c2c28b..2385749 100644
--- a/configure.ac
+++ b/configure.ac
@@ -161,16 +161,13 @@ AC_SUBST(GLIB_LIBS)
dnl ##########################################
dnl Mandatory GST Clutter & Clutter support
dnl ##########################################
-PKG_CHECK_MODULES([CLUTTER], [clutter-1.0])
PKG_CHECK_MODULES([CLUTTER_GTK], [clutter-gtk-1.0])
-PKG_CHECK_MODULES([CLUTTER_GST], [clutter-gst-2.0 gstreamer-app-1.0 gstreamer-plugins-base-1.0])
+PKG_CHECK_MODULES([GSTREAMER], [gstreamer-plugins-base-1.0])
-AC_SUBST(CLUTTER_CFLAGS)
-AC_SUBST(CLUTTER_LIBS)
AC_SUBST(CLUTTER_GTK_CFLAGS)
AC_SUBST(CLUTTER_GTK_LIBS)
-AC_SUBST(CLUTTER_GST_CFLAGS)
-AC_SUBST(CLUTTER_GST_LIBS)
+AC_SUBST(GSTREAMER_CFLAGS)
+AC_SUBST(GSTREAMER_LIBS)
dnl ###############################
diff --git a/lib/Makefile.am b/lib/Makefile.am
index fcb90eb..38c18f9 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -479,7 +479,7 @@ endif
# Sources of the Clutter video output component
##
-AM_CPPFLAGS += $(CLUTTER_CFLAGS) $(CLUTTER_GTK_CFLAGS) $(CLUTTER_GST_CFLAGS) \
+AM_CPPFLAGS += $(CLUTTER_GTK_CFLAGS) $(GSTREAMER_CFLAGS) \
-I$(top_srcdir)/lib/engine/components/clutter-gst-videooutput
libekiga_la_SOURCES += \
@@ -488,7 +488,7 @@ libekiga_la_SOURCES += \
engine/components/clutter-gst-videooutput/videooutput-main-clutter-gst.cpp \
engine/components/clutter-gst-videooutput/videooutput-main-clutter-gst.h
-libekiga_la_LDFLAGS += $(CLUTTER_LIBS) $(CLUTTER_GTK_LIBS) $(CLUTTER_GST_LIBS)
+libekiga_la_LDFLAGS += $(CLUTTER_GTK_LIBS) $(GSTREAMER_LIBS)
##
# Sources of the foe list component
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]