From 1277e030c205ea8db370ef4e9fd3db08f422763c Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 18 Jun 2005 11:05:17 +0000 Subject: Makefile.am addressbook/Makefile.am calendar/Makefile.am Use the fake 2005-06-18 Tor Lillqvist * 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 --- a11y/widgets/Makefile.am | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'a11y/widgets') diff --git a/a11y/widgets/Makefile.am b/a11y/widgets/Makefile.am index 21bb621394..b2474bf640 100644 --- a/a11y/widgets/Makefile.am +++ b/a11y/widgets/Makefile.am @@ -2,22 +2,18 @@ # for debug #A11Y_CFLAGS += -pedantic -ansi -DACC_DEBUG -Werror +if OS_WIN32 +WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libemiscwidgets.la +endif + privlib_LTLIBRARIES = libevolution-widgets-a11y.la INCLUDES = \ -DG_LOG_DOMAIN=\"evolution-a11y\" \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -I$(top_srcdir)/a11y \ - -DEVOLUTION_DATADIR=\""$(datadir)"\" \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ - -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ - -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ - -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \ - -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \ - -DPREFIX=\""$(prefix)"\" \ - $(A11Y_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) + -I$(top_srcdir)/widgets \ + $(E_WIDGETS_CFLAGS) libevolution_widgets_a11y_la_SOURCES = \ ea-calendar-item.c \ @@ -29,6 +25,9 @@ libevolution_widgets_a11y_la_SOURCES = \ ea-widgets.c \ ea-widgets.h -libevolution_widgets_a11y_la_LIBADD = \ - $(top_builddir)/a11y/libevolution-a11y.la - +libevolution_widgets_a11y_la_LDFLAGS = $(NO_UNDEFINED) + +libevolution_widgets_a11y_la_LIBADD = \ + $(WIN32_BOOTSTRAP_LIBS) \ + $(top_builddir)/a11y/libevolution-a11y.la \ + $(E_WIDGETS_LIBS) -- cgit