configure.ac: removed dependency with camel-1.2.

[modest] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index b76016f..994d8d8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,8 @@
 #
 # Makefile.am
-# Time-stamp: <2006-07-24 11:11:09 (djcb)>
+# Time-stamp: <2006-08-17 14:29:08 (djcb)>
 SUBDIRS=$(MODEST_PLATFORM_DIR) widgets
-DIST_SUBDIRS = widgets gtk gtk2 hildon
+DIST_SUBDIRS = widgets gtk
 
 INCLUDES=\
        $(MODEST_GSTUFF_CFLAGS)\
@@ -11,11 +11,6 @@ INCLUDES=\
        -I$(MODEST_PLATFORM_DIR) \
        -DPREFIX=\"@prefix@\" 
 
-if OLD_UI_STUFF
-INCLUDES +=\
-       -DOLD_UI_STUFF
-endif
-
 BUILT_SOURCES = modest-marshal.c modest-marshal.h
 
 modest-marshal.c: modest-marshal.list
@@ -33,6 +28,8 @@ modest_SOURCES=\
        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\
@@ -40,16 +37,14 @@ modest_SOURCES=\
        modest-account-keys.h\
        modest-account-mgr.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-protocol-mgr.h\
+       modest-protocol-mgr.c\
        modest-ui.h\
        modest-text-utils.h\
        modest-text-utils.c\
@@ -65,16 +60,6 @@ modest_SOURCES=\
        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_LDADD = \
        $(MODEST_GSTUFF_LIBS) \