Add libcinaest shared library

Combines the movies, genres and plugin interface classes in a single place.

diff --git a/Makefile.am b/Makefile.am
index bc34bef..5d10f1e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,6 +9,9 @@ SUBDIRS = po
 bin_PROGRAMS = \
         cinaest
 
+lib_LTLIBRARIES = \
+       libcinaest.la
+
 libexec_PROGRAMS = \
        google-poster-downloader \
        imdb-plaintext-downloader
@@ -31,16 +34,12 @@ cinaest_SOURCES = \
         src/main.c \
        src/cell-renderer-vbox.c \
        src/genre-filter-dialog.c \
-       src/genres.c \
-        src/movie.c \
-       src/movie-filter.c \
         src/movie-list-menu.c \
         src/movie-list-store.c \
         src/movie-list-view.c \
         src/movie-list-window.c \
         src/movie-menu.c \
         src/movie-window.c \
-        src/plugin-interface.c \
        src/plugin-registrar.c \
        src/poster/movie-poster-factory.c \
        src/settings-dialog.c \
@@ -53,16 +52,12 @@ cinaest_VALASOURCES = \
         src/main.vala \
        src/cell-renderer-vbox.vala \
        src/genre-filter-dialog.vala \
-       src/genres.vala \
-        src/movie.vala \
-       src/movie-filter.vala \
         src/movie-list-menu.vala \
         src/movie-list-store.vala \
         src/movie-list-view.vala \
         src/movie-list-window.vala \
         src/movie-menu.vala \
         src/movie-window.vala \
-        src/plugin-interface.vala \
        src/plugin-registrar.vala \
        src/poster/movie-poster-factory.vala \
        src/settings-dialog.vala \
@@ -74,36 +69,50 @@ cinaest_VALASOURCES = \
 src/main.c: ${cinaest_VALASOURCES}
        ${VALAC} -C ${cinaest_VALASOURCES} ${cinaest_VALAFLAGS}
 
-cinaest_VALAFLAGS = --vapidir ./vapi --pkg config \
+cinaest_VALAFLAGS = --vapidir ./vapi --pkg config --pkg cinaest \
        --pkg dbus-glib-1 --pkg gconf-2.0 --pkg hildon-1 --pkg libosso --pkg gmodule-2.0
-cinaest_CFLAGS = ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${HILDON_CFLAGS} ${OSSO_CFLAGS} ${GMODULE_CFLAGS} \
+cinaest_CFLAGS = ${CINAEST_CFLAGS} ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${HILDON_CFLAGS} ${OSSO_CFLAGS} ${GMODULE_CFLAGS} \
        -DGETTEXT_PACKAGE=\"@GETTEXT_PACKAGE@\"
-cinaest_LDADD = ${DBUS_LIBS} ${GCONF_LIBS} ${HILDON_LIBS} ${OSSO_LIBS} ${GMODULE_LIBS}
+cinaest_LDADD = ${CINAEST_LIBS} ${DBUS_LIBS} ${GCONF_LIBS} ${HILDON_LIBS} ${OSSO_LIBS} ${GMODULE_LIBS} -lcinaest
+
+libcinaest_la_SOURCES = \
+       src/genres.c \
+        src/movie.c \
+       src/movie-filter.c \
+        src/plugin-interface.c
+
+libcinaest_la_VALASOURCES = \
+       src/genres.vala \
+        src/movie.vala \
+       src/movie-filter.vala \
+        src/plugin-interface.vala
+
+src/genres.c: ${libcinaest_la_VALASOURCES}
+       ${VALAC} -C -H cinaest.h --library cinaest ${libcinaest_la_VALASOURCES} ${libcinaest_la_VALAFLAGS}
+       mv cinaest.vapi ./vapi
+
+libcinaest_la_VALAFLAGS = --vapidir ./vapi --pkg config \
+       --pkg hildon-1 --pkg libosso
+libcinaest_la_CFLAGS = ${HILDON_CFLAGS} ${OSSO_CFLAGS}
+libcinaest_la_LIBADD = ${HILDON_LIBS} ${OSSO_LIBS}
 
 libcatalog_plugin_la_SOURCES = \
        src/plugins/catalog-plugin.c \
        src/cell-renderer-vbox.c \
