Makefile.am addressbook/Makefile.am calendar/Makefile.am Use the fake

2005-06-18  Tor Lillqvist  <tml@novell.com>

	* Makefile.am
	* addressbook/Makefile.am
	* calendar/Makefile.am
	* widgets/Makefile.am: Use the fake "bootstrap" libraries on Win32
	to get around circular dependencies. Use NO_UNDEFINED.

	* Makefile.am: No need to pass -I pointing to this directory
	itself, all inclusions of headers from here are with
	doublequotes. Link with libeutil. No need to link with REGEX_LIBS.

	* addressbook/Makefile.am
	* calendar/Makefile.am
	* widgets/Makefile.am: Prune out superfluous -I options and -D
	options for EVOLUTION_* pathname macros that aren't used in the
	source files in that directory.

	* addressbook/Makefile.am: Drop A11Y_CFLAGS, its a subset of
	EVOLUTION_ADDRESSBOOK_CFLAGS anyway. Link with
	EVOLUTION_ADDRESSBOOK_LIBS.

	* a11y/addressbook/ea-addressbook.c: Include headers from the same
	directory as such.

	* calendar/Makefile.am: Drop A11Y_CFLAGS, its a subset of
	EVOLUTION_CALENDAR_CFLAGS anyway. Link with
	EVOLUTION_CALENDAR_LIBS.

	* e-table/Makefile.am (INCLUDES)
	* e-text/Makefile.am (INCLUDES): Drop the undefined
	GNOME_BONOBO_CFLAGS and GNOME_INCLUDEDIR. Drop GNOME_FULL_CFLAGS,
	it's a subset of EXTRA_GNOME_CFLAGS.

	* widgets/Makefile.am: E_WIDGETS_CFLAGS is enough. No need for
	EVOLUTION_CALENDAR_CFLAGS, which . Link with E_WIDGET_LIBS. Drop
	A11Y_CFLAGS, subset of E_WIDGET_CFLAGS.

svn path=/trunk/; revision=29533

2 files changed, 25 insertions, 27 deletions

diff --git a/a11y/addressbook/Makefile.am b/a11y/addressbook/Makefile.am
index 5a39f32581..1f0c9ff08b 100644
--- a/a11y/addressbook/Makefile.am
+++ b/a11y/addressbook/Makefile.am
@@ -1,35 +1,33 @@
+if OS_WIN32
+WIN32_BOOTSTRAP_LIBS =						\
+	$(top_builddir)/win32/libemiscwidgets.la		\
+	$(top_builddir)/win32/libevolution-addressbook.la
+endif
+
 privlib_LTLIBRARIES = libevolution-addressbook-a11y.la
 
 INCLUDES =						\
 	-DG_LOG_DOMAIN=\"evolution-a11y\"		\
 	-I$(top_srcdir)		                        \
-	-I$(top_srcdir)/widgets	                        \
 	-I$(top_srcdir)/a11y				\
-	-I$(top_srcdir)/a11y/addressbook		\
+	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/shell				\
-	-I$(top_srcdir)/addressbook			\
-	-I$(top_srcdir)/addressbook/gui			\
 	-I$(top_srcdir)/addressbook/gui/widgets		\
-	-I$(top_srcdir)/addressbook/gui/contact-editor	\
-	-I$(top_srcdir)/addressbook/backend             \
-	-I$(top_srcdir)/addressbook/backend/ebook       \
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
-	-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\"	\
-	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"	\
 	-DG_DISABLE_DEPRECATED				\
-	-DPREFIX=\""$(prefix)"\"			\
-	$(A11Y_CFLAGS)					\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
-libevolution_addressbook_a11y_la_SOURCES =		\
-			ea-minicard.c  			\
-			ea-minicard.h			\
-			ea-minicard-view.c		\
-			ea-minicard-view.h		\
-			ea-addressbook-view.c		\
-			ea-addressbook-view.h		\
-			ea-addressbook.c		\
-			ea-addressbook.h
+libevolution_addressbook_a11y_la_SOURCES =	\
+	ea-minicard.c				\
+	ea-minicard.h				\
+	ea-minicard-view.c			\
+	ea-minicard-view.h			\
+	ea-addressbook-view.c			\
+	ea-addressbook-view.h			\
+	ea-addressbook.c			\
+	ea-addressbook.h
+
+libevolution_addressbook_a11y_la_LDFLAGS = $(NO_UNDEFINED)
+
+libevolution_addressbook_a11y_la_LIBADD =	\
+	$(WIN32_BOOTSTRAP_LIBS)			\
+	$(EVOLUTION_ADDRESSBOOK_LIBS)
diff --git a/a11y/addressbook/ea-addressbook.c b/a11y/addressbook/ea-addressbook.c
index f218022ef9..51ae26ba97 100644
--- a/a11y/addressbook/ea-addressbook.c
+++ b/a11y/addressbook/ea-addressbook.c
@@ -26,9 +26,9 @@
 #include <text/e-text.h>
 #include "ea-factory.h"
 #include "ea-addressbook.h"
-#include "addressbook/ea-minicard.h"
-#include "addressbook/ea-minicard-view.h"
-#include "addressbook/ea-addressbook-view.h"
+#include "ea-minicard.h"
+#include "ea-minicard-view.h"
+#include "ea-addressbook-view.h"
 
 EA_FACTORY_GOBJECT (EA_TYPE_MINICARD, ea_minicard, ea_minicard_new);
 EA_FACTORY_GOBJECT (EA_TYPE_MINICARD_VIEW, ea_minicard_view, ea_minicard_view_new);