Creating libcheese, instalable non-gtk lib

Cheese-flash is now part of libcheese-gtk, since it depends on gtk and
we want libcheese to not depend on it. Libcheesecommon is now called
simply Libcheese and it's installed, it's the main cheese lib which can
be used to set the pipeline, take_photos and record video.
parent 5db96371
......@@ -79,7 +79,7 @@ expand_content_files=
# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(CHEESE_CFLAGS)
GTKDOC_LIBS=\
$(top_builddir)/libcheese/libcheesecommon.la \
$(top_builddir)/libcheese/libcheese.la \
$(top_builddir)/libcheese/libcheese-gtk.la
# This includes the standard gtk-doc make rules, copied by gtkdocize.
......
......@@ -9,8 +9,7 @@ INCLUDES = \
-DGNOME_DESKTOP_USE_UNSTABLE_API=1 \
$(CHEESE_CFLAGS)
lib_LTLIBRARIES = libcheese-gtk.la
noinst_LTLIBRARIES = libcheesecommon.la
lib_LTLIBRARIES = libcheese.la libcheese-gtk.la
EXTRA_DIST = cheese-gtk.symbols
CLEANFILES =
......@@ -28,7 +27,7 @@ include $(top_srcdir)/Makefile.am.enums
libcheese_gtk_la_CFLAGS = $(CHEESE_CFLAGS)
libcheesecommon_la_SOURCES = \
libcheese_la_SOURCES = \
cheese-fileutil.c \
cheese-fileutil.h \
cheese-camera.c \
......@@ -37,8 +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-effect.c \
cheese-effect.h \
$(BUILT_SOURCES)
......@@ -51,14 +48,16 @@ libcheese_gtk_la_SOURCES = \
cheese-widget.c \
cheese-widget.h \
cheese-widget-private.h \
cheese-flash.h \
cheese-flash.c \
$(NULL)
# FIXME when we have a .pc file, and sonames
cheesedir = $(includedir)/cheese
cheese_HEADERS = cheese-widget.h cheese-avatar-chooser.h cheese-camera-device-monitor.h
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_gtk_la_LIBADD = \
libcheesecommon.la \
libcheese.la \
$(CHEESE_LIBS)
libcheese_gtk_la_LDFLAGS = \
-version-info $(CHEESE_LT_VERSION) \
......
......@@ -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
......@@ -51,5 +51,6 @@ noinst_HEADERS = \
thumbview/eog-thumb-nav.h
cheese_LDADD = \
$(top_builddir)/libcheese/libcheesecommon.la \
$(top_builddir)/libcheese/libcheese.la \
$(top_builddir)/libcheese/libcheese-gtk.la \
$(CHEESE_LIBS)
......@@ -25,16 +25,16 @@ cheese_test_monitor_SOURCES = cheese-test-monitor.c
test_webcam_button_SOURCES = test-webcam-button.c
cheese_test_widget_LDADD = $(CHEESE_LIBS) \
$(top_builddir)/libcheese/libcheesecommon.la \
$(top_builddir)/libcheese/libcheese.la \
$(top_builddir)/libcheese/libcheese-gtk.la \
$(NULL)
cheese_test_monitor_LDADD = $(CHEESE_LIBS) \
$(top_builddir)/libcheese/libcheesecommon.la \
$(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) \
$(top_builddir)/libcheese/libcheesecommon.la \
$(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