aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2003-02-07 00:31:54 +0800
committerDan Winship <danw@src.gnome.org>2003-02-07 00:31:54 +0800
commit69b0509f10188551fa1f5d0e9999002a27372827 (patch)
treee4e3fdb0c6644903b76a38cf1e5b61de3f0ed972
parent50ff525b79aaa97ab627d5dfd4c9e65fe013ecce (diff)
downloadgsoc2013-evolution-69b0509f10188551fa1f5d0e9999002a27372827.tar
gsoc2013-evolution-69b0509f10188551fa1f5d0e9999002a27372827.tar.gz
gsoc2013-evolution-69b0509f10188551fa1f5d0e9999002a27372827.tar.bz2
gsoc2013-evolution-69b0509f10188551fa1f5d0e9999002a27372827.tar.lz
gsoc2013-evolution-69b0509f10188551fa1f5d0e9999002a27372827.tar.xz
gsoc2013-evolution-69b0509f10188551fa1f5d0e9999002a27372827.tar.zst
gsoc2013-evolution-69b0509f10188551fa1f5d0e9999002a27372827.zip
Remove *dir defs that are in configure.in now (INCLUDES): clean up using
* Makefile.am: Remove *dir defs that are in configure.in now (INCLUDES): clean up using new *dir variables (libevolution_mail_la_LDFLAGS): remove -export-dynamic, add -module * importers/Makefile.am (INCLUDES): change EVOLUTION_DATADIR to EVOLUTION_PRIVDATADIR * importers/netscape-importer.c (netscape_import_filters): use EVOLUTION_PRIVDATADIR svn path=/trunk/; revision=19805
-rw-r--r--mail/ChangeLog13
-rw-r--r--mail/Makefile.am63
-rw-r--r--mail/importers/Makefile.am4
-rw-r--r--mail/importers/netscape-importer.c2
4 files changed, 44 insertions, 38 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 501e3e15d6..5f1de47862 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,16 @@
+2003-02-06 Dan Winship <danw@ximian.com>
+
+ * Makefile.am: Remove *dir defs that are in configure.in now
+ (INCLUDES): clean up using new *dir variables
+ (libevolution_mail_la_LDFLAGS): remove -export-dynamic, add
+ -module
+
+ * importers/Makefile.am (INCLUDES): change EVOLUTION_DATADIR to
+ EVOLUTION_PRIVDATADIR
+
+ * importers/netscape-importer.c (netscape_import_filters): use
+ EVOLUTION_PRIVDATADIR
+
2003-02-06 Larry Ewing <lewing@ximian.com>
* mail-session.c (pass_activate): add an activate handler to the
diff --git a/mail/Makefile.am b/mail/Makefile.am
index fe2713070e..89ff12ecfb 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -6,34 +6,34 @@ SUBDIRS = importers
importerdir = $(privlibdir)/evolution-mail-importers
-INCLUDES = \
- -I$(top_srcdir)/widgets \
- -I$(top_srcdir)/widgets/e-text \
- -I$(top_srcdir)/widgets/misc \
- -I$(top_srcdir)/camel \
- -I$(top_srcdir) \
- -I$(top_srcdir)/composer \
- -I$(top_builddir)/composer \
- -I$(top_builddir)/shell \
- -I$(top_srcdir)/shell \
- -I$(top_srcdir)/shell/importer \
- -I$(top_builddir)/shell/importer \
- -I$(top_srcdir)/addressbook/backend \
- -I$(top_builddir)/addressbook/backend \
- $(EVOLUTION_MAIL_CFLAGS) \
- -DEVOLUTION_DATADIR=\""$(datadir)"\" \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
- -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
- -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
- -DEVOLUTION_IMAGES=\""$(datadir)"/evolution-$(BASE_VERSION)/images\" \
- -DEVOLUTION_GALVIEWSDIR=\"$(datadir)/evolution-$(BASE_VERSION)/views\" \
- -DEVOLUTION_BUTTONSDIR=\""$(buttonsdir)"\" \
- -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
- -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
- -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
- -DMAIL_IMPORTERSDIR=\""$(importerdir)"\" \
- -DG_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED \
+INCLUDES = \
+ -I$(top_srcdir)/widgets \
+ -I$(top_srcdir)/widgets/e-text \
+ -I$(top_srcdir)/widgets/misc \
+ -I$(top_srcdir)/camel \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/composer \
+ -I$(top_builddir)/composer \
+ -I$(top_builddir)/shell \
+ -I$(top_srcdir)/shell \
+ -I$(top_srcdir)/shell/importer \
+ -I$(top_builddir)/shell/importer \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
+ $(EVOLUTION_MAIL_CFLAGS) \
+ -DEVOLUTION_DATADIR=\""$(datadir)"\" \
+ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
+ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
+ -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
+ -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \
+ -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \
+ -DEVOLUTION_BUTTONSDIR=\""$(buttonsdir)"\" \
+ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
+ -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
+ -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
+ -DMAIL_IMPORTERSDIR=\""$(importerdir)"\" \
+ -DG_DISABLE_DEPRECATED \
+ -DGTK_DISABLE_DEPRECATED \
-DG_LOG_DOMAIN=\"evolution-mail\"
component_LTLIBRARIES = libevolution-mail.la
@@ -161,7 +161,7 @@ libevolution_mail_la_LIBADD = \
$(EVOLUTION_MAIL_LIBS)
libevolution_mail_la_LDFLAGS = \
- -export-dynamic -avoid-version
+ -avoid-version -module
#evolution_mail_upgrade_SOURCES = upgrade-mailer.c
#evolution_mail_upgrade_LDADD = \
@@ -171,23 +171,18 @@ libevolution_mail_la_LDFLAGS = \
server_in_files = GNOME_Evolution_Mail.server.in.in
-serverdir = $(libdir)/bonobo/servers
server_DATA = $(server_in_files:.server.in.in=.server)
$(server_in_files:.server.in.in=.server.in): $(server_in_files)
sed -e "s|\@COMPONENTDIR\@|$(componentdir)|" $< > $@
@INTLTOOL_SERVER_RULE@
-gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade
glade_DATA = mail-config.glade local-config.glade subscribe-dialog.glade message-tags.glade
-etspecdir = $(datadir)/evolution-$(BASE_VERSION)/etspec/
etspec_DATA = mail-accounts.etspec message-list.etspec subscribe-dialog.etspec
schemadir = $(GCONF_SCHEMA_FILE_DIR)
schema_DATA = evolution-mail.schemas
-buttonsdir = $(datadir)/evolution-$(BASE_VERSION)/images/buttons
-
idl_DATA = Mailer.idl
$(EVOLUTION_MAIL_CORBA_GENERATED): Mailer.idl
diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am
index e9d35224f1..b092cc3e96 100644
--- a/mail/importers/Makefile.am
+++ b/mail/importers/Makefile.am
@@ -10,11 +10,10 @@ INCLUDES = -I.. \
-I$(top_srcdir) \
-I$(top_srcdir)/shell \
-I$(top_builddir)/shell \
- -I$(includedir) \
-DG_LOG_DOMAIN=\"evolution-mail-importer\" \
-I$(top_srcdir)/addressbook/backend \
-I$(top_builddir)/addressbook/backend \
- -DEVOLUTION_DATADIR=\""$(datadir)"\" \
+ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \
$(IMPORTERS_CFLAGS)
liboutlook_la_SOURCES = \
@@ -82,7 +81,6 @@ libevolution_pine_importer_la_LIBADD = \
# $(IMPORTERS_LIBS)
-serverdir = $(libdir)/bonobo/servers
server_in_files = GNOME_Evolution_Mail_Mbox_Importer.server.in.in \
GNOME_Evolution_Mail_Outlook_Importer.server.in.in \
GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in \
diff --git a/mail/importers/netscape-importer.c b/mail/importers/netscape-importer.c
index 501d7681ae..4a4ddd656e 100644
--- a/mail/importers/netscape-importer.c
+++ b/mail/importers/netscape-importer.c
@@ -1192,7 +1192,7 @@ netscape_import_filters (NsImporter *importer)
fc = filter_context_new ();
user = g_concat_dir_and_file (g_get_home_dir (),
"evolution/filters.xml");
- system = EVOLUTION_DATADIR "/evolution-" BASE_VERSION "/filtertypes.xml";
+ system = EVOLUTION_PRIVDATADIR "/filtertypes.xml";
if (rule_context_load ((RuleContext *)fc, system, user) < 0) {
g_warning ("Could not load rule context.");