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 /calendar/gui | |
| 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 'calendar/gui')
| -rw-r--r-- | calendar/gui/Makefile.am | 14 | ||||
| -rw-r--r-- | calendar/gui/alarm-notify/Makefile.am | 26 | ||||
| -rw-r--r-- | calendar/gui/dialogs/Makefile.am | 7 |
3 files changed, 15 insertions, 32 deletions
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 20567ced8a..56fab01684 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -49,16 +49,13 @@ INCLUDES = \ -I$(top_builddir)/addressbook/backend/ebook \ -I$(top_srcdir)/widgets \ -I$(includedir) \ - $(BONOBO_HTML_GNOME_CFLAGS) \ - $(GNOME_VFS_CFLAGS) \ - $(GAL_CFLAGS) \ - $(BONOBO_CONF_CFLAGS) \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ - -DEVOLUTION_IMAGESDIR=\""$(datadir)"/images/evolution\" + -DEVOLUTION_IMAGESDIR=\""$(datadir)"/images/evolution\" \ + $(EVOLUTION_CALENDAR_CFLAGS) iconsdir = $(datadir)/images/evolution @@ -176,12 +173,7 @@ evolution_calendar_LDADD = \ dialogs/libcal-dialogs.a \ $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.a \ $(top_builddir)/widgets/misc/libemiscwidgets.a \ - $(EXTRA_GNOME_LIBS) \ - $(BONOBO_HTML_GNOME_LIBS) \ - $(GNOME_VFS_LIBS) \ - $(BONOBO_CONF_LIBS) \ - $(GAL_LIBS) \ - $(INTLLIBS) + $(EVOLUTION_CALENDAR_LIBS) evolution_calendar_LDFLAGS = -export-dynamic diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am index 959319fc1d..6d77398ade 100644 --- a/calendar/gui/alarm-notify/Makefile.am +++ b/calendar/gui/alarm-notify/Makefile.am @@ -28,14 +28,11 @@ INCLUDES = \ -I$(top_builddir)/libical/src/libical \ -I$(top_srcdir)/widgets \ -I$(includedir) \ - $(BONOBO_VFS_GNOME_CFLAGS) \ - $(BONOBO_CONF_CFLAGS) \ - $(BONOBO_HTML_GNOME_CFLAGS) \ - $(EXTRA_GNOME_CFLAGS) \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \ - -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" + -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ + $(EVOLUTION_CALENDAR_CFLAGS) iconsdir = $(datadir)/images/evolution @@ -58,19 +55,14 @@ evolution_alarm_notify_SOURCES = \ save.c \ save.h -evolution_alarm_notify_LDADD = \ - libalarm.a \ - $(top_builddir)/calendar/cal-client/libcal-client.la \ - $(top_builddir)/calendar/cal-util/libcal-util.la \ +evolution_alarm_notify_LDADD = \ + libalarm.a \ + $(top_builddir)/calendar/cal-client/libcal-client.la \ + $(top_builddir)/calendar/cal-util/libcal-util.la \ $(top_builddir)/libical/src/libical/libical-evolution.la \ - $(top_builddir)/libwombat/libwombat.la \ - $(top_builddir)/e-util/libeutil.la \ - $(BONOBO_CONF_LIBS) \ - $(BONOBO_VFS_GNOME_LIBS) \ - $(BONOBO_HTML_GNOME_LIBS) \ - $(EXTRA_GNOME_LIBS) \ - $(GAL_LIBS) \ - $(INTLLIBS) + $(top_builddir)/libwombat/libwombat.la \ + $(top_builddir)/e-util/libeutil.la \ + $(EVOLUTION_CALENDAR_LIBS) evolution_alarm_notify_LDFLAGS = -export-dynamic diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am index 54a793fdb5..aa107d84e0 100644 --- a/calendar/gui/dialogs/Makefile.am +++ b/calendar/gui/dialogs/Makefile.am @@ -25,13 +25,12 @@ INCLUDES = \ -I$(top_srcdir)/addressbook/backend/ebook \ -I$(top_builddir)/addressbook/backend/ebook \ -I$(includedir) \ - $(EXTRA_GNOME_CFLAGS) \ - -DEVOLUTION_DATADIR=\""$(datadir)"\" \ + -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ - $(BONOBO_VFS_GNOME_CFLAGS) \ - -DGNOMELOCALEDIR=\""$(localedir)"\" + -DGNOMELOCALEDIR=\""$(localedir)"\" \ + $(EVOLUTION_CALENDAR_CFLAGS) noinst_LIBRARIES = libcal-dialogs.a |