Switch from libsoup to libcurl, add login and my information support

[beifahrer] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d172235..4f60bc9 100644 (file)
--- 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 \
@@ -57,7 +59,7 @@ beifahrer_VALAFLAGS = --disable-dbus-transformation --thread --vapidir ./vapi \
         --pkg libosso-abook-1.0 \
         --pkg libhildonmime \
         --pkg liblocation \
-       --pkg libsoup-2.4
+       --pkg libcurl
 beifahrer_CFLAGS = -DGETTEXT_PACKAGE=\"@GETTEXT_PACKAGE@\" \
        ${DBUS_CFLAGS} \
        ${GCONF_CFLAGS} \
@@ -66,7 +68,7 @@ beifahrer_CFLAGS = -DGETTEXT_PACKAGE=\"@GETTEXT_PACKAGE@\" \
        ${MAEMO_LAUNCHER_CFLAGS} \
        ${OSSO_CFLAGS} \
        ${ABOOK_CFLAGS} \
-       ${SOUP_CFLAGS} \
+       ${CURL_CFLAGS}
        ${XML_CFLAGS}
 beifahrer_LDADD = \
        ${DBUS_LIBS} \
@@ -76,7 +78,7 @@ beifahrer_LDADD = \
        ${MAEMO_LAUNCHER_LIBS} \
        ${OSSO_LIBS} \
        ${ABOOK_LIBS} \
-       ${SOUP_LIBS} \
+       ${CURL_LIBS} \
        ${XML_LIBS}
 
 beifahrer_cli_VALASOURCES = src/beifahrer-cli.vala src/adac-mitfahrclub.vala
@@ -87,15 +89,18 @@ src/beifahrer-cli.c: ${beifahrer_cli_VALASOURCES}
        ${VALAC} -C ${beifahrer_cli_VALASOURCES} ${beifahrer_cli_VALAFLAGS}
 
 beifahrer_cli_VALAFLAGS = --thread --vapidir ./vapi \
-       --pkg libsoup-2.4 \
+       --pkg gio-2.0 \
+       --pkg libcurl \
        --pkg libxml-2.0
 beifahrer_cli_CFLAGS = -DGETTEXT_PACKAGE=\"@GETTEXT_PACKAGE@\" \
        ${GIO_CFLAGS} \
-       ${SOUP_CFLAGS} \
+       ${CURL_CFLAGS} \
+       ${GTHREAD_CFLAGS} \
        ${XML_CFLAGS}
 beifahrer_cli_LDADD = \
        ${GIO_LIBS} \
-       ${SOUP_LIBS} \
+       ${CURL_LIBS} \
+       ${GTHREAD_LIBS} \
        ${XML_LIBS}
 
 CLEANFILES = \