-       src/genres.c \
-        src/movie.c \
-       src/plugin-interface.c \
        src/plugins/catalog-sqlite.c \
        src/source-list-view.c
 
 libcatalog_plugin_la_VALASOURCES = \
        src/plugins/catalog-plugin.vala \
        src/cell-renderer-vbox.vala \
-       src/genres.vala \
-        src/movie.vala \
-       src/movie-filter.vala \
-       src/plugin-interface.vala \
        src/plugins/catalog-sqlite.vala \
        src/source-list-view.vala
 
-libcatalog_plugin_la_VALAFLAGS = --vapidir ./vapi --pkg config \
+libcatalog_plugin_la_VALAFLAGS = --vapidir ./vapi --pkg config --pkg cinaest \
        --pkg hildon-1 --pkg libosso --pkg sqlite3
-libcatalog_plugin_la_CFLAGS = ${HILDON_CFLAGS} ${OSSO_CFLAGS} ${SQLITE3_CFLAGS} \
+libcatalog_plugin_la_CFLAGS = ${CINAEST_CFLAGS} ${HILDON_CFLAGS} ${OSSO_CFLAGS} ${SQLITE3_CFLAGS} \
        -DGETTEXT_PACKAGE=\"@GETTEXT_PACKAGE@\"
-libcatalog_plugin_la_LIBADD = ${HILDON_LIBS} ${OSSO_LIBS} ${SQLITE3_LIBS}
+libcatalog_plugin_la_LIBADD = ${CINAEST_LIBS} ${HILDON_LIBS} ${OSSO_LIBS} ${SQLITE3_LIBS}
 libcatalog_plugin_la_LDFLAGS = -module
 
 src/plugins/catalog-plugin.c: ${libcatalog_plugin_la_VALASOURCES}
@@ -111,23 +120,16 @@ src/plugins/catalog-plugin.c: ${libcatalog_plugin_la_VALASOURCES}
 
 libgoogle_plugin_la_SOURCES = \
        src/plugins/google-plugin.c \
-       src/genres.c \
-        src/movie.c \
-       src/plugin-interface.c \
        src/plugins/google-parser.c
 
 libgoogle_plugin_la_VALASOURCES = \
        src/plugins/google-plugin.vala \
-       src/genres.vala \
-        src/movie.vala \
-       src/movie-filter.vala \
-       src/plugin-interface.vala \
        src/plugins/google-parser.vala
 
-libgoogle_plugin_la_VALAFLAGS = --vapidir ./vapi --pkg config \
+libgoogle_plugin_la_VALAFLAGS = --vapidir ./vapi --pkg config --pkg cinaest \
        --pkg hildon-1 --pkg libosso
-libgoogle_plugin_la_CFLAGS = ${HILDON_CFLAGS} ${OSSO_CFLAGS}
-libgoogle_plugin_la_LIBADD = ${HILDON_LIBS} ${OSSO_LIBS}
+libgoogle_plugin_la_CFLAGS = ${CINAEST_CFLAGS} ${HILDON_CFLAGS} ${OSSO_CFLAGS}
+libgoogle_plugin_la_LIBADD = ${CINAEST_LIBS} ${HILDON_LIBS} ${OSSO_LIBS}
 libgoogle_plugin_la_LDFLAGS = -module
 
 src/plugins/google-plugin.c: ${libgoogle_plugin_la_VALASOURCES}
@@ -135,26 +137,19 @@ src/plugins/google-plugin.c: ${libgoogle_plugin_la_VALASOURCES}
 
 libimdb_plugin_la_SOURCES = \
         src/plugins/imdb-plugin.c \
-       src/genres.c \
         src/imdb/imdb-sqlite.c \
-        src/movie.c \
-        src/plugin-interface.c \
         src/plugins/imdb-download-dialog.c
 
 libimdb_plugin_la_VALASOURCES = \
         src/plugins/imdb-plugin.vala \
-       src/genres.vala \
         src/imdb/imdb-sqlite.vala \
         src/imdb/plaintext-downloader-interface.vala \
-        src/movie.vala \
-       src/movie-filter.vala \
-        src/plugin-interface.vala \
         src/plugins/imdb-download-dialog.vala
 
-libimdb_plugin_la_VALAFLAGS = --vapidir ./vapi --pkg config \
+libimdb_plugin_la_VALAFLAGS = --vapidir ./vapi --pkg config --pkg cinaest \
        --pkg dbus-glib-1 --pkg hildon-1 --pkg libosso --pkg sqlite3
