X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=Makefile.am;h=5cc486a3b48ef251142dc5434291a2d560a76aaa;hb=f0066110b1428e09ff1c61c61ff7032c9daf14b2;hp=42b9d745ee4c4f788f2ca3429c36baad84835d40;hpb=98b81ad1b2a281dd1a6ceb7b8bdae2552268bd42;p=cinaest

diff --git a/Makefile.am b/Makefile.am
index 42b9d74..5cc486a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,16 +14,21 @@ lib_LTLIBRARIES = \
 
 libexec_PROGRAMS = \
 	google-poster-downloader \
-	imdb-plaintext-downloader
+	imdb-plaintext-downloader \
+	cinaest-google-backend \
+	cinaest-moviepilot-backend
 
 pkglib_LTLIBRARIES = \
 	libcatalog-plugin.la \
 	libgoogle-plugin.la \
-	libimdb-plugin.la
+	libimdb-plugin.la \
+	libmoviepilot-plugin.la
 
 dbusservice_DATA = \
 	data/org.maemo.cinaest.service \
 	data/org.maemo.cinaest.IMDb.service \
+	data/org.maemo.cinaest.GoogleShowtimes.service \
+	data/org.maemo.cinaest.MoviePilot.service \
 	data/org.maemo.movieposter.GoogleImages.service
 
 desktopentry_DATA = \
@@ -41,7 +46,6 @@ pkgconfig_DATA = cinaest.pc
 # Sources
 cinaest_SOURCES = \
         src/main.c \
-	src/cell-renderer-vbox.c \
 	src/genre-filter-dialog.c \
         src/movie-list-menu.c \
         src/movie-list-store.c \
@@ -49,17 +53,16 @@ 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 \
 	src/source-dialog.c \
 	src/source-list-menu.c \
-	src/source-list-view.c \
 	src/source-list-window.c
 
 cinaest_VALASOURCES = \
         src/main.vala \
-	src/cell-renderer-vbox.vala \
 	src/genre-filter-dialog.vala \
         src/movie-list-menu.vala \
         src/movie-list-store.vala \
@@ -67,62 +70,68 @@ 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 \
 	src/source-dialog.vala \
 	src/source-list-menu.vala \
-	src/source-list-view.vala \
 	src/source-list-window.vala
 
 src/main.c: ${cinaest_VALASOURCES}
 	${VALAC} -C ${cinaest_VALASOURCES} ${cinaest_VALAFLAGS}
 
-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 = ${CINAEST_CFLAGS} ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${HILDON_CFLAGS} ${OSSO_CFLAGS} ${GMODULE_CFLAGS} \
+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 \
+	--pkg gobject-2.0-fix
+cinaest_CFLAGS = ${CINAEST_CFLAGS} ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${HILDON_CFLAGS} \
+	${MAEMO_LAUNCHER_CFLAGS} ${OSSO_CFLAGS} ${GMODULE_CFLAGS} \
 	-DGETTEXT_PACKAGE=\"@GETTEXT_PACKAGE@\"
-cinaest_LDADD = ${CINAEST_LIBS} ${DBUS_LIBS} ${GCONF_LIBS} ${HILDON_LIBS} ${OSSO_LIBS} ${GMODULE_LIBS} -lcinaest
+cinaest_LDADD = ${CINAEST_LIBS} ${DBUS_LIBS} ${GCONF_LIBS} ${HILDON_LIBS} \
+	${MAEMO_LAUNCHER_LIBS} ${OSSO_LIBS} ${GMODULE_LIBS} -lcinaest
 
 libcinaest_la_SOURCES = \
+	src/cell-renderer-vbox.c \
 	src/genres.c \
         src/movie.c \
 	src/movie-filter.c \
-        src/plugin-interface.c
+        src/plugin-interface.c \
+	src/rating-widget.c \
+	src/source-list-view.c
 
 libcinaest_la_VALASOURCES = \
+	src/cell-renderer-vbox.vala \
 	src/genres.vala \
         src/movie.vala \
 	src/movie-filter.vala \
-        src/plugin-interface.vala
+        src/plugin-interface.vala \
+	src/rating-widget.vala \
+	src/source-list-view.vala
 
-src/genres.c: ${libcinaest_la_VALASOURCES}
+src/cell-renderer-vbox.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_CFLAGS = ${HILDON_CFLAGS} ${OSSO_CFLAGS} \
+	-DGETTEXT_PACKAGE=\"@GETTEXT_PACKAGE@\"
 libcinaest_la_LIBADD = ${HILDON_LIBS} ${OSSO_LIBS}
 
 libcatalog_plugin_la_SOURCES = \
 	src/plugins/catalog-plugin.c \
-	src/cell-renderer-vbox.c \
-	src/plugins/catalog-sqlite.c \
-	src/source-list-view.c
+	src/plugins/catalog-sqlite.c
 
 libcatalog_plugin_la_VALASOURCES = \
 	src/plugins/catalog-plugin.vala \
