diff options
| author | NotZed <NotZed@HelixCode.com> | 2000-05-08 13:24:54 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2000-05-08 13:24:54 +0800 |
| commit | b7f49ccf5755b1073d13348849cc71f67ba92a0d (patch) | |
| tree | e81e979778fe6b8940a42dd8860a548da1058479 /camel/Makefile.am | |
| parent | 4b0541ac3358b6f094bac4f9d1f3e415e23fd4d5 (diff) | |
| download | gsoc2013-evolution-b7f49ccf5755b1073d13348849cc71f67ba92a0d.tar.gz gsoc2013-evolution-b7f49ccf5755b1073d13348849cc71f67ba92a0d.tar.zst gsoc2013-evolution-b7f49ccf5755b1073d13348849cc71f67ba92a0d.zip | |
Merged NEW_SUMMARY branch back to trunk, and resolved conflicts.
2000-05-08 NotZed <NotZed@HelixCode.com>
* Merged NEW_SUMMARY branch back to trunk, and resolved conflicts.
* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_update):
Return status.
* camel-stream-filter.c (do_close): We NEED a stream close.
svn path=/trunk/; revision=2906
Diffstat (limited to 'camel/Makefile.am')
| -rw-r--r-- | camel/Makefile.am | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/camel/Makefile.am b/camel/Makefile.am index c24113df45..3b9eee05de 100644 --- a/camel/Makefile.am +++ b/camel/Makefile.am @@ -38,6 +38,7 @@ libcamel_la_SOURCES = \ camel-exception.c \ camel-folder.c \ camel-folder-search.c \ + camel-folder-summary.c \ camel-medium.c \ camel-marshal-utils.c \ camel-mime-message.c \ @@ -71,20 +72,19 @@ libcamel_la_SOURCES = \ camel-mime-filter-save.c \ camel-mime-filter-charset.c \ camel-mime-filter-index.c \ + camel-mime-filter-from.c \ camel-stream-filter.c \ camel-address.c \ camel-internet-address.c \ $(pthread_SRC) -# camel-folder-summary.c \ -# camel-folder-summary.h \ - libcamelinclude_HEADERS = \ camel.h \ camel-data-wrapper.h \ camel-exception.h \ camel-folder.h \ camel-folder-search.h \ + camel-folder-summary.h \ camel-marshal-utils.h \ camel-medium.h \ camel-mime-message.h \ @@ -119,6 +119,7 @@ libcamelinclude_HEADERS = \ camel-mime-filter-save.h \ camel-mime-filter-charset.h \ camel-mime-filter-index.h \ + camel-mime-filter-from.h \ camel-stream-filter.h \ camel-address.h \ camel-internet-address.h \ @@ -133,19 +134,19 @@ EXTRA_DIST = \ $(libcamel_extra_sources) \ README -noinst_PROGRAMS = \ - camel-folder-summary - -camel_folder_summary_SOURCES = \ - camel-folder-summary.c - -camel_folder_summary_LDADD = \ - ../camel/libcamel.la \ - ../e-util/libeutil.la \ - ../libibex/libibex.la \ - $(GNOME_LIBDIR) \ - $(GNOMEUI_LIBS) \ - $(INTLLIBS) \ - $(PTHREAD_LIB) \ - $(EXTRA_GNOME_LIBS) +#noinst_PROGRAMS = \ +# camel-mime-filter-from +# +#camel_mime_filter_from_SOURCES = \ +# camel-mime-filter-from.c +# +#camel_mime_filter_from_LDADD = \ +# ../camel/libcamel.la \ +# ../e-util/libeutil.la \ +# ../libibex/libibex.la \ +# $(GNOME_LIBDIR) \ +# $(GNOMEUI_LIBS) \ +# $(INTLLIBS) \ +# $(PTHREAD_LIB) \ +# $(EXTRA_GNOME_LIBS) |