[cheese/origin/libcheese-adelaney: 2/2] * Factored some backend logic into libcheese

[Aidan Delaney <adelaney src gnome org>]

commit a74818e04681e9241d02ffec2daf58ed0c61fa8e
Author: Aidan Delaney <a j delaney brighton ac uk>
Date:   Sat Oct 24 18:43:14 2009 +0100

    * Factored some backend logic into libcheese
      - Frontend successfully builds against libcheese

 Makefile.am                         |    2 +-
 configure.ac                        |    1 +
 libcheese/Makefile.am               |   22 ++++++++++++++++++++++
 {src => libcheese}/cheese-gconf.c   |    0
 {src => libcheese}/cheese-gconf.h   |    0
 {src => libcheese}/cheese-webcam.c  |    0
 {src => libcheese}/cheese-webcam.h  |    0
 {src => libcheese}/eog-thumbnail.c  |    0
 {src => libcheese}/eog-thumbnail.h  |    0
 {src => libcheese}/gst-audio-play.c |    0
 {src => libcheese}/gst-audio-play.h |    0
 src/Makefile.am                     |   16 ++++++----------
 12 files changed, 30 insertions(+), 11 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 3a3f9ee..b5b9889 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src po data help
+SUBDIRS = libcheese src po data help
 
 EXTRA_DIST =			\
 	$(cheesedoc_DATA)	\
diff --git a/configure.ac b/configure.ac
index c91af8f..b68f882 100644
--- a/configure.ac
+++ b/configure.ac
@@ -150,6 +150,7 @@ data/icons/scalable/actions/Makefile
 data/pixmaps/Makefile
 data/sounds/Makefile
 help/Makefile
+libcheese/Makefile
 src/Makefile
 po/Makefile.in
 ])
diff --git a/libcheese/Makefile.am b/libcheese/Makefile.am
new file mode 100644
index 0000000..bd179c5
--- /dev/null
+++ b/libcheese/Makefile.am
@@ -0,0 +1,22 @@
+lib_LTLIBRARIES = libcheese.la
+libcheese_la_SOURCES = 	cheese-gconf.c \
+	cheese-webcam.c \
+	eog-thumbnail.c \
+	gst-audio-play.c
+libcheese_la_CFLAGS = -DDATADIR=\"$(datadir)\"	\
+	-DPREFIX=\""$(prefix)"\" 			\
+	-DSYSCONFDIR=\""$(sysconfdir)"\" 		\
+	-DLIBDIR=\""$(libdir)"\" 			\
+	-DPACKAGE_DATADIR=\""$(datadir)/cheese"\"	\
+	-DPACKAGE_LOCALEDIR=\""$(datadir)/locale"\"	\
+	-DAPPNAME_DATA_DIR=\"$(pkgdatadir)\"		\
+	-DGNOME_DESKTOP_USE_UNSTABLE_API=1		\
+	$(CHEESE_CFLAGS)
+include_HEADERS = 
+	cheese-gconf.h \
+	cheese-webcam.h \
+	eog-thumbnail.h \
+	gst-audio-play.h 
+
+# We don't want to install these headers
+noinst_HEADERS = eog-thumbnail.h gst-audio-play.h
diff --git a/src/cheese-gconf.c b/libcheese/cheese-gconf.c
similarity index 100%
rename from src/cheese-gconf.c
rename to libcheese/cheese-gconf.c
diff --git a/src/cheese-gconf.h b/libcheese/cheese-gconf.h
similarity index 100%
rename from src/cheese-gconf.h
rename to libcheese/cheese-gconf.h
diff --git a/src/cheese-webcam.c b/libcheese/cheese-webcam.c
similarity index 100%
rename from src/cheese-webcam.c
rename to libcheese/cheese-webcam.c
diff --git a/src/cheese-webcam.h b/libcheese/cheese-webcam.h
similarity index 100%
rename from src/cheese-webcam.h
rename to libcheese/cheese-webcam.h
diff --git a/src/eog-thumbnail.c b/libcheese/eog-thumbnail.c
similarity index 100%
rename from src/eog-thumbnail.c
rename to libcheese/eog-thumbnail.c
diff --git a/src/eog-thumbnail.h b/libcheese/eog-thumbnail.h
similarity index 100%
rename from src/eog-thumbnail.h
rename to libcheese/eog-thumbnail.h
diff --git a/src/gst-audio-play.c b/libcheese/gst-audio-play.c
similarity index 100%
rename from src/gst-audio-play.c
rename to libcheese/gst-audio-play.c
diff --git a/src/gst-audio-play.h b/libcheese/gst-audio-play.h
similarity index 100%
rename from src/gst-audio-play.h
rename to libcheese/gst-audio-play.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 21cb8a9..1732d23 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,8 @@ INCLUDES = 						\
 	-DPACKAGE_LOCALEDIR=\""$(datadir)/locale"\"	\
 	-DAPPNAME_DATA_DIR=\"$(pkgdatadir)\"		\
 	-DGNOME_DESKTOP_USE_UNSTABLE_API=1		\
-	$(CHEESE_CFLAGS)
+	$(CHEESE_CFLAGS)				\
+	-I top_srcdir@/libcheese
 
 bin_PROGRAMS = cheese
 
@@ -22,22 +23,14 @@ cheese_SOURCES = \
 	cheese-effect-chooser.h \
 	cheese-fileutil.c \
 	cheese-fileutil.h \
-	cheese-gconf.c \
-	cheese-gconf.h \
 	cheese-thumb-view.c \
 	cheese-thumb-view.h \
-	cheese-webcam.c \
-	cheese-webcam.h \
 	cheese-window.c \
 	cheese-window.h \
-	eog-thumbnail.c \
-	eog-thumbnail.h \
 	eog-thumb-nav.c \
 	eog-thumb-nav.h \
 	ephy-spinner.c \
 	ephy-spinner.h \
-	gst-audio-play.c \
-	gst-audio-play.h \
 	cheese-no-camera.c \
 	cheese-no-camera.h \
 	cheese-prefs-widget.h \
@@ -56,7 +49,10 @@ cheese_SOURCES = \
 	cheese-prefs-webcam-combo.h \
 	cheese-prefs-burst-spinbox.h \
 	cheese-prefs-burst-spinbox.c
-	
+
+cheese_LDFLAGS = \
+	-L top_srcdir@/libcheese -lcheese
+
 cheese_LDADD = \
 	$(CHEESE_LIBS)