-libimdb_plugin_la_CFLAGS = ${DBUS_CFLAGS} ${HILDON_CFLAGS} ${OSSO_CFLAGS} ${SQLITE3_CFLAGS}
-libimdb_plugin_la_LIBADD = ${DBUS_LIBS} ${HILDON_LIBS} ${OSSO_LIBS} ${SQLITE3_LIBS}
+libimdb_plugin_la_CFLAGS = ${CINAEST_CFLAGS} ${DBUS_CFLAGS} ${HILDON_CFLAGS} ${OSSO_CFLAGS} ${SQLITE3_CFLAGS}
+libimdb_plugin_la_LIBADD = ${CINAEST_LIBS} ${DBUS_LIBS} ${HILDON_LIBS} ${OSSO_LIBS} ${SQLITE3_LIBS}
 libimdb_plugin_la_LDFLAGS = -module
 
 src/plugins/imdb-plugin.c: ${libimdb_plugin_la_VALASOURCES}
@@ -168,16 +163,14 @@ imdb_plaintext_downloader_SOURCES = \
 
 imdb_plaintext_downloader_VALASOURCES = \
         src/imdb/imdb-plaintext-downloader.vala \
-       src/genres.vala \
         src/imdb/gzip-input-stream.vala \
         src/imdb/imdb-sqlite.vala \
-        src/imdb/plaintext-downloader-interface.vala \
-       src/movie-filter.vala
+        src/imdb/plaintext-downloader-interface.vala
 
-imdb_plaintext_downloader_VALAFLAGS = --vapidir ./vapi \
+imdb_plaintext_downloader_VALAFLAGS = --vapidir ./vapi --pkg cinaest \
         --pkg dbus-glib-1 --pkg gio-2.0 --pkg sqlite3 --pkg zlib -X -lz
-imdb_plaintext_downloader_CFLAGS = ${DBUS_CFLAGS} ${GIO_CFLAGS} ${SQLITE3_CFLAGS}
-imdb_plaintext_downloader_LDADD = ${DBUS_LIBS} ${GIO_LIBS} ${SQLITE3_LIBS} -lz
+imdb_plaintext_downloader_CFLAGS = ${CINAEST_CFLAGS} ${DBUS_CFLAGS} ${GIO_CFLAGS} ${SQLITE3_CFLAGS}
+imdb_plaintext_downloader_LDADD = ${CINAEST_LIBS} ${DBUS_LIBS} ${GIO_LIBS} ${SQLITE3_LIBS} -lz
 
 src/imdb/imdb-plaintext-downloader.c: ${imdb_plaintext_downloader_VALASOURCES}
        ${VALAC} -C ${imdb_plaintext_downloader_VALASOURCES} ${imdb_plaintext_downloader_VALAFLAGS}

diff --git a/cinaest.pc.in b/cinaest.pc.in
new file mode 100644 (file)
index 0000000..3eba52a
--- /dev/null
+++ b/cinaest.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: @PACKAGE@
+Description: Cinaest common classes and plugin interface library
+Requires: gtk+-2.0 libosso
+Version: @VERSION@
+Libs: -L${libdir} -lcinaest
+Cflags: -I${includedir}

diff --git a/configure.ac b/configure.ac
index 05bb20e..1d7eb29 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -16,6 +16,13 @@ AC_PROG_LIBTOOL
 
 CFLAGS="$CFLAGS -Wall -ansi -Wmissing-prototypes -Wmissing-declarations"
 
+AC_OUTPUT(cinaest.pc)
+PKG_CONFIG_PATH=$PKG_CONFIG_PATH:.
+
+PKG_CHECK_MODULES(CINAEST, cinaest)
+AC_SUBST(CINAEST_LIBS)
+AC_SUBST(CINAEST_CFLAGS)
+
 PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= 2.20.3)
 AC_SUBST(GMODULE_LIBS)
 AC_SUBST(GMODULE_CFLAGS)

diff --git a/vapi/cinaest.deps b/vapi/cinaest.deps
new file mode 100644 (file)
index 0000000..5e48039
--- /dev/null
+++ b/vapi/cinaest.deps
@@ -0,0 +1,2 @@
+gtk+-2.0
+libosso