Fixes leaks 20/26 & 21/26

[modest] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 8144eb6..0167522 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,25 +2,26 @@
 # Makefile.am
 # Time-stamp: <2008-01-06 10:18:49 (djcb)>
 
-SUBDIRS= $(MODEST_PLATFORM) widgets $(dbus_api)
-
-DIST_SUBDIRS = widgets gnome maemo dbus_api
+SUBDIRS= $(MODEST_TOOLKIT_DIR) widgets $(dbus_api)
+DIST_SUBDIRS = widgets gnome maemo hildon2 dbus_api
 
 INCLUDES=\
        $(MODEST_GSTUFF_CFLAGS)                                 \
        $(MODEST_PLATFORM_CFLAGS)                               \
-       $(MODEST_HILDON_WIDGETS_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\"
@@ -54,13 +55,18 @@ modest_public_headers = \
        modest-account-settings.h \
        modest-cache-mgr.h \
        modest-conf.h \
+       modest-defs.h \
+       modest-local-folder-info.h \
        modest-pair.h \
        modest-platform.h \
        modest-plugin.h \
+       modest-plugin-ui-actions.h \
        modest-protocol.h \
        modest-protocol-registry.h \
        modest-server-account-settings.h \
+       modest-text-utils.h \
        modest-tny-account-store.h \
+       modest-tny-folder.h \
        modest-tny-local-folders-account.h \
        modest-utils.h
 
@@ -76,8 +82,10 @@ libmodest_la_SOURCES=\
        modest-conf.c \
        modest-count-stream.c \
        modest-count-stream.h \
+       modest-datetime-formatter.c \
+       modest-datetime-formatter.h \
        modest-debug.h \
-       modest-defs.h \
+       modest-defs.c \
        modest-dimming-rule.c \
        modest-dimming-rule.h \
        modest-dimming-rules-group.c \
@@ -90,7 +98,6 @@ libmodest_la_SOURCES=\
        modest-init.c \
        modest-init.h \
        modest-local-folder-info.c \
-       modest-local-folder-info.h \
        modest-mail-operation-queue.c \
        modest-mail-operation-queue.h \
        modest-mail-operation.c \
@@ -119,12 +126,10 @@ 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 \
        modest-tny-folder.c \
-       modest-tny-folder.h \
        modest-tny-local-folders-account.c \
        modest-tny-mime-part.c \
        modest-tny-mime-part.h \
@@ -155,7 +160,7 @@ libmodest_la_SOURCES=\
 
 if MODEST_USE_DUMMY_ADDRESS_BOOK
 libmodest_la_SOURCES += modest-address-book-dummy.c
-endif 
+endif
 
 
 libmodest_la_CFLAGS  = $(MAEMO_LAUNCHER_CFLAGS)
@@ -164,14 +169,14 @@ libmodest_la_LIBADD =                                             \
        $(MODEST_GSTUFF_LIBS)                           \
        $(MODEST_MOZEMBED_LIBS)                         \
        $(MODEST_PLATFORM_LIBS)                         \
-       $(MODEST_HILDON_WIDGETS_LIBS)                   \
+       $(MODEST_TOOLKIT_LIBS)                  \
        $(MODEST_HILDON_HELP_LIBS)                      \
        $(MODEST_HILDON_NOTIFY_LIBS)                    \
        $(MODEST_OGS_LIBS)                              \
        ${easysetupmaybe} \
        widgets/libmodest-widgets.la                    \
-       $(MODEST_PLATFORM)/libmodest-ui.la              
-libmodest_la_LDFLAGS = -rdynamic -export-dynamic -no-undefined -Wl,--version-script=export.map
+       $(MODEST_TOOLKIT_DIR)/libmodest-ui.la
+libmodest_la_LDFLAGS = -rdynamic -no-undefined -Wl,--version-script=export.map
 
 if MODEST_HAVE_DBUS_API
 libmodest_la_LIBADD += dbus_api/libmodest-dbus-api.la
@@ -192,14 +197,14 @@ modest_LDADD = \
        $(MODEST_GSTUFF_LIBS)                           \
        $(MODEST_MOZEMBED_LIBS)                         \
        $(MODEST_PLATFORM_LIBS)                         \
-       $(MODEST_HILDON_WIDGETS_LIBS)                   \
+       $(MODEST_TOOLKIT_LIBS)                  \
        $(MODEST_HILDON_HELP_LIBS)                      \
        $(MODEST_HILDON_NOTIFY_LIBS)                    \
        $(MODEST_OGS_LIBS)                              \
        ${easysetupmaybe}                               \
        libmodest.la
 
-modest_LDFLAGS = -rdynamic -export-dynamic -no-undefined -Wl,--version-script=export.map
+modest_LDFLAGS = -rdynamic -no-undefined -Wl,--version-script=export.map
 
 # modest_UNWANTED = -export-dynamic -Wl,--export-dynamic