From 18af050c0507105544f5a83cd529a8b7a4264bdd Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 26 Apr 2001 18:21:32 +0000 Subject: Remove UNICODE_CFLAGS (and some other stuff that's redundant with * Makefile.am (INCLUDES): Remove UNICODE_CFLAGS (and some other stuff that's redundant with EXTRA_GNOME_CFLAGS) (libcamel_la_LIBADD): Replace UNICODE_LIBS with GAL_LIBS. * camel-search-private.c: * camel-pgp-context.c: * camel-mime-utils.c: Use gunicode interfaces rather than libunicode. * camel-charset-map.c: Use gunicode rather than libunicode. (The charmap-regen code still depends on libunicode though.) * camel-mime-filter-charset.h: * tests/message/test2.c (convert): Use iconv rather than unicode_iconv. * providers/smtp/Makefile.am (libcamelsmtp_la_LIBADD): * providers/pop3/Makefile.am (libcamelpop3_la_LIBADD): * providers/local/Makefile.am (libcamellocal_la_LIBADD): Remove UNICODE_LIBS. * camel.c (camel_init): Remove call to unicode_init. * camel-mime-parser.c: Remove unused unicode.h include. svn path=/trunk/; revision=9585 --- camel/Makefile.am | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'camel/Makefile.am') diff --git a/camel/Makefile.am b/camel/Makefile.am index 9c44351bbf..5c24cd06df 100644 --- a/camel/Makefile.am +++ b/camel/Makefile.am @@ -10,10 +10,7 @@ lib_LTLIBRARIES = libcamel.la INCLUDES = -I.. -I$(srcdir)/.. \ -I$(top_srcdir)/intl \ -I$(top_srcdir)/e-util \ - $(GNOME_INCLUDEDIR) \ - $(GLIB_CFLAGS) \ $(GNOME_XML_CFLAGS) \ - $(UNICODE_CFLAGS) \ $(EXTRA_GNOME_CFLAGS) \ $(KRB4_CFLAGS) \ $(NSPR_CFLAGS) \ @@ -173,7 +170,7 @@ libcamelinclude_HEADERS = \ libcamel_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) libcamel_la_LIBADD = $(top_builddir)/e-util/libeutil.la \ - $(UNICODE_LIBS) \ + $(GAL_LIBS) \ $(KRB4_LDFLAGS) \ $(NSPR_LDFLAGS) \ $(NSS_LDFLAGS) -- cgit