From 4ba09274d6d393568a06c483bf4934ea4707a604 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Thu, 24 Jan 2002 23:16:18 +0000 Subject: Clean up some of the Makefiles so we dont' link every library multiple times, causing big libtool 1.4 pain. svn path=/trunk/; revision=15461 --- camel/ChangeLog | 9 +++++++++ camel/providers/sendmail/camel-sendmail-transport.c | 4 ++-- camel/tests/folder/Makefile.am | 2 +- camel/tests/message/Makefile.am | 2 +- camel/tests/mime-filter/Makefile.am | 2 +- camel/tests/misc/Makefile.am | 2 +- camel/tests/smime/Makefile.am | 2 +- camel/tests/stream/Makefile.am | 2 +- 8 files changed, 17 insertions(+), 8 deletions(-) (limited to 'camel') diff --git a/camel/ChangeLog b/camel/ChangeLog index fe684e01b5..caa2400364 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,12 @@ +2002-01-24 Ettore Perazzoli + + * tests/folder/Makefile.am: s/MAILER_LIBS/EVOLUTION_MAIL_LIBS/. + * tests/message/Makefile.am: Likewise. + * tests/mime-filter/Makefile.am: Likewise. + * tests/misc/Makefile.am: Likewise. + * tests/smime/Makefile.am: Likewise. + * tests/stream/Makefile.am: Likewise. + 2002-01-24 Jeffrey Stedfast * camel-filter-driver.c (do_beep): Call the beep callback diff --git a/camel/providers/sendmail/camel-sendmail-transport.c b/camel/providers/sendmail/camel-sendmail-transport.c index 7ee5c3bdab..5d5df59a7c 100644 --- a/camel/providers/sendmail/camel-sendmail-transport.c +++ b/camel/providers/sendmail/camel-sendmail-transport.c @@ -131,8 +131,8 @@ sendmail_send_internal (CamelMedium *message, const char **argv, CamelException /* Child process */ nullfd = open ("/dev/null", O_RDWR); dup2 (fd[0], STDIN_FILENO); - dup2 (nullfd, STDOUT_FILENO); - dup2 (nullfd, STDERR_FILENO); + /* dup2 (nullfd, STDOUT_FILENO); + dup2 (nullfd, STDERR_FILENO);*/ close (nullfd); close (fd[1]); diff --git a/camel/tests/folder/Makefile.am b/camel/tests/folder/Makefile.am index 7ae6ef9a9d..143fd7f4ad 100644 --- a/camel/tests/folder/Makefile.am +++ b/camel/tests/folder/Makefile.am @@ -10,7 +10,7 @@ LDADD = \ $(top_builddir)/libibex/libibex.la \ $(GNOME_LIBDIR) \ $(top_builddir)/camel/tests/lib/libcameltest.a \ - $(GNOMEUI_LIBS) $(INTLLIBS) $(MAILER_LIBS) + $(GNOMEUI_LIBS) $(INTLLIBS) $(EVOLUTION_MAIL_LIBS) check_PROGRAMS = \ test1 test4 test5 \ diff --git a/camel/tests/message/Makefile.am b/camel/tests/message/Makefile.am index 2aa375d25e..5487a13f42 100644 --- a/camel/tests/message/Makefile.am +++ b/camel/tests/message/Makefile.am @@ -10,7 +10,7 @@ LDADD = \ $(top_builddir)/libibex/libibex.la \ $(GNOME_LIBDIR) \ $(top_builddir)/camel/tests/lib/libcameltest.a \ - $(GNOMEUI_LIBS) $(INTLLIBS) $(MAILER_LIBS) + $(GNOMEUI_LIBS) $(INTLLIBS) $(EVOLUTION_MAIL_LIBS) check_PROGRAMS = \ test1 \ diff --git a/camel/tests/mime-filter/Makefile.am b/camel/tests/mime-filter/Makefile.am index 5d85ecd7df..d3c2a7d29f 100644 --- a/camel/tests/mime-filter/Makefile.am +++ b/camel/tests/mime-filter/Makefile.am @@ -11,7 +11,7 @@ LDADD = \ $(top_builddir)/libibex/libibex.la \ $(GNOME_LIBDIR) \ $(top_builddir)/camel/tests/lib/libcameltest.a \ - $(GNOMEUI_LIBS) $(INTLLIBS) $(MAILER_LIBS) + $(GNOMEUI_LIBS) $(INTLLIBS) $(EVOLUTION_MAIL_LIBS) EXTRA_DIST = \ crlf-1.in \ diff --git a/camel/tests/misc/Makefile.am b/camel/tests/misc/Makefile.am index 1ebda3da9c..dc34d1ea16 100644 --- a/camel/tests/misc/Makefile.am +++ b/camel/tests/misc/Makefile.am @@ -10,7 +10,7 @@ LDADD = \ $(top_builddir)/libibex/libibex.la \ $(GNOME_LIBDIR) \ $(top_builddir)/camel/tests/lib/libcameltest.a \ - $(GNOMEUI_LIBS) $(INTLLIBS) $(MAILER_LIBS) + $(GNOMEUI_LIBS) $(INTLLIBS) $(EVOLUTION_MAIL_LIBS) check_PROGRAMS = \ url diff --git a/camel/tests/smime/Makefile.am b/camel/tests/smime/Makefile.am index 0eafc46e36..e8b098745f 100644 --- a/camel/tests/smime/Makefile.am +++ b/camel/tests/smime/Makefile.am @@ -10,7 +10,7 @@ LDADD = \ $(top_builddir)/libibex/libibex.la \ $(GNOME_LIBDIR) \ $(top_builddir)/camel/tests/lib/libcameltest.a \ - $(GNOMEUI_LIBS) $(INTLLIBS) $(MAILER_LIBS) + $(GNOMEUI_LIBS) $(INTLLIBS) $(EVOLUTION_MAIL_LIBS) check_PROGRAMS = \ pgp \ diff --git a/camel/tests/stream/Makefile.am b/camel/tests/stream/Makefile.am index 1471ca82a5..37586766c7 100644 --- a/camel/tests/stream/Makefile.am +++ b/camel/tests/stream/Makefile.am @@ -10,7 +10,7 @@ LDADD = \ $(top_builddir)/libibex/libibex.la \ $(GNOME_LIBDIR) \ $(top_builddir)/camel/tests/lib/libcameltest.a \ - $(GNOMEUI_LIBS) $(INTLLIBS) $(MAILER_LIBS) + $(GNOMEUI_LIBS) $(INTLLIBS) $(EVOLUTION_MAIL_LIBS) check_PROGRAMS = \ test1 test2 test3 -- cgit v1.2.3