X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=Makefile.am;h=4f60bc987868c850ad74dbdfce1ebfe01a2bb11c;hb=2f3a03bf739b66c1c7219c264f658777ae17b92d;hp=bc361b02bda941dec39b56bf59a0933003f93279;hpb=5de50390257b07bed7c802816c413f691475316c;p=beifahrer

diff --git a/Makefile.am b/Makefile.am
index bc361b0..4f60bc9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,6 +30,7 @@ icon64_DATA = \
 beifahrer_SOURCES = \
 	src/beifahrer.c \
 	src/adac-mitfahrclub.c \
+	src/city-button.c \
 	src/orientation.c \
 	src/query-window.c \
 	src/lift-list-window.c \
@@ -39,6 +40,7 @@ beifahrer_SOURCES = \
 beifahrer_VALASOURCES = \
 	src/beifahrer.vala \
 	src/adac-mitfahrclub.vala \
+	src/city-button.vala \
 	src/orientation.vala \
 	src/query-window.vala \
 	src/lift-list-window.vala \
@@ -48,18 +50,17 @@ beifahrer_VALASOURCES = \
 src/beifahrer.c: ${beifahrer_VALASOURCES}
 	${VALAC} -C ${beifahrer_VALASOURCES} ${beifahrer_VALAFLAGS}
 
-beifahrer_VALAFLAGS = --disable-dbus-transformation --vapidir ./vapi \
+beifahrer_VALAFLAGS = --disable-dbus-transformation --thread --vapidir ./vapi \
 	--pkg config \
-        --pkg libcurl \
         --pkg libxml-2.0 \
         --pkg hildon-1 \
         --pkg libosso \
         --pkg dbus-glib-1 \
         --pkg libosso-abook-1.0 \
         --pkg libhildonmime \
-        --pkg liblocation
+        --pkg liblocation \
+	--pkg libcurl
 beifahrer_CFLAGS = -DGETTEXT_PACKAGE=\"@GETTEXT_PACKAGE@\" \
-	${CURL_CFLAGS} \
 	${DBUS_CFLAGS} \
 	${GCONF_CFLAGS} \
 	${HILDON_CFLAGS} \
@@ -67,9 +68,9 @@ beifahrer_CFLAGS = -DGETTEXT_PACKAGE=\"@GETTEXT_PACKAGE@\" \
 	${MAEMO_LAUNCHER_CFLAGS} \
 	${OSSO_CFLAGS} \
 	${ABOOK_CFLAGS} \
+	${CURL_CFLAGS}
 	${XML_CFLAGS}
 beifahrer_LDADD = \
-	${CURL_LIBS} \
 	${DBUS_LIBS} \
 	${GCONF_LIBS} \
 	${HILDON_LIBS} \
@@ -77,6 +78,7 @@ beifahrer_LDADD = \
 	${MAEMO_LAUNCHER_LIBS} \
 	${OSSO_LIBS} \
 	${ABOOK_LIBS} \
+	${CURL_LIBS} \
 	${XML_LIBS}
 
 beifahrer_cli_VALASOURCES = src/beifahrer-cli.vala src/adac-mitfahrclub.vala
@@ -86,18 +88,19 @@ beifahrer_cli_SOURCES = src/beifahrer-cli.c src/adac-mitfahrclub.c
 src/beifahrer-cli.c: ${beifahrer_cli_VALASOURCES}
 	${VALAC} -C ${beifahrer_cli_VALASOURCES} ${beifahrer_cli_VALAFLAGS}
 
-beifahrer_cli_VALAFLAGS = --vapidir ./vapi \
+beifahrer_cli_VALAFLAGS = --thread --vapidir ./vapi \
+	--pkg gio-2.0 \
 	--pkg libcurl \
 	--pkg libxml-2.0
 beifahrer_cli_CFLAGS = -DGETTEXT_PACKAGE=\"@GETTEXT_PACKAGE@\" \
+	${GIO_CFLAGS} \
 	${CURL_CFLAGS} \
-	${GLIB_CFLAGS} \
-	${GOBJECT_CFLAGS} \
+	${GTHREAD_CFLAGS} \
 	${XML_CFLAGS}
 beifahrer_cli_LDADD = \
+	${GIO_LIBS} \
 	${CURL_LIBS} \
-	${GLIB_LIBS} \
-	${GOBJECT_LIBS} \
+	${GTHREAD_LIBS} \
 	${XML_LIBS}
 
 CLEANFILES = \