From 383f245d39b8b806a4b6ce4dea7b0ab7f1658450 Mon Sep 17 00:00:00 2001 From: NotZed Date: Thu, 20 Apr 2000 23:48:45 +0000 Subject: MERGE NEW_PARSER branch into HEAD, fixed conflicts. 2000-04-20 NotZed * MERGE NEW_PARSER branch into HEAD, fixed conflicts. * gmime-content-field.c (_print_parameter): Duh, removed again (@@#$@ cvs merge). * camel-mime-utils.c (header_content_type_is): Constify. (header_content_type_unref): Killed a couple warnings. * camel-folder.c (_init): Removed more log crap. * providers/Makefile.am (SUBDIRS): Removed nntp, pending fixes for summary changes. * providers/mbox/camel-mbox-folder.c (_get_message_by_number): Fixed for new summary interface. Added a warning for using this broken api. (_get_message_by_uid): Fixed for message new with session vanishing. svn path=/trunk/; revision=2531 --- camel/Makefile.am | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'camel/Makefile.am') diff --git a/camel/Makefile.am b/camel/Makefile.am index fbc98cea86..5e8ea1e2d4 100644 --- a/camel/Makefile.am +++ b/camel/Makefile.am @@ -39,7 +39,6 @@ libcamel_la_SOURCES = \ camel-simple-data-wrapper-stream.c \ camel-stream-data-wrapper.c \ camel-folder.c \ - camel-folder-summary.c \ camel-folder-utils.c \ camel-medium.c \ camel-marshal-utils.c \ @@ -58,20 +57,26 @@ libcamel_la_SOURCES = \ camel-session.c \ camel-store.c \ camel-stream.c \ - camel-stream-b64.c \ camel-stream-buffer.c \ camel-stream-fs.c \ camel-stream-mem.c \ camel-transport.c \ camel-url.c \ data-wrapper-repository.c \ - gmime-base64.c \ gmime-content-field.c \ gmime-utils.c \ gstring-util.c \ hash-table-utils.c \ md5-utils.c \ string-utils.c \ + camel-mime-parser.c \ + camel-mime-utils.c \ + camel-mime-filter.c \ + camel-mime-filter-basic.c \ + camel-mime-filter-save.c \ + camel-mime-filter-charset.c \ + camel-mime-filter-index.c \ + camel-stream-filter.c \ $(pthread_SRC) libcamelinclude_HEADERS = \ @@ -82,7 +87,6 @@ libcamelinclude_HEADERS = \ camel-simple-data-wrapper-stream.h \ camel-stream-data-wrapper.h \ camel-folder.h \ - camel-folder-summary.h \ camel-folder-utils.h \ camel-mime-body-part.h \ camel-marshal-utils.h \ @@ -101,14 +105,12 @@ libcamelinclude_HEADERS = \ camel-session.h \ camel-store.h \ camel-stream.h \ - camel-stream-b64.h \ camel-stream-buffer.h \ camel-stream-fs.h \ camel-stream-mem.h \ camel-transport.h \ camel-url.h \ data-wrapper-repository.h \ - gmime-base64.h \ gmime-content-field.h \ gmime-utils.h \ gstring-util.h \ @@ -116,6 +118,14 @@ libcamelinclude_HEADERS = \ md5-utils.h \ string-utils.h \ camel-exception-list.def \ + camel-mime-parser.h \ + camel-mime-utils.h \ + camel-mime-filter.h \ + camel-mime-filter-basic.h \ + camel-mime-filter-save.h \ + camel-mime-filter-charset.h \ + camel-mime-filter-index.h \ + camel-stream-filter.h \ $(pthread_HDR) libcamel_extra_sources = \ -- cgit v1.2.3