diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/Makefile.am | 12 |
2 files changed, 11 insertions, 6 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index a2bddf1427..4baedbe444 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2000-06-25 Peter Williams <peterw@helixcode.com> + + * Makefile.am: Clean up the various _LIBS and _CFLAGS + to work with simpler THREADS_LIBS and THREADS_CFLAGS scheme. + 2000-06-23 Jeffrey Stedfast <fejj@helixcode.com> * folder-browser.c (folder_browser_load_folder): Improved the diff --git a/mail/Makefile.am b/mail/Makefile.am index e1c0bbbc97..992adfadac 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -20,7 +20,8 @@ INCLUDES = \ -DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" \ - -DG_LOG_DOMAIN=\"evolution-mail\" + -DG_LOG_DOMAIN=\"evolution-mail\" \ + $(THREADS_CFLAGS) EVOLUTION_MAIL_CORBA_GENERATED = \ Mail.h \ @@ -69,8 +70,7 @@ evolution_mail_LDADD = \ $(top_builddir)/libibex/libibex.la \ $(top_builddir)/filter/libfilter.la \ $(BONOBO_HTML_GNOME_LIBS) \ - $(EXTRA_GNOME_LIBS) \ - $(PTHREAD_LIB) \ + $(THREADS_LIBS) \ $(UNICODE_LIBS) test_mail_SOURCES = \ @@ -85,10 +85,10 @@ test_thread_SOURCES = \ test-thread.c test_thread_LDADD = \ - $(BONOBO_VFS_GNOME_LIBS) \ - $(PTHREAD_LIB) + $(BONOBO_HTML_GNOME_LIBS) \ + $(THREADS_LIBS) -test_thread_CFLAGS = -g +test_thread_CFLAGS = -g $(THREADS_CFLAGS) GOAD_FILES = evolution-mail.gnorba OAF_FILES = evolution-mail.oafinfo |