diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2002-01-25 07:16:18 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2002-01-25 07:16:18 +0800 |
| commit | 4ba09274d6d393568a06c483bf4934ea4707a604 (patch) | |
| tree | 8bb9f22fe18024c733e233f963c621c39ed460f4 /my-evolution | |
| parent | d656b69c9bd1de52d6991e1694fd4dcf9856951c (diff) | |
| download | gsoc2013-evolution-4ba09274d6d393568a06c483bf4934ea4707a604.tar gsoc2013-evolution-4ba09274d6d393568a06c483bf4934ea4707a604.tar.gz gsoc2013-evolution-4ba09274d6d393568a06c483bf4934ea4707a604.tar.bz2 gsoc2013-evolution-4ba09274d6d393568a06c483bf4934ea4707a604.tar.lz gsoc2013-evolution-4ba09274d6d393568a06c483bf4934ea4707a604.tar.xz gsoc2013-evolution-4ba09274d6d393568a06c483bf4934ea4707a604.tar.zst gsoc2013-evolution-4ba09274d6d393568a06c483bf4934ea4707a604.zip | |
Clean up some of the Makefiles so we dont' link every library multiple
times, causing big libtool 1.4 pain.
svn path=/trunk/; revision=15461
Diffstat (limited to 'my-evolution')
| -rw-r--r-- | my-evolution/ChangeLog | 5 | ||||
| -rw-r--r-- | my-evolution/Makefile.am | 28 |
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 |