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

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

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

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

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 8715503..aacc194 100644 (file)
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -2,13 +2,15 @@
 
        * backends/contacts/Makefile.am
        * backends/file/Makefile.am
-       * backends/groupwise/Makefile.am: Link with all used
-       libraries. Use -no-undefined on Win32.
+       * backends/groupwise/Makefile.am
+       * backends/http/Makefile.am: Link with all used libraries. Use
+       -no-undefined on Win32.
 
        * backends/contacts/e-cal-backend-contacts-factory.c
        * backends/file/e-cal-backend-file-factory.c
-       * backends/file/e-cal-backend-groupwise-factory.c: Drop inclusion
-       of <pthread.h>, these files do not use any pthread API.
+       * backends/file/e-cal-backend-groupwise-factory.c
+       * backends/file/e-cal-backend-http-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/http/Makefile.am b/calendar/backends/http/Makefile.am
index 91b9cc5..3c07c61 100644 (file)
--- a/calendar/backends/http/Makefile.am
+++ b/calendar/backends/http/Makefile.am
@@ -19,9 +19,12 @@ libecalbackendhttp_la_SOURCES =              \
        e-cal-backend-http.c            \
        e-cal-backend-http.h
 
-libecalbackendhttp_la_LIBADD =                                                 \
-       $(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la               \
+libecalbackendhttp_la_LIBADD =                                         \
+       $(top_builddir)/calendar/libecal/libecal-1.2.la                 \
+       $(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la       \
+       $(top_builddir)/libedataserver/libedataserver-1.2.la            \
+       $(EVOLUTION_CALENDAR_LIBS)                                      \
        $(SOUP_LIBS)
 
 libecalbackendhttp_la_LDFLAGS =                \
-       -module -avoid-version
+       -module -avoid-version $(NO_UNDEFINED)

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