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 --- calendar/ChangeLog | 13 +++++++++++++ calendar/cal-client/Makefile.am | 15 ++++++--------- calendar/cal-util/Makefile.am | 8 ++++---- calendar/conduits/calendar/Makefile.am | 11 ++--------- calendar/conduits/todo/Makefile.am | 11 ++--------- calendar/gui/Makefile.am | 14 +++----------- calendar/gui/alarm-notify/Makefile.am | 26 +++++++++----------------- calendar/gui/dialogs/Makefile.am | 7 +++---- calendar/importers/Makefile.am | 3 +-- calendar/pcs/Makefile.am | 5 ++--- 10 files changed, 45 insertions(+), 68 deletions(-) (limited to 'calendar') diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 494b6ac008..d15d0b8ca8 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,16 @@ +2002-01-24 Ettore Perazzoli + + * conduits/calendar/Makefile.am: Use + EVOLUTION_CALENDAR_CONDUIT_LIBS and + EVOLUTION_CALENDAR_CONDUIT_CFLAGS. + * conduits/todo/Makefile.am: Likewise. + + * cal-client/Makefile.am: Use EVOLUTION_CALENDAR_LIBS and + EVOLUTION_CALENDAR_CFLAGS. + * cal-util/Makefile.am: Likewise. + * gui/alarm-notify/Makefile.am: Likewise. + * gui/Makefile.am: Likewise. + 2002-01-23 Ettore Perazzoli * gui/component-factory.c (create_object): Pass a NULL @icon to diff --git a/calendar/cal-client/Makefile.am b/calendar/cal-client/Makefile.am index a87805002b..6719174446 100644 --- a/calendar/cal-client/Makefile.am +++ b/calendar/cal-client/Makefile.am @@ -30,8 +30,7 @@ INCLUDES = \ -I$(top_srcdir)/libical/src/libical \ -I$(top_builddir)/libwombat \ -I$(top_srcdir)/libwombat \ - $(BONOBO_GNOME_CFLAGS) \ - $(BONOBO_CONF_CFLAGS) + $(EVOLUTION_CALENDAR_CFLAGS) lib_LTLIBRARIES = libcal-client.la @@ -76,14 +75,12 @@ client_test_INCLUDES = \ $(INCLUDES) \ -DG_LOG_DOMAIN=\"client-test\" -client_test_LDADD = \ - $(BONOBO_VFS_GNOME_LIBS) \ - $(EXTRA_GNOME_LIBS) \ - $(BONOBO_CONF_LIBS) \ - $(top_builddir)/calendar/cal-util/libcal-util.la \ - $(top_builddir)/libversit/libversit.la \ +client_test_LDADD = \ + $(EVOLUTION_CALENDAR_LIBS) \ + $(top_builddir)/calendar/cal-util/libcal-util.la \ + $(top_builddir)/libversit/libversit.la \ $(top_builddir)/libical/src/libical/libical-evolution.la \ - $(top_builddir)/libwombat/libwombat.la \ + $(top_builddir)/libwombat/libwombat.la \ libcal-client.la BUILT_SOURCES = $(CORBA_GENERATED) diff --git a/calendar/cal-util/Makefile.am b/calendar/cal-util/Makefile.am index c0cbaf2bd7..c300eb3ad4 100644 --- a/calendar/cal-util/Makefile.am +++ b/calendar/cal-util/Makefile.am @@ -42,8 +42,8 @@ libcal_util_static_la_LDFLAGS = --all-static test_recur_SOURCES = \ test-recur.c -test_recur_LDADD = \ - libcal-util.la \ - $(top_builddir)/libversit/libversit.la \ +test_recur_LDADD = \ + libcal-util.la \ + $(top_builddir)/libversit/libversit.la \ $(top_builddir)/libical/src/libical/libical-evolution.la \ - $(EXTRA_GNOME_LIBS) + $(EVOLUTION_CALENDAR_LIBS) diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am index 3cdbca5596..b44f22ba43 100644 --- a/calendar/conduits/calendar/Makefile.am +++ b/calendar/conduits/calendar/Makefile.am @@ -6,10 +6,7 @@ INCLUDES = \ -I$(top_builddir)/libical/src/libical \ -I$(top_srcdir)/e-util \ -I$(top_builddir)/e-util \ - $(BONOBO_GNOME_CFLAGS) \ - $(BONOBO_CONF_CFLAGS) \ - $(PISOCK_CFLAGS) \ - $(GNOME_PILOT_CFLAGS) + $(EVOLUTION_CALENDAR_CONDUIT_CFLAGS) # Calendar Conduit e_calendar_conduitsdir=$(libdir)/gnome-pilot/conduits @@ -26,11 +23,7 @@ libecalendar_conduit_la_LIBADD = \ $(top_builddir)/libical/src/libical/libical-static.la \ $(top_builddir)/libwombat/libwombat-static.la \ $(top_builddir)/e-util/libeconduit-static.la \ - $(BONOBO_GNOME_LIBS) \ - $(BONOBO_CONF_LIBS) \ - $(PISOCK_LIBS) \ - $(GNOME_LIBDIR) \ - $(GNOME_LIBS) + $(EVOLUTION_CALENDAR_CONDUIT_LIBS) e-calendar.conduit: e-calendar.conduit.in Makefile sed -e 's^\@prefix\@^$(prefix)^g' \ diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am index b5ccaf429f..367e7b7a15 100644 --- a/calendar/conduits/todo/Makefile.am +++ b/calendar/conduits/todo/Makefile.am @@ -6,10 +6,7 @@ INCLUDES = \ -I$(top_builddir)/libical/src/libical \ -I$(top_srcdir)/e-util \ -I$(top_builddir)/e-util \ - $(BONOBO_GNOME_CFLAGS) \ - $(BONOBO_CONF_CFLAGS) \ - $(PISOCK_CFLAGS) \ - $(GNOME_PILOT_CFLAGS) + $(EVOLUTION_CALENDAR_CONDUIT_CFLAGS) # ToDo Conduit e_todo_conduitsdir=$(libdir)/gnome-pilot/conduits @@ -26,11 +23,7 @@ libetodo_conduit_la_LIBADD = \ $(top_builddir)/libical/src/libical/libical-static.la \ $(top_builddir)/libwombat/libwombat-static.la \ $(top_builddir)/e-util/libeconduit-static.la \ - $(BONOBO_GNOME_LIBS) \ - $(BONOBO_CONF_LIBS) \ - $(PISOCK_LIBS) \ - $(GNOME_LIBDIR) \ - $(GNOME_LIBS) + $(EVOLUTION_CALENDAR_CONDUIT_LIBS) e-todo.conduit: e-todo.conduit.in Makefile sed -e 's^\@prefix\@^$(prefix)^g' \ 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 diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am index 22f3b41a80..0d57acc58b 100644 --- a/calendar/importers/Makefile.am +++ b/calendar/importers/Makefile.am @@ -12,8 +12,7 @@ INCLUDES = \ -I$(top_builddir)/calendar \ -I$(top_srcdir)/libical/src/libical \ -I$(top_builddir)/libical/src/libical \ - $(BONOBO_GNOME_CFLAGS) \ - $(GNOME_INCLUDEDIR) + $(EVOLUTION_CALENDAR_CFLAGS) evolution_calendar_importer_SOURCES = \ evolution-calendar-importer.h \ diff --git a/calendar/pcs/Makefile.am b/calendar/pcs/Makefile.am index 4db9b0cca3..57c24d3130 100644 --- a/calendar/pcs/Makefile.am +++ b/calendar/pcs/Makefile.am @@ -6,9 +6,8 @@ INCLUDES = \ -I$(top_builddir)/libical/src/libical \ -I$(top_srcdir)/libwombat \ -I$(top_builddir)/libwombat \ - $(BONOBO_VFS_GNOME_CFLAGS) \ - $(EXTRA_GNOME_CFLAGS) \ - -DGNOMELOCALEDIR=\""$(localedir)"\" + -DGNOMELOCALEDIR=\""$(localedir)"\" \ + $(EVOLUTION_CALENDAR_CFLAGS) CORBA_GENERATED = \ evolution-calendar.h \ -- cgit v1.2.3