aboutsummaryrefslogtreecommitdiffstats
path: root/my-evolution
diff options
context:
space:
mode:
Diffstat (limited to 'my-evolution')
-rw-r--r--my-evolution/ChangeLog5
-rw-r--r--my-evolution/Makefile.am28
2 files changed, 14 insertions, 19 deletions
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index 93f1c4afed..3cf2738e72 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-24 Ettore Perazzoli <ettore@ximian.com>
+
+ * Makefile.am: Use EVOLUTION_EXECUTIVE_SUMMARY_CFLAGS and
+ EVOLUTION_EXECUTIVE_SUMMARY_LIBS.
+
2002-01-24 Iain Holmes <iain@ximian.com>
* Locations: Applied the Ukraine patch from Leonid Kanter
diff --git a/my-evolution/Makefile.am b/my-evolution/Makefile.am
index 6e057d9493..36a6ba0c8c 100644
--- a/my-evolution/Makefile.am
+++ b/my-evolution/Makefile.am
@@ -8,16 +8,11 @@ INCLUDES = \
-I$(top_builddir)/calendar/cal-client \
-I$(top_srcdir)/libical/src/libical \
-I$(top_builddir)/libical/src/libical \
- $(EXTRA_GNOME_CFLAGS) \
- $(GNOME_VFS_CFLAGS) \
- $(GTKHTML_CFLAGS) \
- $(BONOBO_CONF_CFLAGS) \
- $(BONOBO_GNOME_CFLAGS) \
- $(SOUP_CFLAGS) \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
- -DG_LOG_DOMAIN=\"evolution-executive-summary\"
+ -DG_LOG_DOMAIN=\"evolution-executive-summary\" \
+ $(EVOLUTION_EXECUTIVE_SUMMARY_CFLAGS)
IDLS = \
$(top_srcdir)/mail/Mail.idl
@@ -61,21 +56,16 @@ evolution_executive_summary_SOURCES = \
weather.h
evolution_executive_summary_LDADD = \
- $(top_builddir)/calendar/gui/alarm-notify/libalarm.a \
- $(top_builddir)/shell/libeshell.la \
- $(top_builddir)/widgets/misc/libemiscwidgets.a \
- $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/calendar/gui/alarm-notify/libalarm.a \
+ $(top_builddir)/shell/libeshell.la \
+ $(top_builddir)/widgets/misc/libemiscwidgets.a \
+ $(top_builddir)/e-util/libeutil.la \
$(top_builddir)/calendar/cal-client/libcal-client.la \
$(top_builddir)/calendar/cal-util/libcal-util.la \
- $(top_builddir)/libversit/libversit.la \
+ $(top_builddir)/libversit/libversit.la \
$(top_builddir)/libical/src/libical/libical-evolution.la \
- $(top_builddir)/libwombat/libwombat.la \
- $(BONOBO_GNOME_LIBS) \
- $(BONOBO_CONF_LIBS) \
- $(EXTRA_GNOME_LIBS) \
- $(SOUP_LIBS) \
- -lgal \
- $(GTKHTML_LIBS)
+ $(top_builddir)/libwombat/libwombat.la \
+ $(EVOLUTION_EXECUTIVE_SUMMARY_LIBS)
Locationdir = $(datadir)/evolution
Location_DATA = Locations