X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2FMakefile.am;h=9d92a5a368f41c852e57910ee56c6886e4b2fe97;hp=ac85fe3d566b49ab43f08546a9ad49b3c162d1ec;hb=5ff64b5b4c5c0c8101bd5a4f3a22d20cb6710d77;hpb=947deb5940fcfdc27858178edb5197ac6ba7dac5

diff --git a/src/Makefile.am b/src/Makefile.am
index ac85fe3..9d92a5a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,20 +1,19 @@
 #
 # Makefile.am
-# Time-stamp: <2006-07-21 09:29:41 (djcb)>
-SUBDIRS=$(MODEST_PLATFORM_DIR)
-DIST_SUBDIRS = widgets gtk gtk2 hildon
+# Time-stamp: <2007-04-21 11:15:36 (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@\" \
+	-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,62 +23,76 @@ 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-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 
-
-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-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-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-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_LDADD = \
-	$(MODEST_GSTUFF_LIBS) \
-	$(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS) \
-	$(MODEST_LIBTINYMAIL_MAEMO_LIBS) \
-	$(MODEST_PLATFORM_DIR)/libmodest-ui.la \
-	widgets/libmodest-widgets.la
-		
+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		
 
 EXTRA_DIST=modest-marshal.list