From 9c3b7cbe4921f073f939b1c70e112662588122cc Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Thu, 23 Jan 2003 17:47:06 +0000 Subject: Define componentdir instead of COMPONENT_DIR. Set it to * configure.in (idldir): Define componentdir instead of COMPONENT_DIR. Set it to $privlibdir/components instead of $libdir/evolution-$(BASE_VERSION)/components. * gui/component/select-names/Makefile.am (componentdir): Remove definition; no need to set it here since it's now defined in configure.in * gui/component/Makefile.am (componentdir): Likewise. * gui/Makefile.am (componentdir): Removed definition; this is now defined in configure.in. * Makefile.am (componentdir): Removed definition; this is now defined in configure.in. * Makefile.am (componentdir): Removed definition; this is now defined in configure.in. svn path=/trunk/; revision=19588 --- addressbook/gui/component/select-names/Makefile.am | 2 -- calendar/ChangeLog | 5 +++++ calendar/gui/Makefile.am | 1 - mail/ChangeLog | 5 +++++ mail/Makefile.am | 1 - my-evolution/ChangeLog | 5 +++++ my-evolution/Makefile.am | 1 - 7 files changed, 15 insertions(+), 5 deletions(-) diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am index 87510bf90d..f678ce5e42 100644 --- a/addressbook/gui/component/select-names/Makefile.am +++ b/addressbook/gui/component/select-names/Makefile.am @@ -1,7 +1,5 @@ # CORBA stuff -componentdir = $(COMPONENT_DIR) - idl_DATA = \ Evolution-Addressbook-SelectNames.idl diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 296e890242..94df1a82ff 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,8 @@ +2003-01-23 Ettore Perazzoli + + * gui/Makefile.am (componentdir): Removed definition; this is now + defined in configure.in. + 2003-01-22 Ettore Perazzoli * pcs/cal-backend.c (cal_backend_ref_categories): Do not put the diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 066e47f91e..657e12c92d 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -31,7 +31,6 @@ BUILT_SOURCES = $(IDL_GENERATED) SUBDIRS = alarm-notify dialogs -componentdir = $(COMPONENT_DIR) component_LTLIBRARIES = libevolution-calendar.la INCLUDES = \ diff --git a/mail/ChangeLog b/mail/ChangeLog index 81213658e3..9d97b0c701 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2003-01-23 Ettore Perazzoli + + * Makefile.am (componentdir): Removed definition; this is now + defined in configure.in. + 2003-01-22 Jeffrey Stedfast * mail-config.c (mail_config_get_thread_list): Removed. diff --git a/mail/Makefile.am b/mail/Makefile.am index a6f01cedb5..8f3589ef49 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -36,7 +36,6 @@ INCLUDES = \ -DGTK_DISABLE_DEPRECATED \ -DG_LOG_DOMAIN=\"evolution-mail\" -componentdir = $(COMPONENT_DIR) component_LTLIBRARIES = libevolution-mail.la EVOLUTION_MAIL_CORBA_GENERATED = \ diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog index 81d9681dbf..7e8b045810 100644 --- a/my-evolution/ChangeLog +++ b/my-evolution/ChangeLog @@ -1,3 +1,8 @@ +2003-01-23 Ettore Perazzoli + + * Makefile.am (componentdir): Removed definition; this is now + defined in configure.in. + 2003-01-22 Ettore Perazzoli * e-summary-factory.c (control_activate): Get my-evolution.xml diff --git a/my-evolution/Makefile.am b/my-evolution/Makefile.am index b33d0adc94..470136da08 100644 --- a/my-evolution/Makefile.am +++ b/my-evolution/Makefile.am @@ -78,7 +78,6 @@ summary_libs = \ $(top_builddir)/libwombat/libwombat.la \ $(EVOLUTION_EXECUTIVE_SUMMARY_LIBS) -componentdir = $(COMPONENT_DIR) component_LTLIBRARIES = libevolution-executive-summary.la libevolution_executive_summary_la_SOURCES = $(summary_sources) libevolution_executive_summary_la_LIBADD = $(summary_libs) -- cgit