Modified webpage: now tinymail repository is in gitorious.

[modest] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 5a50eff..542a9db 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@
 # Time-stamp: <2008-01-06 10:18:49 (djcb)>
 
 SUBDIRS= $(MODEST_TOOLKIT_DIR) widgets $(dbus_api)
-DIST_SUBDIRS = widgets gnome maemo hildon2 dbus_api
+DIST_SUBDIRS = widgets gtk hildon2 dbus_api
 
 INCLUDES=\
        $(MODEST_GSTUFF_CFLAGS)                                 \
@@ -15,10 +15,10 @@ INCLUDES=\
        $(MODEST_LIBCONIC_CFLAGS)                               \
        $(MODEST_HILDON_NOTIFY_CFLAGS)                          \
        $(MODEST_MOZEMBED_CFLAGS)                               \
-       -fPIC \
+       $(MODEST_WEBKIT_CFLAGS)                         \
+       -fPIC                                                   \
        -I$(MODEST_TOOLKIT_DIR)                                 \
        -DPREFIX=\"@prefix@\"                                   \
-       -DMAEMO_CHANGES                                         \
        -DMODEST_LOCALEDIR=\"$(MODEST_LOCALEDIR)\"              \
        -DMODEST_PLATFORM=\"$(MODEST_PLATFORM)\"                \
        -DMODEST_TOOLKIT=\"$(MODEST_TOOLKIT)\"          \
@@ -39,10 +39,6 @@ noinst_LTLIBRARIES = libmodest.la
 bin_PROGRAMS=\
        modest
 
-to_remove=\
-       modest-testplugin-protocol.c \
-       modest-testplugin-protocol.h
-
 #
 # NOTE: $(addressbook) will be modest-addressbook-dummy.c
 # if no real addressbook has been defined (configure.ac)
@@ -57,6 +53,8 @@ modest_public_headers = \
        modest-conf.h \
        modest-defs.h \
        modest-local-folder-info.h \
+       modest-mail-operation.h \
+       modest-mail-operation-queue.h \
        modest-pair.h \
        modest-platform.h \
        modest-plugin.h \
@@ -64,10 +62,12 @@ modest_public_headers = \
        modest-protocol.h \
        modest-protocol-registry.h \
        modest-server-account-settings.h \
+       modest-signal-mgr.h \
        modest-text-utils.h \
        modest-tny-account-store.h \
        modest-tny-folder.h \
        modest-tny-local-folders-account.h \
+       modest-tny-send-queue.h \
        modest-utils.h
 
 libmodest_la_SOURCES=\
@@ -147,6 +147,8 @@ libmodest_la_SOURCES=\
        modest-transport-account-decorator.h \
        modest-stream-text-to-html.c \
        modest-stream-text-to-html.h \
+       modest-stream-html-to-text.c \
+       modest-stream-html-to-text.h \
        modest-ui-actions.c \
        modest-ui-actions.h \
        modest-ui-dimming-manager.c \
@@ -170,11 +172,13 @@ libmodest_la_LIBADD =                                             \
        $(MAEMO_LAUNCHER_LIBS)                          \
        $(MODEST_GSTUFF_LIBS)                           \
        $(MODEST_MOZEMBED_LIBS)                         \
+       $(MODEST_WEBKIT_LIBS)                   \
        $(MODEST_PLATFORM_LIBS)                         \
        $(MODEST_TOOLKIT_LIBS)                  \
        $(MODEST_HILDON_HELP_LIBS)                      \
        $(MODEST_HILDON_NOTIFY_LIBS)                    \
        $(MODEST_OGS_LIBS)                              \
+       $(MODEST_LIBTIME_LIBS)                          \
        ${easysetupmaybe} \
        widgets/libmodest-widgets.la                    \
        $(MODEST_TOOLKIT_DIR)/libmodest-ui.la
@@ -205,10 +209,11 @@ modest_LDADD = \
        $(MODEST_HILDON_HELP_LIBS)                      \
        $(MODEST_HILDON_NOTIFY_LIBS)                    \
        $(MODEST_OGS_LIBS)                              \
+       $(MODEST_LIBTIME_LIBS)                          \
        ${easysetupmaybe}                               \
        libmodest.la)
 
-modest_LDFLAGS = -shared -Wl,--version-script=export.map
+modest_LDFLAGS = $(MAEMO_LAUNCHER_MODEST_LDFLAGS) -Wl,--version-script=export.map
 
 # modest_UNWANTED = -export-dynamic -Wl,--export-dynamic
 
@@ -230,4 +235,4 @@ EXTRA_DIST=modest-marshal.list \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = modest-plugin-1.0.pc
 
-DISTCLEANFILES = $(pkgconfig_DATA)
\ No newline at end of file
+DISTCLEANFILES = $(pkgconfig_DATA)