-	src/cell-renderer-vbox.vala \
-	src/plugins/catalog-sqlite.vala \
-	src/source-list-view.vala
+	src/plugins/catalog-sqlite.vala
 
 libcatalog_plugin_la_VALAFLAGS = --vapidir ./vapi --pkg config --pkg cinaest \
 	--pkg hildon-1 --pkg libosso --pkg sqlite3
 libcatalog_plugin_la_CFLAGS = ${CINAEST_CFLAGS} ${HILDON_CFLAGS} ${OSSO_CFLAGS} ${SQLITE3_CFLAGS} \
 	-DGETTEXT_PACKAGE=\"@GETTEXT_PACKAGE@\"
 libcatalog_plugin_la_LIBADD = ${CINAEST_LIBS} ${HILDON_LIBS} ${OSSO_LIBS} ${SQLITE3_LIBS}
-libcatalog_plugin_la_LDFLAGS = -module
+libcatalog_plugin_la_LDFLAGS = -module -avoid-version
 
 src/plugins/catalog-plugin.c: ${libcatalog_plugin_la_VALASOURCES}
 	${VALAC} -C ${libcatalog_plugin_la_VALASOURCES} ${libcatalog_plugin_la_VALAFLAGS}
@@ -130,20 +139,19 @@ 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
+	src/plugins/calendar-backend.c
 
 libgoogle_plugin_la_VALASOURCES = \
 	src/plugins/google-plugin.vala \
-	src/plugins/calendar-backend.vala \
-	src/plugins/google-parser.vala
+	src/plugins/calendar-backend.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}
+	--pkg dbus-glib-1 --pkg hildon-1 --pkg gconf-2.0 --pkg json-glib-1.0 \
+	--pkg libhildonmime --pkg libosso
+libgoogle_plugin_la_CFLAGS = ${CINAEST_CFLAGS} ${GCONF_CFLAGS} ${HILDON_CFLAGS} ${HILDONMIME_CFLAGS} ${JSON_CFLAGS} ${OSSO_CFLAGS}
 libgoogle_plugin_la_CPPFLAGS = ${CALENDAR_CFLAGS}
-libgoogle_plugin_la_LIBADD = ${CALENDAR_LIBS} ${CINAEST_LIBS} ${HILDON_LIBS} ${OSSO_LIBS}
-libgoogle_plugin_la_LDFLAGS = -module
+libgoogle_plugin_la_LIBADD = ${CALENDAR_LIBS} ${CINAEST_LIBS} ${GCONF_LIBS} ${HILDON_LIBS} ${HILDONMIME_LIBS} ${JSON_LIBS} ${OSSO_LIBS}
+libgoogle_plugin_la_LDFLAGS = -module -avoid-version
 
 src/plugins/google-plugin.c: ${libgoogle_plugin_la_VALASOURCES}
 	${VALAC} -C ${libgoogle_plugin_la_VALASOURCES} ${libgoogle_plugin_la_VALAFLAGS}
@@ -156,28 +164,83 @@ libimdb_plugin_la_SOURCES = \
 libimdb_plugin_la_VALASOURCES = \
         src/plugins/imdb-plugin.vala \
         src/imdb/imdb-sqlite.vala \
-        src/imdb/plaintext-downloader-interface.vala \
         src/plugins/imdb-download-dialog.vala
 
 libimdb_plugin_la_VALAFLAGS = --vapidir ./vapi --pkg config --pkg cinaest \
-	--pkg dbus-glib-1 --pkg hildon-1 --pkg libosso --pkg sqlite3
+	--pkg dbus-glib-1 --pkg hildon-1 --pkg libosso --pkg sqlite3 \
+	--pkg plaintext-downloader-interface
 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
+libimdb_plugin_la_LDFLAGS = -module -avoid-version
 
-src/plugins/imdb-plugin.c: ${libimdb_plugin_la_VALASOURCES}
+src/plugins/imdb-plugin.c: ${libimdb_plugin_la_VALASOURCES} vapi/plaintext-downloader-interface.vapi
 	${VALAC} -C ${libimdb_plugin_la_VALASOURCES} ${libimdb_plugin_la_VALAFLAGS}
 
