X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2FMakefile.am;h=193cbb0f0d30161af6ff5337646ee5ef553a9a0e;hp=379915e58c944a7ec704f775b74b69faf65aa862;hb=ad105e093abd2bd0d2ce770f5570cdc29fbb5d42;hpb=f6d386ff93e929092ba105385a29d760aeba9ff7

diff --git a/src/Makefile.am b/src/Makefile.am
index 379915e..193cbb0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,23 +3,25 @@
 # Time-stamp: <2008-01-06 10:18:49 (djcb)>
 
 SUBDIRS= $(MODEST_TOOLKIT_DIR) widgets $(dbus_api)
-DIST_SUBDIRS = widgets gnome maemo dbus_api
+DIST_SUBDIRS = widgets gnome maemo hildon2 dbus_api
 
 INCLUDES=\
 	$(MODEST_GSTUFF_CFLAGS)					\
 	$(MODEST_PLATFORM_CFLAGS)				\
 	$(MODEST_TOOLKIT_CFLAGS)				\
+	$(MODEST_PLUGIN_DEFINES)				\
 	$(MODEST_OGS_CFLAGS)					\
 	$(MODEST_HILDON_HELP_CFLAGS)				\
 	$(MODEST_LIBCONIC_CFLAGS)				\
 	$(MODEST_HILDON_NOTIFY_CFLAGS)				\
 	$(MODEST_MOZEMBED_CFLAGS)				\
 	-fPIC \
-	-I$(MODEST_PLATFORM)					\
+	-I$(MODEST_TOOLKIT_DIR)					\
 	-DPREFIX=\"@prefix@\"					\
 	-DMAEMO_CHANGES 					\
 	-DMODEST_LOCALEDIR=\"$(MODEST_LOCALEDIR)\"		\
 	-DMODEST_PLATFORM=\"$(MODEST_PLATFORM)\"		\
+	-DMODEST_TOOLKIT=\"$(MODEST_TOOLKIT)\"		\
 	-DPIXMAP_PREFIX=\"${datadir}/pixmaps/modest/\"		\
 	-DMODEST_UIDIR=\"$(datadir)/modest/ui/\"		\
 	-DMODEST_MAILPLUGINDIR=\"$(libdir)/modest/mail-plugins\"
@@ -59,6 +61,7 @@ modest_public_headers = \
 	modest-protocol.h \
 	modest-protocol-registry.h \
 	modest-server-account-settings.h \
+	modest-text-utils.h \
 	modest-tny-account-store.h \
 	modest-tny-local-folders-account.h \
 	modest-utils.h
@@ -118,7 +121,6 @@ libmodest_la_SOURCES=\
 	modest-singletons.h \
 	modest-server-account-settings.c \
 	modest-text-utils.c \
-	modest-text-utils.h \
 	modest-tny-account-store.c \
 	modest-tny-account.c \
 	modest-tny-account.h \
@@ -169,7 +171,7 @@ libmodest_la_LIBADD = 						\
 	$(MODEST_OGS_LIBS)				\
 	${easysetupmaybe} \
 	widgets/libmodest-widgets.la                    \
-	$(MODEST_PLATFORM)/libmodest-ui.la		
+	$(MODEST_TOOLKIT_DIR)/libmodest-ui.la		
 libmodest_la_LDFLAGS = -rdynamic -export-dynamic -no-undefined -Wl,--version-script=export.map
 
 if MODEST_HAVE_DBUS_API