* restore gnome building (check for easysetup)

[modest] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index b5c99c4..01684f7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,8 @@
 #
 # Makefile.am
-# Time-stamp: <2006-11-28 17:42:40 (djcb)>
+# Time-stamp: <2007-04-06 16:29:33 (djcb)>
 SUBDIRS=$(MODEST_PLATFORM) widgets
-DIST_SUBDIRS = widgets gtk
+DIST_SUBDIRS = widgets gnome maemo
 
 INCLUDES=\
        $(MODEST_GSTUFF_CFLAGS)\
@@ -10,9 +10,11 @@ INCLUDES=\
        $(MODEST_LIBTINYMAIL_MAEMO_CFLAGS) \
        -I$(MODEST_PLATFORM) \
        -DPREFIX=\"@prefix@\" \
-       -DMODESTLOCALEDIR=\""$(modestlocaledir)"\" \
+       -DMODEST_LOCALEDIR=\"$(MODEST_LOCALEDIR)\" \
        -DMODEST_PLATFORM=\"$(MODEST_PLATFORM)\" \
-       -DMODEST_PLATFORM_ID=$(MODEST_PLATFORM_ID)
+       -DMODEST_PLATFORM_ID=$(MODEST_PLATFORM_ID) \
+       -DPIXMAP_PREFIX=\"${datadir}/pixmaps/modest/\" \
+       -DMODEST_UIDIR=\"$(datadir)/modest/ui/\"
 
 BUILT_SOURCES = modest-marshal.c modest-marshal.h
 
@@ -22,54 +24,78 @@ 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
 
 modest_SOURCES=\
-       modest-main.c\
-       modest-conf-keys.h\
-       modest-conf.h \
-       modest-conf.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-helpers.c\
+       modest-account-mgr-helpers.h\
+       modest-account-mgr-priv.c\
+       modest-account-mgr-priv.h\
        modest-account-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-protocol-mgr.h\
-       modest-protocol-mgr.c\
-       modest-ui.h\
-       modest-text-utils.h\
-       modest-text-utils.c\
-       modest-tny-stream-gtkhtml.h\
-       modest-tny-stream-gtkhtml.c\
-       modest-tny-attachment.h\
-       modest-tny-attachment.c\
-       modest-marshal.c \
-       modest-marshal.h \
-       modest-mail-operation.c \
-       modest-mail-operation.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-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-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-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-formatter.c \
-       modest-formatter.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)                \
+       ${easysetupmaybe}                               \
        $(MODEST_PLATFORM)/libmodest-ui.la              \
        widgets/libmodest-widgets.la