X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2FMakefile.am;h=13d6230356bf5e34e234794368392a93b0f78b6c;hb=d43e126947075b066ac3563aa9c2996f1ba3becb;hp=9e55bace756097e041d41a78b5efbdb7155a5518;hpb=7210d19aa7cee459db58106d02f2a9c6b0da6381;p=modest

diff --git a/src/Makefile.am b/src/Makefile.am
index 9e55bac..13d6230 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,20 +1,21 @@
 #
 # Makefile.am
-# Time-stamp: <2006-07-19 18:21:49 (djcb)>
-SUBDIRS=$(MODEST_PLATFORM_DIR)
-DIST_SUBDIRS = gtk gtk2 hildon
+# Time-stamp: <2007-01-13 14:46:41 (djcb)>
+SUBDIRS=$(MODEST_PLATFORM) widgets
+DIST_SUBDIRS = widgets gtk maemo
 
 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 ${top_srcdir}/src/widgets \
+	-I$(MODEST_PLATFORM) \
+	-DPREFIX=\"@prefix@\" \
+	-DMODEST_LOCALEDIR=\"$(MODEST_LOCALEDIR)\" \
+	-DMODEST_PLATFORM=\"$(MODEST_PLATFORM)\" \
+	-DMODEST_PLATFORM_ID=$(MODEST_PLATFORM_ID) \
+	-DPIXMAP_PREFIX=\"${datadir}/pixmaps/modest/\" \
+	-DMODEST_UIDIR=\"$(datadir)/modest/ui/\"
 
 BUILT_SOURCES = modest-marshal.c modest-marshal.h
 
@@ -33,59 +34,52 @@ modest_SOURCES=\
 	modest-conf-keys.h\
 	modest-conf.h \
 	modest-conf.c\
-	modest-widget-factory.h\
-	modest-widget-factory.c\
+	modest-pair.h\
+	modest-pair.c\
+	modest-widget-factory.h	\
+	modest-widget-factory.c	\
+	modest-widget-memory.h\
+	modest-widget-memory.c\
 	modest-account-keys.h\
 	modest-account-mgr.h\
 	modest-account-mgr.c\
-	modest-account-view.h\
-	modest-account-view.c\
-	modest-window-mgr.h\
-	modest-window-mgr.c\
+	modest-debug.c\
+	modest-debug.h\
 	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-presets.c\
+	modest-presets.h\
+	modest-protocol-mgr.h\
+	modest-protocol-mgr.c\
 	modest-proto.h\
 	modest-proto.c\
+	modest-ui.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-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-mail-operation.c \
+	modest-mail-operation.h \
+	modest-mail-operation-queue.c \
+	modest-mail-operation-queue.h \
+	modest-tny-platform-factory.c \
+	modest-tny-platform-factory.h \
+	modest-formatter.c \
+	modest-formatter.h \
+	modest-error.h
 
-modest_LDADD = \
-	$(MODEST_GSTUFF_LIBS) \
-	$(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS) \
-	$(MODEST_LIBTINYMAIL_MAEMO_LIBS) \
-	$(MODEST_PLATFORM_DIR)/libmodest-ui.la 
+modest_LDADD = 						\
+	$(MODEST_GSTUFF_LIBS) 				\
+	$(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS)	\
+	$(MODEST_LIBTINYMAIL_MAEMO_LIBS) 		\
+	$(MODEST_PLATFORM)/libmodest-ui.la		\
+	widgets/libmodest-widgets.la			
 
 EXTRA_DIST=modest-marshal.list