X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=Makefile.am;h=10f149ff29f299035f284c3695b0a26a319a17d1;hb=38bb5376d14ee12fd7b3a38231148634749fb88f;hp=1c6e11c671f6a7a3fc27a9ad60f46756f4153359;hpb=c1a6327f0b8edef6b9eff0bd4d00aaebcee050aa;p=cinaest

diff --git a/Makefile.am b/Makefile.am
index 1c6e11c..10f149f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -86,12 +86,14 @@ src/main.c: ${cinaest_VALASOURCES}
 	${VALAC} -C ${cinaest_VALASOURCES} ${cinaest_VALAFLAGS}
 
 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} \
+	--pkg dbus-glib-1 --pkg gconf-2.0 --pkg hildon-1 --pkg hildon-fm-2 \
+	--pkg libosso --pkg gmodule-2.0 --pkg gobject-2.0-fix
+cinaest_CFLAGS = ${CINAEST_CFLAGS} ${DBUS_CFLAGS} ${GCONF_CFLAGS} \
+	${HILDON_CFLAGS} ${HILDONFM_CFLAGS} \
 	${MAEMO_LAUNCHER_CFLAGS} ${OSSO_CFLAGS} ${GMODULE_CFLAGS} \
 	-DGETTEXT_PACKAGE=\"@GETTEXT_PACKAGE@\"
 cinaest_LDADD = ${CINAEST_LIBS} ${DBUS_LIBS} ${GCONF_LIBS} ${HILDON_LIBS} \
+	${HILDONFM_LIBS} \
 	${MAEMO_LAUNCHER_LIBS} ${OSSO_LIBS} ${GMODULE_LIBS} -lcinaest
 
 libcinaest_la_SOURCES = \
@@ -206,16 +208,18 @@ src/plugins/moviepilot-plugin.c: ${libmoviepilot_plugin_la_VALASOURCES}
 
 cinaest_google_backend_SOURCES = \
 	src/backends/google/google-backend.c \
+	src/backends/google/curl-wrapper.c \
 	src/backends/google/google-parser.c
 
 cinaest_google_backend_VALASOURCES = \
 	src/backends/google/google-backend.vala \
+	src/backends/google/curl-wrapper.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 --pkg libxml-2.0
-cinaest_google_backend_CFLAGS = ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${GEE_CFLAGS} ${GIO_CFLAGS} ${XML_CFLAGS}
-cinaest_google_backend_LDADD = ${DBUS_LIBS} ${GCONF_LIBS} ${GEE_LIBS} ${GIO_LIBS} ${XML_LIBS}
+cinaest_google_backend_VALAFLAGS = --thread --vapidir ./vapi --pkg dbus-glib-1 \
+	--pkg gconf-2.0 --pkg gee-1.0 --pkg gio-2.0 --pkg libcurl --pkg libxml-2.0
+cinaest_google_backend_CFLAGS = ${CURL_CFLAGS} ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${GEE_CFLAGS} ${GIO_CFLAGS} ${GTHREAD_CFLAGS} ${XML_CFLAGS}
+cinaest_google_backend_LDADD = ${CURL_LIBS} ${DBUS_LIBS} ${GCONF_LIBS} ${GEE_LIBS} ${GIO_LIBS} ${GTHREAD_LIBS} ${XML_LIBS}
 
 src/backends/google/google-backend.c: ${cinaest_google_backend_VALASOURCES}
 	${VALAC} -C ${cinaest_google_backend_VALASOURCES} ${cinaest_google_backend_VALAFLAGS}