[cheese] Splitting dependencies of libcheese and libcheese-gtk

[Luciana Fujii Pontello <lufujii src gnome org>]

commit 5b32ddc116b2d5f0a04238fb6d39a0c5c7a6cb8c
Author: Luciana Fujii Pontello <luciana fujii eti br>
Date:   Mon Jan 31 17:55:31 2011 -0200

    Splitting dependencies of libcheese and libcheese-gtk
    
    Spliting dependencies of libcheese and libcheese-gtk and linking
    libcheese library with it's dependencies.

 configure.ac          |   25 ++++++++++++++++---------
 libcheese/Makefile.am |   16 +++++++++++++---
 src/Makefile.am       |    4 +++-
 tests/Makefile.am     |    5 +++++
 4 files changed, 37 insertions(+), 13 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6d55921..335d361 100644
--- a/configure.ac
+++ b/configure.ac
@@ -133,29 +133,36 @@ AM_CONDITIONAL(HAVE_XTEST, test "x$HAVE_TEST" = "xyes")
 PKG_CHECK_MODULES(CHEESE, \ 
   glib-2.0 >= $GLIB_REQUIRED \
   gobject-2.0 >= $GOBJECT_REQUIRED \
-  gio-2.0 >= $GIO_REQUIRED \
-  gtk+-2.0 >= $GTK_REQUIRED \
-  gdk-2.0 >= $GDK_REQUIRED \
-  gnome-desktop-2.0 >= $LIBGNOMEDESKTOP_REQUIRED \
+  gdk-pixbuf-2.0 \
   gstreamer-0.10 >= $GSTREAMER_REQUIRED \
   gstreamer-plugins-base-0.10 >= $GSTREAMER_REQUIRED \
   cairo >= $CAIRO_REQUIRED \
   pangocairo >= $PANGOCAIRO_REQUIRED \
-  librsvg-2.0 >= $LIBRSVG_REQUIRED \
   clutter-1.0 >= $CLUTTER_REQUIRED \
-  clutter-gtk-0.10 >= $CLUTTERGTK_REQUIRED \
   clutter-gst-1.0 >= $CLUTTERGST_REQUIRED \
+  $UDEV_PKG
+  )
+AC_SUBST(CHEESE_CFLAGS)
+AC_SUBST(CHEESE_LIBS)
+CHEESE_LIBS="$CHEESE_LIBS -lgstinterfaces-0.10"
+
+PKG_CHECK_MODULES(CHEESEGTK, \ 
+  gio-2.0 >= $GIO_REQUIRED \
+  gtk+-2.0 >= $GTK_REQUIRED \
+  gdk-2.0 >= $GDK_REQUIRED \
+  gnome-desktop-2.0 >= $LIBGNOMEDESKTOP_REQUIRED \
+  librsvg-2.0 >= $LIBRSVG_REQUIRED \
+  clutter-gtk-0.10 >= $CLUTTERGTK_REQUIRED \
   unique-1.0  >= $UNIQUE_REQUIRED \
   gee-1.0 >= $GEE_REQUIRED \
   libcanberra-gtk >= $LIBCANBERRA_REQUIRED \
   $UDEV_PKG \
   gnome-video-effects
   )
-AC_SUBST(CHEESE_CFLAGS)
+AC_SUBST(CHEESEGTK_CFLAGS)
 
-CHEESE_LIBS="$CHEESE_LIBS -lgstinterfaces-0.10"
 
-AC_SUBST(CHEESE_LIBS)
+AC_SUBST(CHEESEGTK_LIBS)
 
 GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
 GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
diff --git a/libcheese/Makefile.am b/libcheese/Makefile.am
index 4dce8b7..e4e49ce 100644
--- a/libcheese/Makefile.am
+++ b/libcheese/Makefile.am
@@ -7,7 +7,8 @@ INCLUDES = \
 	-DPACKAGE_LOCALEDIR=\""$(datadir)/locale"\" \
 	-DAPPNAME_DATA_DIR=\"$(pkgdatadir)\" \
 	-DGNOME_DESKTOP_USE_UNSTABLE_API=1 \
-	$(CHEESE_CFLAGS)
+	$(CHEESE_CFLAGS) \
+	$(CHEESEGTK_CFLAGS)
 
 lib_LTLIBRARIES = libcheese.la libcheese-gtk.la
 
