2007-05-23 Murray Cumming <murrayc@murrayc.com>

[modest] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 01684f7..7cd6ea6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,10 @@
 #
 # Makefile.am
-# Time-stamp: <2007-04-06 16:29:33 (djcb)>
-SUBDIRS=$(MODEST_PLATFORM) widgets
-DIST_SUBDIRS = widgets gnome maemo
+# 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)\
@@ -10,9 +12,9 @@ INCLUDES=\
        $(MODEST_LIBTINYMAIL_MAEMO_CFLAGS) \
        -I$(MODEST_PLATFORM) \
        -DPREFIX=\"@prefix@\" \
+       -DMAEMO_CHANGES \
        -DMODEST_LOCALEDIR=\"$(MODEST_LOCALEDIR)\" \
        -DMODEST_PLATFORM=\"$(MODEST_PLATFORM)\" \
-       -DMODEST_PLATFORM_ID=$(MODEST_PLATFORM_ID) \
        -DPIXMAP_PREFIX=\"${datadir}/pixmaps/modest/\" \
        -DMODEST_UIDIR=\"$(datadir)/modest/ui/\"
 
@@ -24,13 +26,6 @@ modest-marshal.c: modest-marshal.list
 modest-marshal.h: modest-marshal.list
        glib-genmarshal --header --prefix=modest_marshal < modest-marshal.list > modest-marshal.h
 
-if MODEST_HAVE_EASYSETUP
-       easysetupmaybe=$(MODEST_PLATFORM)/easysetup/libmodest-easysetup.la
-else
-       easysetupmaybe=$(MODEST_PLATFORM)/easysetup/libmodest-easysetup.la      
-endif
-
-
 bin_PROGRAMS=\
        modest
 
@@ -50,6 +45,8 @@ modest_SOURCES=\
        modest-error.h \
        modest-formatter.c \
        modest-formatter.h \
+       modest-init.c \
+       modest-init.h \
        modest-local-folder-info.c \
        modest-local-folder-info.h \
        modest-mail-operation-queue.c \
@@ -68,6 +65,7 @@ modest_SOURCES=\
        modest-protocol-info.h\
        modest-runtime.c\
        modest-runtime.h\
+       modest-runtime-priv.h\
        modest-singletons.c\
        modest-singletons.h\
        modest-text-utils.c\
@@ -76,6 +74,8 @@ modest_SOURCES=\
        modest-tny-account-store.h\
        modest-tny-account.c\
        modest-tny-account.h\
+       modest-tny-outbox-account.c\
+       modest-tny-outbox-account.h\
        modest-tny-folder.c \
        modest-tny-folder.h \
        modest-tny-msg.c\
@@ -83,13 +83,22 @@ modest_SOURCES=\
        modest-platform.h\
        modest-tny-platform-factory.c \
        modest-tny-platform-factory.h \
+       modest-tny-simple-folder-store.c \
+       modest-tny-simple-folder-store.h \
        modest-tny-send-queue.c\
        modest-tny-send-queue.h\
        modest-ui-actions.c\
        modest-ui-actions.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-mime-part-search-stream.c\
+       modest-mime-part-search-stream.h
+
+modest_CFLAGS  = $(MAEMO_LAUNCHER_CFLAGS)
+modest_LDFLAGS = $(MAEMO_LAUNCHER_LDFLAGS)
 
 modest_LDADD =                                                 \
        $(MODEST_GSTUFF_LIBS)                           \
@@ -97,6 +106,8 @@ modest_LDADD =                                               \
        $(MODEST_LIBTINYMAIL_MAEMO_LIBS)                \
        ${easysetupmaybe}                               \
        $(MODEST_PLATFORM)/libmodest-ui.la              \
-       widgets/libmodest-widgets.la                    
+       widgets/libmodest-widgets.la \
+       dbus_api/libmodest-dbus-api.la
+
 
 EXTRA_DIST=modest-marshal.list