[cheese/libcheese: 7/8] Revert "Changing gtk dependent modules to libcheese-gtk"

[Luciana Fujii Pontello <lufujii src gnome org>]

commit a9bf39f327c742a264cea440ccd915fb79e90012
Author: Luciana Fujii Pontello <luciana fujii eti br>
Date:   Mon Jan 31 18:57:40 2011 -0200

    Revert "Changing gtk dependent modules to libcheese-gtk"
    
    This reverts commit a3ef2c5b93a62a9e326b52ce7376c38f6331d387.

 libcheese/Makefile.am        |   11 ++++++-----
 libcheese/cheese-gtk.symbols |    3 ---
 src/Makefile.am              |    1 -
 3 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/libcheese/Makefile.am b/libcheese/Makefile.am
index c8133bf..c7a4c05 100644
--- a/libcheese/Makefile.am
+++ b/libcheese/Makefile.am
@@ -9,7 +9,8 @@ INCLUDES = \
 	-DGNOME_DESKTOP_USE_UNSTABLE_API=1 \
 	$(CHEESE_CFLAGS)
 
-lib_LTLIBRARIES = libcheesecommon.la libcheese-gtk.la
+lib_LTLIBRARIES = libcheese-gtk.la
+noinst_LTLIBRARIES = libcheesecommon.la
 
 EXTRA_DIST = cheese-gtk.symbols
 CLEANFILES =
@@ -36,6 +37,10 @@ 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)
@@ -48,10 +53,6 @@ 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 6d4789b..156543f 100644
--- a/libcheese/cheese-gtk.symbols
+++ b/libcheese/cheese-gtk.symbols
@@ -16,6 +16,3 @@ 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 278aba1..9a07049 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,5 +52,4 @@ noinst_HEADERS = \
 
 cheese_LDADD = \
 	$(top_builddir)/libcheese/libcheesecommon.la \
-	$(top_builddir)/libcheese/libcheese-gtk.la \
 	$(CHEESE_LIBS)