@@ -25,7 +26,12 @@ glib_enum_c = cheese-enum-types.c
 glib_enum_headers = $(top_srcdir)/libcheese/cheese-widget.h
 include $(top_srcdir)/Makefile.am.enums
 
-libcheese_gtk_la_CFLAGS = $(CHEESE_CFLAGS)
+libcheese_gtk_la_CFLAGS = \
+	$(CHEESE_CFLAGS) \
+	$(CHEESEGTK_CFLAGS)
+
+libcheese_la_CFLAGS = \
+	$(CHEESE_CFLAGS)
 
 libcheese_la_SOURCES = \
 	cheese-fileutil.c \
@@ -56,9 +62,13 @@ libcheese_gtk_la_SOURCES = \
 cheesedir = $(includedir)/cheese
 cheese_HEADERS = cheese-widget.h cheese-avatar-chooser.h cheese-camera.h cheese-effect.h cheese-camera-device.h cheese-camera-device-monitor.h
 
+libcheese_la_LIBADD = \
+	$(CHEESE_LIBS)
+
 libcheese_gtk_la_LIBADD = \
 	libcheese.la \
-	$(CHEESE_LIBS)
+	$(CHEESE_LIBS) \
+	$(CHEESEGTK_LIBS)
 libcheese_gtk_la_LDFLAGS = \
 	-version-info $(CHEESE_LT_VERSION)		\
 	-export-symbols $(srcdir)/cheese-gtk.symbols	\
diff --git a/src/Makefile.am b/src/Makefile.am
index fc6f3b0..599f23f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,6 +27,7 @@ AM_CPPFLAGS = \
 	-DPACKAGE_LOCALEDIR=\""$(datadir)/locale"\"	\
 	-DGNOME_DESKTOP_USE_UNSTABLE_API=1 \
 	$(CHEESE_CFLAGS) \
+	$(CHEESEGTK_CFLAGS) \
 	-include $(CONFIG_HEADER) \
 	-I top_srcdir@/libcheese 
 
@@ -53,4 +54,5 @@ noinst_HEADERS = \
 cheese_LDADD = \
 	$(top_builddir)/libcheese/libcheese.la \
 	$(top_builddir)/libcheese/libcheese-gtk.la \
-	$(CHEESE_LIBS)
+	$(CHEESE_LIBS) \
+	$(CHEESEGTK_LIBS)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5a54375..e53b5eb 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,6 +9,7 @@ INCLUDES = \
 	-DAPPNAME_DATA_DIR=\"$(pkgdatadir)\" \
 	-DGNOME_DESKTOP_USE_UNSTABLE_API=1 \
 	$(CHEESE_CFLAGS) \
+	$(CHEESEGTK_CFLAGS) \
 	-I top_srcdir@/libcheese \
 	$(NULL)
 
@@ -26,19 +27,23 @@ cheese_test_monitor_SOURCES = cheese-test-monitor.c
 test_webcam_button_SOURCES = test-webcam-button.c
 
 cheese_test_widget_LDADD = $(CHEESE_LIBS) \
+	$(CHEESEGTK_LIBS) \
 	$(top_builddir)/libcheese/libcheese.la \
 	$(top_builddir)/libcheese/libcheese-gtk.la \
 	$(NULL)
 cheese_test_camera_LDADD = $(CHEESE_LIBS) \
+	$(CHEESEGTK_LIBS) \
 	$(top_builddir)/libcheese/libcheese.la \
 	$(NULL)
 cheese_test_monitor_LDADD = $(CHEESE_LIBS) \
+	$(CHEESEGTK_LIBS) \
 	$(top_builddir)/libcheese/libcheese.la \
 	$(top_builddir)/libcheese/libcheese-gtk.la \
 	$(NULL)
 test_webcam_button_LDADD = $(XTEST_LIBS)
 cheese_test_chooser_SOURCES = cheese-test-chooser.c
 cheese_test_chooser_LDADD = $(CHEESE_LIBS) \
+	$(CHEESEGTK_LIBS) \
 	$(top_builddir)/libcheese/libcheese.la \
 	$(top_builddir)/libcheese/libcheese-gtk.la \
 	$(NULL)