[cheese/libcheese] Changing gtk dependent modules to libcheese-gtk
- From: Luciana Fujii Pontello <lufujii src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cheese/libcheese] Changing gtk dependent modules to libcheese-gtk
- Date: Sun, 30 Jan 2011 01:29:26 +0000 (UTC)
commit a3ef2c5b93a62a9e326b52ce7376c38f6331d387
Author: Luciana Fujii Pontello <luciana fujii eti br>
Date: Sat Jan 29 22:52:57 2011 -0200
Changing gtk dependent modules to libcheese-gtk
Changing cheese-countdown and cheese-flash to libcheese-gtk from
libcheesecommon. This will allow libcheesecommon not to depend on gtk.
Libcheesecommon is now also a installed library.
libcheese/Makefile.am | 11 +++++------
libcheese/cheese-gtk.symbols | 3 +++
src/Makefile.am | 1 +
3 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/libcheese/Makefile.am b/libcheese/Makefile.am
index c7a4c05..c8133bf 100644
--- a/libcheese/Makefile.am
+++ b/libcheese/Makefile.am
@@ -9,8 +9,7 @@ INCLUDES = \
-DGNOME_DESKTOP_USE_UNSTABLE_API=1 \
$(CHEESE_CFLAGS)
-lib_LTLIBRARIES = libcheese-gtk.la
-noinst_LTLIBRARIES = libcheesecommon.la
+lib_LTLIBRARIES = libcheesecommon.la libcheese-gtk.la
EXTRA_DIST = cheese-gtk.symbols
CLEANFILES =
@@ -37,10 +36,6 @@ libcheesecommon_la_SOURCES = \
cheese-camera-device.h \
cheese-camera-device-monitor.c \
cheese-camera-device-monitor.h \
- cheese-flash.h \
- cheese-flash.c \
- cheese-countdown.c \
- cheese-countdown.h \
cheese-effect.c \
cheese-effect.h \
$(BUILT_SOURCES)
@@ -53,6 +48,10 @@ libcheese_gtk_la_SOURCES = \
cheese-widget.c \
cheese-widget.h \
cheese-widget-private.h \
+ cheese-flash.h \
+ cheese-flash.c \
+ cheese-countdown.c \
+ cheese-countdown.h \
$(NULL)
# FIXME when we have a .pc file, and sonames
diff --git a/libcheese/cheese-gtk.symbols b/libcheese/cheese-gtk.symbols
index 156543f..6d4789b 100644
--- a/libcheese/cheese-gtk.symbols
+++ b/libcheese/cheese-gtk.symbols
@@ -16,3 +16,6 @@ um_crop_area_get_type
cheese_camera_device_monitor_get_type
cheese_camera_device_monitor_new
cheese_camera_device_monitor_coldplug
+cheese_flash_get_type
+cheese_flash_new
+cheese_flash_fire
diff --git a/src/Makefile.am b/src/Makefile.am
index 9a07049..278aba1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,4 +52,5 @@ noinst_HEADERS = \
cheese_LDADD = \
$(top_builddir)/libcheese/libcheesecommon.la \
+ $(top_builddir)/libcheese/libcheese-gtk.la \
$(CHEESE_LIBS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]