Link with all used libraries. Use -no-undefined on Win32.

2005-08-11  Tor Lillqvist  <tml@novell.com>

	* backends/file/Makefile.am: Link with all used
	libraries. Use -no-undefined on Win32.

	* backends/file/e-cal-backend-file-factory.c: Drop inclusion of
	<pthread.h>, this file does not use any pthread API.

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index a550c7a..e757e31 100644 (file)
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,11 +1,12 @@
 2005-08-11  Tor Lillqvist  <tml@novell.com>
 
-       * backends/contacts/Makefile.am (LIBADD): Link with all used
-       libraries.
-       (LDFLAGS): Use -no-undefined on Win32.
+       * backends/contacts/Makefile.am
+       * backends/file/Makefile.am: Link with all used
+       libraries. Use -no-undefined on Win32.
 
-       * backends/contacts/e-cal-backend-contacts-factory.c: Drop
-       inclusion of <pthread.h>, this file does not use any pthred API.
+       * backends/contacts/e-cal-backend-contacts-factory.c
+       * backends/file/e-cal-backend-file-factory.c: Drop inclusion of
+       <pthread.h>, these files do not use any pthread API.
 
 2005-08-06  P. S. Chakravarthi <pchakravarthi@novell.com>
 

diff --git a/calendar/backends/file/Makefile.am b/calendar/backends/file/Makefile.am
index 35a9daa..97254d8 100644 (file)
--- a/calendar/backends/file/Makefile.am
+++ b/calendar/backends/file/Makefile.am
@@ -24,9 +24,12 @@ libecalbackendfile_la_SOURCES =              \
        e-cal-backend-file.c    \
        e-cal-backend-file.h
 
-libecalbackendfile_la_LIBADD =                                 \
-       $(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la
-
+libecalbackendfile_la_LIBADD =                                                 \
+       $(top_builddir)/calendar/libecal/libecal-1.2.la                         \
+       $(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la               \
+       $(top_builddir)/calendar/libical/src/libical/libical-evolution.la       \
+       $(top_builddir)/libedataserver/libedataserver-1.2.la                    \
+       $(EVOLUTION_CALENDAR_LIBS)
 
 libecalbackendfile_la_LDFLAGS =                \
-       -module -avoid-version
+       -module -avoid-version $(NO_UNDEFINED)

diff --git a/calendar/backends/file/e-cal-backend-file-factory.c b/calendar/backends/file/e-cal-backend-file-factory.c
index 075ce89..6eb0ca4 100644 (file)
--- a/calendar/backends/file/e-cal-backend-file-factory.c
+++ b/calendar/backends/file/e-cal-backend-file-factory.c
@@ -11,7 +11,6 @@
 #include <config.h>
 #endif
 
-#include <pthread.h>
 #include <string.h>
 
 #include "e-cal-backend-file-factory.h"