aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--a11y/ChangeLog41
-rw-r--r--a11y/Makefile.am22
-rw-r--r--a11y/addressbook/Makefile.am46
-rw-r--r--a11y/addressbook/ea-addressbook.c6
-rw-r--r--a11y/calendar/Makefile.am25
-rw-r--r--a11y/e-table/Makefile.am4
-rw-r--r--a11y/e-text/Makefile.am5
-rw-r--r--a11y/widgets/Makefile.am25
8 files changed, 102 insertions, 72 deletions
diff --git a/a11y/ChangeLog b/a11y/ChangeLog
index e2d73c0dc9..11b45da7bd 100644
--- a/a11y/ChangeLog
+++ b/a11y/ChangeLog
@@ -1,9 +1,42 @@
2005-06-18 Tor Lillqvist <tml@novell.com>
- * e-text/Makefile.am (INCLUDES)
- * e-table/Makefile.am (INCLUDES): Remove stray trailing slash from
- -I path, confuses gcc on Win32.
-
+ * 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): Remove stray trailing slash from
+ -I path, confuses gcc on Win32. 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. Link with E_WIDGET_LIBS. Drop
+ A11Y_CFLAGS, subset of E_WIDGET_CFLAGS.
+
2005-04-22 Li Yuan <li.yuan@sun.com>
* calendar/ea-day-view-main-item.c:
diff --git a/a11y/Makefile.am b/a11y/Makefile.am
index 96a9014b70..960287aa70 100644
--- a/a11y/Makefile.am
+++ b/a11y/Makefile.am
@@ -1,12 +1,19 @@
+# Somewhat odd looking to have "." in SUBDIRS, but apparently it works?
SUBDIRS = e-text e-table . calendar widgets addressbook
+if OS_WIN32
+WIN32_BOOTSTRAP_LIBS = \
+ $(top_builddir)/win32/libemiscwidgets.la \
+ $(top_builddir)/win32/libetable.la \
+ $(top_builddir)/win32/libetext.la
+endif
+
# for debug
#A11Y_CFLAGS += -pedantic -ansi -DACC_DEBUG -Werror
privlib_LTLIBRARIES = libevolution-a11y.la
INCLUDES = \
- -I$(top_srcdir)/a11y \
$(A11Y_CFLAGS)
libevolution_a11y_la_SOURCES = \
@@ -21,8 +28,11 @@ libevolution_a11yinclude_HEADERS = \
gal-a11y-util.h \
gal-a11y-factory.h
-libevolution_a11y_la_LIBADD = \
- e-text/libgal-a11y-etext.la \
- e-table/libgal-a11y-etable.la \
- $(EXTRA_GNOME_LIBS) \
- $(REGEX_LIBS)
+libevolution_a11y_la_LDFLAGS = $(NO_UNDEFINED)
+
+libevolution_a11y_la_LIBADD = \
+ $(WIN32_BOOTSTRAP_LIBS) \
+ e-text/libgal-a11y-etext.la \
+ e-table/libgal-a11y-etable.la \
+ $(top_builddir)/e-util/libeutil.la \
+ $(EXTRA_GNOME_LIBS)
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);
diff --git a/a11y/calendar/Makefile.am b/a11y/calendar/Makefile.am
index 9688fc7ead..3ad2f85921 100644
--- a/a11y/calendar/Makefile.am
+++ b/a11y/calendar/Makefile.am
@@ -3,26 +3,21 @@
# for debug
#A11Y_CFLAGS += -pedantic -ansi -DACC_DEBUG -Werror
+if OS_WIN32
+WIN32_BOOTSTRAP_LIBS = \
+ $(top_builddir)/win32/libetext.la \
+ $(top_builddir)/win32/libevolution-calendar.la
+endif
+
privlib_LTLIBRARIES = libevolution-calendar-a11y.la
INCLUDES = \
-DG_LOG_DOMAIN=\"evolution-a11y\" \
-I$(top_srcdir) \
- -I$(top_srcdir)/shell \
- -I$(top_srcdir)/calendar \
- -I$(top_srcdir)/calendar/cal-client \
-I$(top_srcdir)/calendar/gui \
-I$(top_srcdir)/widgets \
-I$(top_srcdir)/widgets/misc \
-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)
libevolution_calendar_a11y_la_SOURCES = \
@@ -51,5 +46,9 @@ libevolution_calendar_a11y_la_SOURCES = \
ea-gnome-calendar.c \
ea-gnome-calendar.h
-libevolution_calendar_a11y_la_LIBADD = \
- $(top_builddir)/a11y/libevolution-a11y.la
+libevolution_calendar_a11y_la_LDFLAGS = $(NO_UNDEFINED)
+
+libevolution_calendar_a11y_la_LIBADD = \
+ $(WIN32_BOOTSTRAP_LIBS) \
+ $(top_builddir)/a11y/libevolution-a11y.la \
+ $(EVOLUTION_CALENDAR_LIBS)
diff --git a/a11y/e-table/Makefile.am b/a11y/e-table/Makefile.am
index 71ceffa68e..0585255270 100644
--- a/a11y/e-table/Makefile.am
+++ b/a11y/e-table/Makefile.am
@@ -2,10 +2,6 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/widgets \
$(EXTRA_GNOME_CFLAGS) \
- $(GNOME_BONOBO_CFLAGS) \
- $(GNOME_INCLUDEDIR) \
- $(ICONV_CFLAGS) \
- $(GNOME_FULL_CFLAGS) \
-DG_LOG_DOMAIN=\"e-table\"
noinst_LTLIBRARIES = libgal-a11y-etable.la
diff --git a/a11y/e-text/Makefile.am b/a11y/e-text/Makefile.am
index 883983e5c0..f73efea451 100644
--- a/a11y/e-text/Makefile.am
+++ b/a11y/e-text/Makefile.am
@@ -2,11 +2,6 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/widgets \
$(EXTRA_GNOME_CFLAGS) \
- $(GNOME_BONOBO_CFLAGS) \
- $(GNOME_INCLUDEDIR) \
- $(ICONV_CFLAGS) \
- $(GNOME_FULL_CFLAGS) \
- $(GNOME_EXTRA_CFLAGS) \
-DG_LOG_DOMAIN=\"e-text\"
noinst_LTLIBRARIES = libgal-a11y-etext.la
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)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 17:18:03 +0800