+# The sed invocation works around a valac bug
+vapi/plaintext-downloader-interface.vapi:
+	${VALAC} --pkg dbus-glib-1 -C -H plaintext-downloader-interface.h --library plaintext-downloader-interface src/imdb/plaintext-downloader-interface.vala
+	sed -i 's/signals = )/signals = ("progress", "description_changed"))/' plaintext-downloader-interface.vapi
+	mv plaintext-downloader-interface.vapi vapi
+
+libmoviepilot_plugin_la_SOURCES = \
+	src/plugins/moviepilot-plugin.c
+
+libmoviepilot_plugin_la_VALASOURCES = \
+	src/plugins/moviepilot-plugin.vala
+
+libmoviepilot_plugin_la_VALAFLAGS = --vapidir ./vapi --pkg config --pkg cinaest \
+	--pkg dbus-glib-1 --pkg hildon-1 --pkg json-glib-1.0 --pkg libosso
+libmoviepilot_plugin_la_CFLAGS = ${CINAEST_CFLAGS} ${HILDON_CFLAGS} ${JSON_CFLAGS} ${OSSO_CFLAGS}
+libmoviepilot_plugin_la_LIBADD = ${CINAEST_LIBS} ${HILDON_LIBS} ${JSON_LIBS} ${OSSO_LIBS}
+libmoviepilot_plugin_la_LDFLAGS = -module -avoid-version
+
+src/plugins/moviepilot-plugin.c: ${libmoviepilot_plugin_la_VALASOURCES}
+	${VALAC} -C $^ ${libmoviepilot_plugin_la_VALAFLAGS}
+
+cinaest_google_backend_SOURCES = \
+	src/backends/google/google-backend.c \
+	src/backends/google/google-parser.c
+
+cinaest_google_backend_VALASOURCES = \
+	src/backends/google/google-backend.vala \
+	src/backends/google/google-parser.vala
+
+cinaest_google_backend_VALAFLAGS = --vapidir ./vapi --pkg dbus-glib-1 \
+	--pkg gconf-2.0 --pkg gee-1.0 --pkg gio-2.0
+cinaest_google_backend_CFLAGS = ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${GEE_CFLAGS} ${GIO_CFLAGS}
+cinaest_google_backend_LDADD = ${DBUS_LIBS} ${GCONF_LIBS} ${GEE_LIBS} ${GIO_LIBS}
+
+src/backends/google/google-backend.c: ${cinaest_google_backend_VALASOURCES}
+	${VALAC} -C ${cinaest_google_backend_VALASOURCES} ${cinaest_google_backend_VALAFLAGS}
+
+cinaest_moviepilot_backend_SOURCES = \
+	src/backends/moviepilot/moviepilot-backend.c
+
+cinaest_moviepilot_backend_VALASOURCES = \
+	src/backends/moviepilot/moviepilot-backend.vala
+
+cinaest_moviepilot_backend_VALAFLAGS = --thread --vapidir ./vapi --pkg dbus-glib-1 \
+	--pkg gee-1.0 --pkg gio-2.0 --pkg json-glib-1.0 --pkg rest-0.6
+cinaest_moviepilot_backend_CFLAGS = ${DBUS_CFLAGS} ${GEE_CFLAGS} ${GIO_CFLAGS} ${JSON_CFLAGS} ${REST_CFLAGS}
+cinaest_moviepilot_backend_LDADD = ${DBUS_LIBS} ${GEE_LIBS} ${GIO_LIBS} ${JSON_LIBS} ${REST_LIBS}
+
+src/backends/moviepilot/moviepilot-backend.c: ${cinaest_moviepilot_backend_VALASOURCES}
+	${VALAC} -C $^ ${cinaest_moviepilot_backend_VALAFLAGS}
+
 imdb_plaintext_downloader_SOURCES = \
         src/imdb/imdb-plaintext-downloader.c \
-	src/imdb/imdb-ftp-downloader.c \
+	src/imdb/ftp-downloader.c \
+	src/imdb/gzip-input-stream.c \
+	src/imdb/imdb-gzip-parser.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/imdb-ftp-downloader.vala \
+	src/imdb/ftp-downloader.vala \
+	src/imdb/gzip-input-stream.vala \
+	src/imdb/imdb-gzip-parser.vala \
 	src/imdb/imdb-line-parser.vala \
         src/imdb/imdb-sqlite.vala \
         src/imdb/plaintext-downloader-interface.vala
@@ -212,8 +275,16 @@ ACLOCAL_AMFLAGS = -Im4
 
 CLEANFILES = \
 	${cinaest_SOURCES} \
+	${libcinaest_la_SOURCES} \
 	${libcatalog_plugin_la_SOURCES} \
 	$(patsubst %.vala,%.c,${libgoogle_plugin_la_VALASOURCES}) \
 	${libimdb_plugin_la_SOURCES} \
+	${libmoviepilot_plugin_la_SOURCES} \
 	${imdb_plaintext_downloader_SOURCES} \
-	${google_poster_downloader_SOURCES}
+	${google_poster_downloader_SOURCES} \
+	${cinaest_google_backend_SOURCES} \
+	${cinaest_moviepilot_backend_SOURCES} \
+	plaintext-downloader-interface.h \
+	cinaest.h \
+	vapi/plaintext-downloader-interface.vapi \
+	vapi/cinaest.vapi