[evolution/wip-webkit2] Add web-extension dirs to SUBDIRS in modules Makefiles
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/wip-webkit2] Add web-extension dirs to SUBDIRS in modules Makefiles
- Date: Thu, 31 Oct 2013 12:48:32 +0000 (UTC)
commit 1bf41ded513f02661023700d33b924877660fd3b
Author: Tomas Popela <tpopela redhat com>
Date: Thu Oct 31 13:46:35 2013 +0100
Add web-extension dirs to SUBDIRS in modules Makefiles
modules/itip-formatter/Makefile.am | 2 +-
modules/mail/Makefile.am | 2 ++
modules/mail/web-extension/Makefile.am | 6 +++++-
.../mail/web-extension/module-mail-web-extension.c | 2 ++
modules/prefer-plain/Makefile.am | 2 +-
modules/prefer-plain/web-extension/Makefile.am | 4 ++--
modules/text-highlight/Makefile.am | 2 ++
7 files changed, 15 insertions(+), 5 deletions(-)
---
diff --git a/modules/itip-formatter/Makefile.am b/modules/itip-formatter/Makefile.am
index 1062b13..1059cb2 100644
--- a/modules/itip-formatter/Makefile.am
+++ b/modules/itip-formatter/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = plugin
+SUBDIRS = plugin web-extension
@EVO_PLUGIN_RULE@
diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am
index 29e8388..40073df 100644
--- a/modules/mail/Makefile.am
+++ b/modules/mail/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS=web-extension
+
module_LTLIBRARIES = module-mail.la
module_mail_la_CPPFLAGS = \
diff --git a/modules/mail/web-extension/Makefile.am b/modules/mail/web-extension/Makefile.am
index 6138f71..9e5c835 100644
--- a/modules/mail/web-extension/Makefile.am
+++ b/modules/mail/web-extension/Makefile.am
@@ -2,10 +2,14 @@ webextensions_LTLIBRARIES = libmodulemailwebextension.la
libmodulemailwebextension_la_SOURCES = \
module-mail-web-extension.c \
- module-mail-web-extension.h
+ module-mail-web-extension.h \
+ $(top_srcdir)/e-util/e-dom-utils.c \
+ $(top_srcdir)/e-util/e-dom-utils.h
libmodulemailwebextension_la_CPPFLAGS = \
-DWEBEXTENSIONS_COMPILATION \
+ -DEVOLUTION_IMAGESDIR=\"${imagesdir}\" \
+ -I$(top_srcdir)/e-util \
$(GNOME_PLATFORM_CFLAGS) \
$(AM_CPPFLAGS) \
$(WEB_EXTENSIONS_CFLAGS)
diff --git a/modules/mail/web-extension/module-mail-web-extension.c
b/modules/mail/web-extension/module-mail-web-extension.c
index 9f1cd8f..11fb78c 100644
--- a/modules/mail/web-extension/module-mail-web-extension.c
+++ b/modules/mail/web-extension/module-mail-web-extension.c
@@ -24,6 +24,8 @@
#include "../module-mail-dom-utils.h"
+#include <e-util/e-dom-utils.h>
+
/* FIXME Clean it */
static GDBusConnection *dbus_connection;
diff --git a/modules/prefer-plain/Makefile.am b/modules/prefer-plain/Makefile.am
index d48a445..06590cc 100644
--- a/modules/prefer-plain/Makefile.am
+++ b/modules/prefer-plain/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=plugin
+SUBDIRS = plugin web-extension
module_LTLIBRARIES = module-prefer-plain.la
diff --git a/modules/prefer-plain/web-extension/Makefile.am b/modules/prefer-plain/web-extension/Makefile.am
index b7202d9..8a26881 100644
--- a/modules/prefer-plain/web-extension/Makefile.am
+++ b/modules/prefer-plain/web-extension/Makefile.am
@@ -1,8 +1,8 @@
webextensions_LTLIBRARIES = libmodulepreferplainwebextension.la
libmodulepreferplainwebextension_la_SOURCES = \
- module-preferplain-web-extension.c \
- module-preferplain-web-extension.h
+ module-prefer-plain-web-extension.c \
+ module-prefer-plain-web-extension.h
libmodulepreferplainwebextension_la_CPPFLAGS = \
-DWEBEXTENSIONS_COMPILATION \
diff --git a/modules/text-highlight/Makefile.am b/modules/text-highlight/Makefile.am
index ad9c9ef..d37c20b 100644
--- a/modules/text-highlight/Makefile.am
+++ b/modules/text-highlight/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = web-extension
+
module_LTLIBRARIES = module-text-highlight.la
module_text_highlight_la_CPPFLAGS = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]