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

[modest] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index b9e5383..7cd6ea6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,20 +1,22 @@
 #
 # Makefile.am
-# Time-stamp: <2006-07-17 13:55:31 (djcb)>
-SUBDIRS=$(MODEST_PLATFORM_DIR)
-DIST_SUBDIRS = gtk gtk2 hildon
+# 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) \
-       -I$(MODEST_PLATFORM_DIR) \
-       -DPREFIX=\"@prefix@\" 
-
-if OLD_UI_STUFF
-INCLUDES +=\
-       -DOLD_UI_STUFF
-endif
+       -I$(MODEST_PLATFORM) \
+       -DPREFIX=\"@prefix@\" \
+       -DMAEMO_CHANGES \
+       -DMODEST_LOCALEDIR=\"$(MODEST_LOCALEDIR)\" \
+       -DMODEST_PLATFORM=\"$(MODEST_PLATFORM)\" \
+       -DPIXMAP_PREFIX=\"${datadir}/pixmaps/modest/\" \
+       -DMODEST_UIDIR=\"$(datadir)/modest/ui/\"
 
 BUILT_SOURCES = modest-marshal.c modest-marshal.h
 
@@ -24,66 +26,88 @@ modest-marshal.c: modest-marshal.list
 modest-marshal.h: modest-marshal.list
        glib-genmarshal --header --prefix=modest_marshal < modest-marshal.list > modest-marshal.h
 
-
 bin_PROGRAMS=\
        modest
 
 modest_SOURCES=\
-       modest-main.c\
-       modest-conf-keys.h\
-       modest-conf.h \
-       modest-conf.c\
-       modest-widget-factory.h\
-       modest-widget-factory.c\
-       modest-account-keys.h\
-       modest-account-mgr.h\
+       modest-account-mgr-helpers.c\
+       modest-account-mgr-helpers.h\
+       modest-account-mgr-priv.c\
+       modest-account-mgr-priv.h\
        modest-account-mgr.c\
-       modest-window-mgr.h\
-       modest-window-mgr.c\
-       modest-icon-factory.c\
-       modest-icon-factory.h\
-       modest-tny-account-store.h\
-       modest-tny-account-store.c\
-       modest-tny-folder-tree-view.h\
-       modest-tny-folder-tree-view.c\
-       modest-tny-header-tree-view.h\
-       modest-tny-header-tree-view.c\
-       modest-tny-msg-view.h\
-       modest-tny-msg-view.c\
-       modest-tny-msg-actions.h\
-       modest-tny-msg-actions.c\
-       modest-proto.h\
-       modest-proto.c\
-       modest-ui.h\
-       modest-text-utils.h\
-       modest-text-utils.c\
-       modest-tny-stream-gtkhtml.h\
-       modest-tny-stream-gtkhtml.c\
-       modest-tny-transport-actions.c\
-       modest-tny-transport-actions.h\
-       modest-tny-attachment.h\
-       modest-tny-attachment.c\
-       modest-tny-store-actions.c\
-       modest-tny-store-actions.h\
-       modest-ui.h \
+       modest-account-mgr.h\
+       modest-address-book.h\
+       modest-cache-mgr.c\
+       modest-cache-mgr.h\
+       modest-conf.c\
+       modest-conf.h \
+       modest-defs.h\
+       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 \
+       modest-mail-operation-queue.h \
+       modest-mail-operation.c \
+       modest-mail-operation.h \
+       modest-main.c\
        modest-marshal.c \
-       modest-marshal.h 
+       modest-marshal.h \
+       modest-pair.c\
+       modest-pair.h\
+       modest-platform.h\
+       modest-progress-object.c\
+       modest-progress-object.h\
+       modest-protocol-info.c\
+       modest-protocol-info.h\
+       modest-runtime.c\
+       modest-runtime.h\
+       modest-runtime-priv.h\
+       modest-singletons.c\
+       modest-singletons.h\
+       modest-text-utils.c\
+       modest-text-utils.h\
+       modest-tny-account-store.c\
+       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\
+       modest-tny-msg.h\
+       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-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)
 
-if OLD_UI_STUFF
-modest_SOURCES += \
-       modest-identity-keys.h\
-       modest-identity-mgr.h\
-       modest-identity-mgr.c\
-       modest-editor-window.c\
-       modest-editor-window.h\
-       modest-viewer-window.c\
-       modest-viewer-window.h
-endif
+modest_LDADD =                                                 \
+       $(MODEST_GSTUFF_LIBS)                           \
+       $(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS)        \
+       $(MODEST_LIBTINYMAIL_MAEMO_LIBS)                \
+       ${easysetupmaybe}                               \
+       $(MODEST_PLATFORM)/libmodest-ui.la              \
+       widgets/libmodest-widgets.la \
+       dbus_api/libmodest-dbus-api.la
 
-modest_LDADD = \
-       $(MODEST_GSTUFF_LIBS) \
-       $(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS) \
-       $(MODEST_LIBTINYMAIL_MAEMO_LIBS) \
-       $(MODEST_PLATFORM_DIR)/libmodest-ui.la 
 
 EXTRA_DIST=modest-marshal.list