GNOME.org
 

[evolution/wip-webkit2] Link WK2 web-extensions with e-util

commit 06ba1a3ed68cd0c59d7225718d211362407a2aa6
Author: Tomas Popela <tpopela redhat com>
Date:   Wed Nov 20 10:10:21 2013 +0100

    Link WK2 web-extensions with e-util

 e-util/e-dom-utils.h                               |    3 +--
 e-util/e-util.h                                    |    1 +
 .../module-itip-formatter-dom-utils.c              |    2 +-
 modules/itip-formatter/web-extension/Makefile.am   |   14 ++++++++------
 .../module-itip-formatter-web-extension.c          |    3 ++-
 modules/mail/web-extension/Makefile.am             |   15 ++++++++-------
 .../mail/web-extension/module-mail-web-extension.c |    2 +-
 modules/prefer-plain/web-extension/Makefile.am     |   14 ++++++++------
 .../module-prefer-plain-web-extension.c            |    2 +-
 modules/text-highlight/web-extension/Makefile.am   |   14 ++++++++------
 .../module-text-highlight-web-extension.c          |    2 +-
 web-extensions/Makefile.am                         |   15 ++++++++-------
 web-extensions/evolution-web-extension.c           |    2 +-
 13 files changed, 49 insertions(+), 40 deletions(-)
---
diff --git a/e-util/e-dom-utils.h b/e-util/e-dom-utils.h
index cff73be..56916da 100644
--- a/e-util/e-dom-utils.h
+++ b/e-util/e-dom-utils.h
@@ -16,8 +16,7 @@
  *
  */
 
-#if (!defined (__E_UTIL_H_INSIDE__) && !defined (LIBEUTIL_COMPILATION)) && \
-       !defined (WEBEXTENSIONS_COMPILATION)
+#if (!defined (__E_UTIL_H_INSIDE__) && !defined (LIBEUTIL_COMPILATION))
 #error "Only <e-util/e-util.h> should be included directly."
 #endif
 
diff --git a/e-util/e-util.h b/e-util/e-util.h
index 9fbced4..e5c05b3 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -90,6 +90,7 @@
 #include <e-util/e-destination-store.h>
 #include <e-util/e-dialog-utils.h>
 #include <e-util/e-dialog-widgets.h>
+#include <e-util/e-dom-utils.h>
 #include <e-util/e-event.h>
 #include <e-util/e-file-request.h>
 #include <e-util/e-file-utils.h>
diff --git a/modules/itip-formatter/module-itip-formatter-dom-utils.c 
b/modules/itip-formatter/module-itip-formatter-dom-utils.c
index d63ce5f..8133c49 100644
--- a/modules/itip-formatter/module-itip-formatter-dom-utils.c
+++ b/modules/itip-formatter/module-itip-formatter-dom-utils.c
@@ -21,7 +21,7 @@
 #include "web-extension/module-itip-formatter-web-extension.h"
 #include "itip-view-elements-defines.h"
 
