Splitting dependencies of libcheese and libcheese-gtk

Spliting dependencies of libcheese and libcheese-gtk and linking
libcheese library with it's dependencies.
parent 6d7e4dfc
......@@ -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`
......
......@@ -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 \
......
......@@ -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)
......@@ -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)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment