From 4ba09274d6d393568a06c483bf4934ea4707a604 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Thu, 24 Jan 2002 23:16:18 +0000 Subject: 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 --- my-evolution/Makefile.am | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) (limited to 'my-evolution/Makefile.am') 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 -- cgit v1.2.3