This is a manual merge of branch drop split view intro trunk.

[modest] / src / dbus_api / Makefile.am

diff --git a/src/dbus_api/Makefile.am b/src/dbus_api/Makefile.am
index 288382c..1ec36dd 100644 (file)
--- a/src/dbus_api/Makefile.am
+++ b/src/dbus_api/Makefile.am
@@ -29,10 +29,13 @@
 
 INCLUDES=\
        $(MODEST_GSTUFF_CFLAGS) \
-       $(MODEST_LIBTINYMAIL_MAEMO_CFLAGS) \
-       -DMODEST_PLATFORM_ID=$(MODEST_PLATFORM_ID) \
+       $(MODEST_PLATFORM_CFLAGS) \
+       $(MODEST_TOOLKIT_CFLAGS)\
+       $(MODEST_PLUGIN_DEFINES)\
+       $(MODEST_OGS_CFLAGS) \
        -I ${top_srcdir}/src/widgets  \
        -I ${top_srcdir}/src  \
+       -I ${top_srcdir}/src/$(MODEST_TOOLKIT_DIR) \
        -DPREFIX=\"@prefix@\" \
        -DMAEMO_CHANGES \
        -DPIXMAP_PREFIX=\"${datadir}/pixmaps/modest/\" \
@@ -49,5 +52,7 @@ libmodest_dbus_api_la_SOURCES=              \
 
 LDADD = \
        $(MODEST_GSTUFF_LIBS) \
-       $(MODEST_LIBTINYMAIL_MAEMO_LIBS)
+       $(MODEST_PLATFORM_LIBS) \
+       $(MODEST_TOOLKIT_LIBS) \
+       $(MODEST_OGS_LIBS)