* restore gnome building (check for easysetup)

[modest] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 6372c3c..01684f7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,14 +1,13 @@
 #
 # Makefile.am
-# Time-stamp: <2007-01-30 00:21:56 (djcb)>
+# Time-stamp: <2007-04-06 16:29:33 (djcb)>
 SUBDIRS=$(MODEST_PLATFORM) widgets
-DIST_SUBDIRS = widgets gtk maemo
+DIST_SUBDIRS = widgets gnome maemo
 
 INCLUDES=\
        $(MODEST_GSTUFF_CFLAGS)\
        $(MODEST_LIBTINYMAIL_GNOME_DESKTOP_CFLAGS) \
        $(MODEST_LIBTINYMAIL_MAEMO_CFLAGS) \
-       -I ${top_srcdir}/src/widgets \
        -I$(MODEST_PLATFORM) \
        -DPREFIX=\"@prefix@\" \
        -DMODEST_LOCALEDIR=\"$(MODEST_LOCALEDIR)\" \
@@ -25,6 +24,12 @@ 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
@@ -36,6 +41,7 @@ modest_SOURCES=\
        modest-account-mgr-priv.h\
        modest-account-mgr.c\
        modest-account-mgr.h\
+       modest-address-book.h\
        modest-cache-mgr.c\
        modest-cache-mgr.h\
        modest-conf.c\
@@ -55,6 +61,9 @@ modest_SOURCES=\
        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\
@@ -71,15 +80,13 @@ modest_SOURCES=\
        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-ui.c\
-       modest-ui.h\
-       modest-widget-factory.c \
-       modest-widget-factory.h \
        modest-widget-memory-priv.h \
        modest-widget-memory.c\
        modest-widget-memory.h 
@@ -88,6 +95,7 @@ modest_LDADD =                                                \
        $(MODEST_GSTUFF_LIBS)                           \
        $(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS)        \
        $(MODEST_LIBTINYMAIL_MAEMO_LIBS)                \
+       ${easysetupmaybe}                               \
        $(MODEST_PLATFORM)/libmodest-ui.la              \
        widgets/libmodest-widgets.la