aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog4
-rw-r--r--camel/providers/imap/Makefile.am2
-rw-r--r--camel/providers/maildir/Makefile.am2
-rw-r--r--camel/providers/mbox/Makefile.am2
-rw-r--r--camel/providers/nntp/Makefile.am2
-rw-r--r--camel/providers/pop3/Makefile.am2
-rw-r--r--camel/providers/sendmail/Makefile.am2
-rw-r--r--camel/providers/smtp/Makefile.am2
-rw-r--r--camel/providers/vee/Makefile.am2
9 files changed, 12 insertions, 8 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index c045edcaf7..c7c7f66629 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,9 @@
2000-06-12 Dan Winship <danw@helixcode.com>
+ * providers/*/Makefile.am: don't pass a second (incorrect) -rpath
+ in addition to the (correct) one automatically provided by
+ automake.
+
* camel-mime-filter-crlf.c: New filter to do CRLF<->LF conversion.
(Currently only tested in the LF->CRLF direction.)
diff --git a/camel/providers/imap/Makefile.am b/camel/providers/imap/Makefile.am
index 8ff4b31350..504abac800 100644
--- a/camel/providers/imap/Makefile.am
+++ b/camel/providers/imap/Makefile.am
@@ -34,7 +34,7 @@ libcamelimapinclude_HEADERS = \
camel-imap-stream.h \
camel-imap-summary.h
-libcamelimap_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
+libcamelimap_la_LDFLAGS = -version-info 0:0:0
libcamelimap_la_LIBADD = $(top_builddir)/e-util/libeutil.la $(top_builddir)/libibex/libibex.la $(UNICODE_LIBS)
#libcamelimap_la_LIBADD = $(top_builddir)/libibex/libibex.la $(UNICODE_LIBS)
diff --git a/camel/providers/maildir/Makefile.am b/camel/providers/maildir/Makefile.am
index 07f05d443b..4dd4f999b2 100644
--- a/camel/providers/maildir/Makefile.am
+++ b/camel/providers/maildir/Makefile.am
@@ -19,6 +19,6 @@ libcamelmaildirinclude_HEADERS = \
camel-maildir-folder.h \
camel-maildir-store.h
-libcamelmaildir_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
+libcamelmaildir_la_LDFLAGS = -version-info 0:0:0
EXTRA_DIST =
diff --git a/camel/providers/mbox/Makefile.am b/camel/providers/mbox/Makefile.am
index defd6925cc..0c9330340b 100644
--- a/camel/providers/mbox/Makefile.am
+++ b/camel/providers/mbox/Makefile.am
@@ -32,7 +32,7 @@ libcamelmboxinclude_HEADERS = \
camel-mbox-store.h \
camel-mbox-summary.h
-libcamelmbox_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
+libcamelmbox_la_LDFLAGS = -version-info 0:0:0
libcamelmbox_la_LIBADD = $(top_builddir)/e-util/libeutil.la $(top_builddir)/libibex/libibex.la $(UNICODE_LIBS)
#libcamelmbox_la_LIBADD = $(top_builddir)/libibex/libibex.la $(UNICODE_LIBS)
diff --git a/camel/providers/nntp/Makefile.am b/camel/providers/nntp/Makefile.am
index 6c37e2112f..48f85e836d 100644
--- a/camel/providers/nntp/Makefile.am
+++ b/camel/providers/nntp/Makefile.am
@@ -26,6 +26,6 @@ libcamelnntpinclude_HEADERS = \
camel-nntp-store.h
-libcamelnntp_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
+libcamelnntp_la_LDFLAGS = -version-info 0:0:0
EXTRA_DIST = libcamelnntp.urls
diff --git a/camel/providers/pop3/Makefile.am b/camel/providers/pop3/Makefile.am
index f30d73e736..1c15981411 100644
--- a/camel/providers/pop3/Makefile.am
+++ b/camel/providers/pop3/Makefile.am
@@ -30,6 +30,6 @@ libcamelpop3include_HEADERS = \
camel-pop3-store.h
-libcamelpop3_la_LDFLAGS = $(KRB4_LDFLAGS) -version-info 0:0:0 -rpath $(libdir)
+libcamelpop3_la_LDFLAGS = $(KRB4_LDFLAGS) -version-info 0:0:0
EXTRA_DIST = libcamelpop3.urls
diff --git a/camel/providers/sendmail/Makefile.am b/camel/providers/sendmail/Makefile.am
index 511c860315..5df527435f 100644
--- a/camel/providers/sendmail/Makefile.am
+++ b/camel/providers/sendmail/Makefile.am
@@ -26,6 +26,6 @@ libcamelsendmail_la_SOURCES = \
libcamelsendmailinclude_HEADERS = \
camel-sendmail-transport.h
-libcamelsendmail_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
+libcamelsendmail_la_LDFLAGS = -version-info 0:0:0
EXTRA_DIST = libcamelsendmail.urls
diff --git a/camel/providers/smtp/Makefile.am b/camel/providers/smtp/Makefile.am
index b14375bfc0..32fa210131 100644
--- a/camel/providers/smtp/Makefile.am
+++ b/camel/providers/smtp/Makefile.am
@@ -27,6 +27,6 @@ libcamelsmtpinclude_HEADERS = \
camel-smtp-transport.h
-libcamelsmtp_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
+libcamelsmtp_la_LDFLAGS = -version-info 0:0:0
EXTRA_DIST = libcamelsmtp.urls
diff --git a/camel/providers/vee/Makefile.am b/camel/providers/vee/Makefile.am
index 601defcb80..849d6ae2e8 100644
--- a/camel/providers/vee/Makefile.am
+++ b/camel/providers/vee/Makefile.am
@@ -30,7 +30,7 @@ libcamelveeinclude_HEADERS = \
camel-vee-folder.h \
camel-vee-store.h
-libcamelvee_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
+libcamelvee_la_LDFLAGS = -version-info 0:0:0
libcamelvee_la_LIBADD = $(top_builddir)/e-util/libeutil.la $(top_builddir)/libibex/libibex.la $(UNICODE_LIBS)
#libcamelvee_la_LIBADD = $(top_builddir)/libibex/libibex.la $(UNICODE_LIBS)