diff options
Diffstat (limited to 'camel')
| -rw-r--r-- | camel/ChangeLog | 16 | ||||
| -rw-r--r-- | camel/Makefile.am | 3 | ||||
| -rw-r--r-- | camel/providers/Makefile.am | 4 | ||||
| -rw-r--r-- | camel/providers/imap/Makefile.am | 7 | ||||
| -rw-r--r-- | camel/providers/local/Makefile.am | 6 | ||||
| -rw-r--r-- | camel/providers/nntp/Makefile.am | 6 | ||||
| -rw-r--r-- | camel/providers/pop3/Makefile.am | 6 |
7 files changed, 25 insertions, 23 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index c3c40749ad..cb8a9eaf6a 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,19 @@ +2001-12-17 Dan Winship <danw@ximian.com> + + * Makefile.am (INCLUDES): define CAMEL_PROVIDERDIR to be the + configure.in-defined camel_providerdir. + + * providers/Makefile.am: Remove some outdated comments + + * providers/imap/Makefile.am (camel_provider_LTLIBRARIES, + camel_provider_DATA): renamed from provider_LTLIBRARIES, + provider_DATA. + * providers/local/Makefile.am: Likewise + * providers/nntp/Makefile.am: Likewise + * providers/pop3/Makefile.am: Likewise + * providers/sendmail/Makefile.am: Likewise + * providers/smtp/Makefile.am: Likewise + 2001-12-16 Jeffrey Stedfast <fejj@ximian.com> * providers/imap/camel-imap-folder.c (get_content): Reverted my diff --git a/camel/Makefile.am b/camel/Makefile.am index 0fad241d6a..5c2075567a 100644 --- a/camel/Makefile.am +++ b/camel/Makefile.am @@ -3,7 +3,6 @@ SUBDIRS = providers tests libcamelincludedir = $(includedir)/camel -providerdir = $(libdir)/evolution/camel-providers/$(VERSION) sbin_PROGRAMS = camel-lock-helper @@ -20,7 +19,7 @@ INCLUDES = -I.. -I$(srcdir)/.. \ $(NSS_CFLAGS) \ $(OPENSSL_CFLAGS) \ -DCAMEL_SBINDIR=\""$(sbindir)"\" \ - -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" \ + -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \ -DG_LOG_DOMAIN=\"camel\" libcamel_la_SOURCES = \ diff --git a/camel/providers/Makefile.am b/camel/providers/Makefile.am index 5fd7c83e50..5a0df08299 100644 --- a/camel/providers/Makefile.am +++ b/camel/providers/Makefile.am @@ -4,8 +4,4 @@ if ENABLE_NNTP NNTP_DIR=nntp endif -# SUBDIRS = mbox pop3 sendmail smtp vee SUBDIRS = pop3 sendmail smtp imap $(NNTP_DIR) local - -# these ones are deprecated, and will no longer be maintained -# mbox mh maildir vee
\ No newline at end of file diff --git a/camel/providers/imap/Makefile.am b/camel/providers/imap/Makefile.am index 65325cf9bf..bf183aa3ce 100644 --- a/camel/providers/imap/Makefile.am +++ b/camel/providers/imap/Makefile.am @@ -2,11 +2,8 @@ libcamelimapincludedir = $(includedir)/camel - -providerdir = $(pkglibdir)/camel-providers/$(VERSION) - -provider_LTLIBRARIES = libcamelimap.la -provider_DATA = libcamelimap.urls +camel_provider_LTLIBRARIES = libcamelimap.la +camel_provider_DATA = libcamelimap.urls INCLUDES = -I.. \ -I$(srcdir)/.. \ diff --git a/camel/providers/local/Makefile.am b/camel/providers/local/Makefile.am index 22a284dd9f..f0ad0c7f6c 100644 --- a/camel/providers/local/Makefile.am +++ b/camel/providers/local/Makefile.am @@ -2,10 +2,8 @@ libcamellocalincludedir = $(includedir)/camel -providerdir = $(pkglibdir)/camel-providers/$(VERSION) - -provider_LTLIBRARIES = libcamellocal.la -provider_DATA = libcamellocal.urls +camel_provider_LTLIBRARIES = libcamellocal.la +camel_provider_DATA = libcamellocal.urls INCLUDES = -I.. \ -I$(srcdir)/.. \ diff --git a/camel/providers/nntp/Makefile.am b/camel/providers/nntp/Makefile.am index 7279c40be8..4605be64c8 100644 --- a/camel/providers/nntp/Makefile.am +++ b/camel/providers/nntp/Makefile.am @@ -2,10 +2,8 @@ libcamelnntpincludedir = $(includedir)/camel -providerdir = $(pkglibdir)/camel-providers/$(VERSION) - -provider_LTLIBRARIES = libcamelnntp.la -provider_DATA = libcamelnntp.urls +camel_provider_LTLIBRARIES = libcamelnntp.la +camel_provider_DATA = libcamelnntp.urls INCLUDES = -I../.. \ -I$(top_srcdir)/camel \ diff --git a/camel/providers/pop3/Makefile.am b/camel/providers/pop3/Makefile.am index d5225c3ef9..cde7baf25a 100644 --- a/camel/providers/pop3/Makefile.am +++ b/camel/providers/pop3/Makefile.am @@ -2,10 +2,8 @@ libcamelpop3includedir = $(includedir)/camel -providerdir = $(pkglibdir)/camel-providers/$(VERSION) - -provider_LTLIBRARIES = libcamelpop3.la -provider_DATA = libcamelpop3.urls +camel_provider_LTLIBRARIES = libcamelpop3.la +camel_provider_DATA = libcamelpop3.urls INCLUDES = \ -I.. \ |