Debian packaging: make cinaest depend on the same version of libcinaest

[cinaest] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index cae5825..a04337b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,6 +49,7 @@ cinaest_SOURCES = \
         src/movie-list-window.c \
         src/movie-menu.c \
         src/movie-window.c \
+       src/orientation.c \
        src/plugin-registrar.c \
        src/poster/movie-poster-factory.c \
        src/settings-dialog.c \
@@ -67,6 +68,7 @@ cinaest_VALASOURCES = \
         src/movie-list-window.vala \
         src/movie-menu.vala \
         src/movie-window.vala \
+       src/orientation.vala \
        src/plugin-registrar.vala \
        src/poster/movie-poster-factory.vala \
        src/settings-dialog.vala \
@@ -78,7 +80,7 @@ cinaest_VALASOURCES = \
 src/main.c: ${cinaest_VALASOURCES}
        ${VALAC} -C ${cinaest_VALASOURCES} ${cinaest_VALAFLAGS}
 
-cinaest_VALAFLAGS = --vapidir ./vapi --pkg config --pkg cinaest \
+cinaest_VALAFLAGS = --disable-dbus-transformation --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 = ${CINAEST_CFLAGS} ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${HILDON_CFLAGS} ${OSSO_CFLAGS} ${GMODULE_CFLAGS} \
        -DGETTEXT_PACKAGE=\"@GETTEXT_PACKAGE@\"
@@ -129,16 +131,20 @@ src/plugins/catalog-plugin.c: ${libcatalog_plugin_la_VALASOURCES}
 
 libgoogle_plugin_la_SOURCES = \
        src/plugins/google-plugin.c \
+       src/plugins/calendar-backend-adapter.cc \
+       src/plugins/calendar-backend.c \
        src/plugins/google-parser.c
 
 libgoogle_plugin_la_VALASOURCES = \
        src/plugins/google-plugin.vala \
+       src/plugins/calendar-backend.vala \
        src/plugins/google-parser.vala
 
 libgoogle_plugin_la_VALAFLAGS = --vapidir ./vapi --pkg config --pkg cinaest \
-       --pkg hildon-1 --pkg libosso
-libgoogle_plugin_la_CFLAGS = ${CINAEST_CFLAGS} ${HILDON_CFLAGS} ${OSSO_CFLAGS}
-libgoogle_plugin_la_LIBADD = ${CINAEST_LIBS} ${HILDON_LIBS} ${OSSO_LIBS}
+       --pkg hildon-1 --pkg libhildonmime --pkg libosso
+libgoogle_plugin_la_CFLAGS = ${CINAEST_CFLAGS} ${HILDON_CFLAGS} ${HILDONMIME_CFLAGS} ${OSSO_CFLAGS}
+libgoogle_plugin_la_CPPFLAGS = ${CALENDAR_CFLAGS}
+libgoogle_plugin_la_LIBADD = ${CALENDAR_LIBS} ${CINAEST_LIBS} ${HILDON_LIBS} ${HILDONMIME_LIBS} ${OSSO_LIBS}
 libgoogle_plugin_la_LDFLAGS = -module
 
 src/plugins/google-plugin.c: ${libgoogle_plugin_la_VALASOURCES}
@@ -166,20 +172,22 @@ src/plugins/imdb-plugin.c: ${libimdb_plugin_la_VALASOURCES}
 
 imdb_plaintext_downloader_SOURCES = \
         src/imdb/imdb-plaintext-downloader.c \
-        src/imdb/gzip-input-stream.c \
+       src/imdb/imdb-ftp-downloader.c \
+       src/imdb/imdb-line-parser.c \
         src/imdb/imdb-sqlite.c \
         src/imdb/plaintext-downloader-interface.c
 
 imdb_plaintext_downloader_VALASOURCES = \
         src/imdb/imdb-plaintext-downloader.vala \
-        src/imdb/gzip-input-stream.vala \
+       src/imdb/imdb-ftp-downloader.vala \
+       src/imdb/imdb-line-parser.vala \
         src/imdb/imdb-sqlite.vala \
         src/imdb/plaintext-downloader-interface.vala
 
-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 = ${CINAEST_CFLAGS} ${DBUS_CFLAGS} ${GIO_CFLAGS} ${SQLITE3_CFLAGS}
-imdb_plaintext_downloader_LDADD = ${CINAEST_LIBS} ${DBUS_LIBS} ${GIO_LIBS} ${SQLITE3_LIBS} -lz
+imdb_plaintext_downloader_VALAFLAGS = --thread --vapidir ./vapi --pkg cinaest \
+        --pkg dbus-glib-1 --pkg gio-2.0 --pkg libcurl --pkg sqlite3 --pkg zlib -X -lz
+imdb_plaintext_downloader_CFLAGS = ${CINAEST_CFLAGS} ${CURL_CFLAGS} ${DBUS_CFLAGS} ${GIO_CFLAGS} ${SQLITE3_CFLAGS}
+imdb_plaintext_downloader_LDADD = ${CINAEST_LIBS} ${CURL_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}
@@ -207,7 +215,7 @@ ACLOCAL_AMFLAGS = -Im4
 CLEANFILES = \
        ${cinaest_SOURCES} \
        ${libcatalog_plugin_la_SOURCES} \
-       ${libgoogle_plugin_la_SOURCES} \
+       $(patsubst %.vala,%.c,${libgoogle_plugin_la_VALASOURCES}) \
        ${libimdb_plugin_la_SOURCES} \
        ${imdb_plaintext_downloader_SOURCES} \
        ${google_poster_downloader_SOURCES}