[gnome-contacts] Require/build cheese correctly
- From: Alexander Larsson <alexl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-contacts] Require/build cheese correctly
- Date: Thu, 7 Jun 2012 08:51:06 +0000 (UTC)
commit 5a754c9e9d123a061df918301f947dca38336686
Author: Alexander Larsson <alexl redhat com>
Date: Thu Jun 7 10:50:04 2012 +0200
Require/build cheese correctly
configure.ac | 2 ++
src/Makefile.am | 4 +++-
2 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6653f9e..34d7caf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,6 +54,8 @@ AC_SUBST(CONTACTS_PACKAGES)
gstreamers_modules="gdk-x11-3.0
gstreamer-0.10
gstreamer-interfaces-0.10
+ cheese-gtk >= 3.3.5
+ cheese
"
PKG_CHECK_MODULES(CONTACTS_GSTREAMER,
[$gstreamers_modules],
diff --git a/src/Makefile.am b/src/Makefile.am
index 02347cc..66c6e68 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -59,7 +59,6 @@ contact-resources.c: contacts.gresource.xml app-menu.ui
--target=$@ --sourcedir=$(srcdir) --c-name contacts --generate-source
gnome_contacts_SOURCES = \
- cheese-flash.c \
um-crop-area.c \
contact-resources.c \
gtk-notification.c \
@@ -71,6 +70,9 @@ gnome_contacts_LDADD = $(CONTACTS_LIBS) -lm
if USE_GSTREAMER
gnome_contacts_LDADD += $(CONTACTS_GSTREAMER_LIBS)
+gnome_contacts_SOURCES += \
+ cheese-flash.c \
+ $(NULL)
endif
CLEANFILES = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]