-#include "../../e-util/e-dom-utils.h"
+#include <e-util/e-util.h>
 
 void
 module_itip_formatter_dom_utils_show_button (WebKitDOMDocument *document,
diff --git a/modules/itip-formatter/web-extension/Makefile.am 
b/modules/itip-formatter/web-extension/Makefile.am
index b41ffaa..ab62dff 100644
--- a/modules/itip-formatter/web-extension/Makefile.am
+++ b/modules/itip-formatter/web-extension/Makefile.am
@@ -4,19 +4,21 @@ libmoduleitipformatterwebextension_la_SOURCES =               \
        module-itip-formatter-web-extension.c           \
        module-itip-formatter-web-extension.h           \
        ../module-itip-formatter-dom-utils.c            \
-       ../module-itip-formatter-dom-utils.h            \
-       $(top_srcdir)/e-util/e-dom-utils.c              \
-       $(top_srcdir)/e-util/e-dom-utils.h
+       ../module-itip-formatter-dom-utils.h
 
 libmoduleitipformatterwebextension_la_CPPFLAGS =       \
-       -DWEBEXTENSIONS_COMPILATION                     \
-       -DEVOLUTION_IMAGESDIR=\"${imagesdir}\"          \
-       $(GNOME_PLATFORM_CFLAGS)                        \
        $(AM_CPPFLAGS)                                  \
+       -I$(top_srcdir)                                 \
+       $(EVOLUTION_DATA_SERVER_CFLAGS)                 \
+       $(GNOME_PLATFORM_CFLAGS)                        \
+       $(GTKHTML_CFLAGS)                               \
        $(WEB_EXTENSIONS_CFLAGS)
 
 libmoduleitipformatterwebextension_la_LIBADD =         \
+       $(top_builddir)/e-util/libevolution-util.la     \
+       $(EVOLUTION_DATA_SERVER_LIBS)                   \
        $(GNOME_PLATFORM_LIBS)                          \
+       $(GTKHTML_LIBS)                                 \
        $(WEB_EXTENSIONS_LIBS)
 
 libmoduleitipformatterwebextension_la_LDFLAGS =                \
diff --git a/modules/itip-formatter/web-extension/module-itip-formatter-web-extension.c 
b/modules/itip-formatter/web-extension/module-itip-formatter-web-extension.c
index d173c83..42a1b14 100644
--- a/modules/itip-formatter/web-extension/module-itip-formatter-web-extension.c
+++ b/modules/itip-formatter/web-extension/module-itip-formatter-web-extension.c
@@ -22,8 +22,9 @@
 #include <gtk/gtk.h>
 #include <webkit2/webkit-web-extension.h>
 
+#include <e-util/e-util.h>
+
 #include "../module-itip-formatter-dom-utils.h"
-#include "../../../e-util/e-dom-utils.h"
 
 /* FIXME Clean it */
 static GDBusConnection *dbus_connection;
diff --git a/modules/mail/web-extension/Makefile.am b/modules/mail/web-extension/Makefile.am
index 9e5c835..b89d112 100644
--- a/modules/mail/web-extension/Makefile.am
+++ b/modules/mail/web-extension/Makefile.am
@@ -2,20 +2,21 @@ webextensions_LTLIBRARIES = libmodulemailwebextension.la
 
 libmodulemailwebextension_la_SOURCES =                 \
        module-mail-web-extension.c                     \
-       module-mail-web-extension.h                     \
-       $(top_srcdir)/e-util/e-dom-utils.c              \
-       $(top_srcdir)/e-util/e-dom-utils.h
+       module-mail-web-extension.h
 
 libmodulemailwebextension_la_CPPFLAGS =                        \
-       -DWEBEXTENSIONS_COMPILATION                     \
-       -DEVOLUTION_IMAGESDIR=\"${imagesdir}\"          \
-       -I$(top_srcdir)/e-util                          \
-       $(GNOME_PLATFORM_CFLAGS)                        \
        $(AM_CPPFLAGS)                                  \
+       -I$(top_srcdir)                                 \
+       $(EVOLUTION_DATA_SERVER_CFLAGS)                 \
+       $(GNOME_PLATFORM_CFLAGS)                        \
+       $(GTKHTML_CFLAGS)                               \
        $(WEB_EXTENSIONS_CFLAGS)
 
 libmodulemailwebextension_la_LIBADD =                  \
+       $(top_builddir)/e-util/libevolution-util.la     \
+       $(EVOLUTION_DATA_SERVER_LIBS)                   \
        $(GNOME_PLATFORM_LIBS)                          \
+       $(GTKHTML_LIBS)                                 \
        $(WEB_EXTENSIONS_LIBS)
 
 libmodulemailwebextension_la_LDFLAGS =                 \
diff --git a/modules/mail/web-extension/module-mail-web-extension.c 
b/modules/mail/web-extension/module-mail-web-extension.c
index 2ba53d3..ed1eebc 100644
--- a/modules/mail/web-extension/module-mail-web-extension.c
+++ b/modules/mail/web-extension/module-mail-web-extension.c
@@ -24,7 +24,7 @@
 
 #include "../module-mail-dom-utils.h"
 
-#include <e-util/e-dom-utils.h>
+#include <e-util/e-util.h>
 
 /* FIXME Clean it */
 static GDBusConnection *dbus_connection;
diff --git a/modules/prefer-plain/web-extension/Makefile.am b/modules/prefer-plain/web-extension/Makefile.am
index 93d88d0..d11385e 100644
--- a/modules/prefer-plain/web-extension/Makefile.am
+++ b/modules/prefer-plain/web-extension/Makefile.am
@@ -2,19 +2,21 @@ webextensions_LTLIBRARIES = libmodulepreferplainwebextension.la
 
 libmodulepreferplainwebextension_la_SOURCES =          \
        module-prefer-plain-web-extension.c             \
-       module-prefer-plain-web-extension.h             \
-       $(top_srcdir)/e-util/e-dom-utils.c              \
-       $(top_srcdir)/e-util/e-dom-utils.h
+       module-prefer-plain-web-extension.h
 
 libmodulepreferplainwebextension_la_CPPFLAGS =         \
-       -DWEBEXTENSIONS_COMPILATION                     \
-       -DEVOLUTION_IMAGESDIR=\"${imagesdir}\"          \
-       $(GNOME_PLATFORM_CFLAGS)                        \
        $(AM_CPPFLAGS)                                  \
+       -I$(top_srcdir)                                 \
+       $(EVOLUTION_DATA_SERVER_CFLAGS)                 \
+       $(GNOME_PLATFORM_CFLAGS)                        \
+       $(GTKHTML_CFLAGS)                               \
        $(WEB_EXTENSIONS_CFLAGS)
 
 libmodulepreferplainwebextension_la_LIBADD =           \
+       $(top_builddir)/e-util/libevolution-util.la     \
+       $(EVOLUTION_DATA_SERVER_LIBS)                   \
        $(GNOME_PLATFORM_LIBS)                          \
+       $(GTKHTML_LIBS)                                 \
        $(WEB_EXTENSIONS_LIBS)
 
 libmodulepreferplainwebextension_la_LDFLAGS =          \
diff --git a/modules/prefer-plain/web-extension/module-prefer-plain-web-extension.c 
b/modules/prefer-plain/web-extension/module-prefer-plain-web-extension.c
index 2b1e668..daee1a7 100644
--- a/modules/prefer-plain/web-extension/module-prefer-plain-web-extension.c
+++ b/modules/prefer-plain/web-extension/module-prefer-plain-web-extension.c
@@ -22,7 +22,7 @@
 #include <gtk/gtk.h>
 #include <webkit2/webkit-web-extension.h>
 
-#include "../../../e-util/e-dom-utils.h"
+#include <e-util/e-util.h>
 
 /* FIXME Clean it */
 static GDBusConnection *dbus_connection;
diff --git a/modules/text-highlight/web-extension/Makefile.am 
b/modules/text-highlight/web-extension/Makefile.am
index 014fb77..e9e3faf 100644
--- a/modules/text-highlight/web-extension/Makefile.am
+++ b/modules/text-highlight/web-extension/Makefile.am
@@ -2,19 +2,21 @@ webextensions_LTLIBRARIES = libmoduletexthighlightwebextension.la
 
 libmoduletexthighlightwebextension_la_SOURCES =                \
        module-text-highlight-web-extension.c           \
-       module-text-highlight-web-extension.h           \
-       $(top_srcdir)/e-util/e-dom-utils.c              \
-       $(top_srcdir)/e-util/e-dom-utils.h
+       module-text-highlight-web-extension.h
 
 libmoduletexthighlightwebextension_la_CPPFLAGS =       \
-       -DWEBEXTENSIONS_COMPILATION                     \
-       -DEVOLUTION_IMAGESDIR=\"${imagesdir}\"          \
-       $(GNOME_PLATFORM_CFLAGS)                        \
        $(AM_CPPFLAGS)                                  \
+       -I$(top_srcdir)                                 \
+       $(EVOLUTION_DATA_SERVER_CFLAGS)                 \
+       $(GNOME_PLATFORM_CFLAGS)                        \
+       $(GTKHTML_CFLAGS)                               \
        $(WEB_EXTENSIONS_CFLAGS)
 
 libmoduletexthighlightwebextension_la_LIBADD =         \
+       $(top_builddir)/e-util/libevolution-util.la     \
+       $(EVOLUTION_DATA_SERVER_LIBS)                   \
        $(GNOME_PLATFORM_LIBS)                          \
+       $(GTKHTML_LIBS)                                 \
        $(WEB_EXTENSIONS_LIBS)
 
 libmoduletexthighlightwebextension_la_LDFLAGS =                \
diff --git a/modules/text-highlight/web-extension/module-text-highlight-web-extension.c 
b/modules/text-highlight/web-extension/module-text-highlight-web-extension.c
index 1299b69..e3215af 100644
--- a/modules/text-highlight/web-extension/module-text-highlight-web-extension.c
+++ b/modules/text-highlight/web-extension/module-text-highlight-web-extension.c
@@ -22,7 +22,7 @@
 #include <gtk/gtk.h>
 #include <webkit2/webkit-web-extension.h>
 
-#include "../../../e-util/e-dom-utils.h"
+#include <e-util/e-util.h>
 
 /* FIXME Clean it */
 static GDBusConnection *dbus_connection;
diff --git a/web-extensions/Makefile.am b/web-extensions/Makefile.am
index b4d7714..3577cfb 100644
--- a/web-extensions/Makefile.am
+++ b/web-extensions/Makefile.am
@@ -2,20 +2,21 @@ webextensions_LTLIBRARIES = libevolutionwebextension.la
 
 libevolutionwebextension_la_SOURCES =                  \
        evolution-web-extension.c                       \
-       evolution-web-extension.h                       \
-       $(top_srcdir)/e-util/e-dom-utils.c              \
-       $(top_srcdir)/e-util/e-dom-utils.h
+       evolution-web-extension.h
 
 libevolutionwebextension_la_CPPFLAGS =                 \
-       -DWEBEXTENSIONS_COMPILATION                     \
-       -DEVOLUTION_IMAGESDIR=\"${imagesdir}\"          \
-       -I$(top_srcdir)/e-util                          \
-       $(GNOME_PLATFORM_CFLAGS)                        \
        $(AM_CPPFLAGS)                                  \
+       -I$(top_srcdir)                                 \
+       $(EVOLUTION_DATA_SERVER_CFLAGS)                 \
+       $(GNOME_PLATFORM_CFLAGS)                        \
+       $(GTKHTML_CFLAGS)                               \
        $(WEB_EXTENSIONS_CFLAGS)
 
 libevolutionwebextension_la_LIBADD =                   \
+       $(top_builddir)/e-util/libevolution-util.la     \
+       $(EVOLUTION_DATA_SERVER_LIBS)                   \
        $(GNOME_PLATFORM_LIBS)                          \
+       $(GTKHTML_LIBS)                                 \
        $(WEB_EXTENSIONS_LIBS)
 
 libevolutionwebextension_la_LDFLAGS =                  \
diff --git a/web-extensions/evolution-web-extension.c b/web-extensions/evolution-web-extension.c
index 5153c05..e9368ad 100644
--- a/web-extensions/evolution-web-extension.c
+++ b/web-extensions/evolution-web-extension.c
@@ -26,7 +26,7 @@
 
 #include <string.h>
 
-#include "../e-util/e-dom-utils.h"
+#include <e-util/e-util.h>
 
 /* FIXME Clean it */
 static GDBusConnection *dbus_connection;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]