2007-06-05 Murray Cumming <murrayc@murrayc.com>modest/trunk] > more ChangeLog2

[modest] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 9d92a5a..97821b1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,15 +1,19 @@
 #
 # Makefile.am
-# Time-stamp: <2007-04-21 11:15:36 (djcb)>
+# Time-stamp: <2007-05-15 08:46:05 (djcb)>
+
 SUBDIRS=$(MODEST_PLATFORM) widgets $(dbus_api)
+
 DIST_SUBDIRS = widgets gnome maemo dbus_api
 
 INCLUDES=\
        $(MODEST_GSTUFF_CFLAGS)\
        $(MODEST_LIBTINYMAIL_GNOME_DESKTOP_CFLAGS) \
        $(MODEST_LIBTINYMAIL_MAEMO_CFLAGS) \
+       $(OGS_CFLAGS) \
        -I$(MODEST_PLATFORM) \
        -DPREFIX=\"@prefix@\" \
+       -DMAEMO_CHANGES \
        -DMODEST_LOCALEDIR=\"$(MODEST_LOCALEDIR)\" \
        -DMODEST_PLATFORM=\"$(MODEST_PLATFORM)\" \
        -DPIXMAP_PREFIX=\"${datadir}/pixmaps/modest/\" \
@@ -50,6 +54,12 @@ modest_SOURCES=\
        modest-mail-operation-queue.h \
        modest-mail-operation.c \
        modest-mail-operation.h \
+       modest-ui-dimming-manager.c \
+       modest-ui-dimming-manager.h \
+       modest-dimming-rules-group.c \
+       modest-dimming-rules-group.h \
+       modest-dimming-rule.c \
+       modest-dimming-rule.h \
        modest-main.c\
        modest-marshal.c \
        modest-marshal.h \
@@ -71,6 +81,10 @@ modest_SOURCES=\
        modest-tny-account-store.h\
        modest-tny-account.c\
        modest-tny-account.h\
+       modest-tny-local-folders-account.c\
+       modest-tny-local-folders-account.h\
+       modest-tny-outbox-account.c\
+       modest-tny-outbox-account.h\
        modest-tny-folder.c \
        modest-tny-folder.h \
        modest-tny-msg.c\
@@ -82,17 +96,25 @@ modest_SOURCES=\
        modest-tny-send-queue.h\
        modest-ui-actions.c\
        modest-ui-actions.h\
+       modest-ui-dimming-rules.c\
+       modest-ui-dimming-rules.h\
        modest-widget-memory-priv.h \
        modest-widget-memory.c\
-       modest-widget-memory.h 
+       modest-widget-memory.h\
+       modest-search.c\
+       modest-search.h
+
+modest_CFLAGS  = $(MAEMO_LAUNCHER_CFLAGS)
+modest_LDFLAGS = $(MAEMO_LAUNCHER_LDFLAGS)
 
 modest_LDADD =                                                 \
        $(MODEST_GSTUFF_LIBS)                           \
        $(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS)        \
        $(MODEST_LIBTINYMAIL_MAEMO_LIBS)                \
+       $(OGS_LIBS)                                     \
        ${easysetupmaybe}                               \
        $(MODEST_PLATFORM)/libmodest-ui.la              \
        widgets/libmodest-widgets.la \
-       dbus_api/libmodest-dbus-api.la          
+       dbus_api/libmodest-dbus-api.la
 
 EXTRA_DIST=modest-marshal.list