GNOME.org
 

[gjs] Separate "basic" API from "embedder/module" API

commit 25681375970de9a8ecbb4a6165df2e2cc4a7a39d
Author: Colin Walters <walters verbum org>
Date:   Thu Oct 21 09:18:41 2010 -0400

    Separate "basic" API from "embedder/module" API
    
    Previously <gjs/gjs.h> pulled in a lot of stuff, and in particular,
    <gjs/jsapi-util.h>, which in turn required <jsapi.h>.  For a simple
    app that wants to embed GJS we should not be pulling that in.
    
    So <gjs/gjs.h> is now the "simple" API that actually just includes
    <gjs/context.h>, suitable for creating a context and calling eval().
    
    <gjs/gjs-module.h> is now equivalent to the old <gjs/gjs.h>, it
    pulls in the world.
    
    Also, create a corresponding .pc file, gjs-internals-1.0.pc.  This one
    includes mozjs as Requires, and adds the requisite Cflags.  For
    gjs-1.0.pc, change the Requires to simply be gobject-2.0.
    Conceptually, a gjs-devel RPM should not Require
    gobject-introspection-devel or xulrunner-devel, and a simple embedder
    program just using gjs_context_new()/gjs_context_eval() should not
    have DT_NEEDED on gobject-introspection-1.0.so or mozjs.so.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=632795

 .gitignore                      |    1 +
 Makefile-gjs-dbus.am            |    2 +-
 Makefile.am                     |   17 ++++++++++-------
 configure.ac                    |    2 +-
 gi/arg.c                        |    2 +-
 gi/boxed.c                      |    2 +-
 gi/closure.c                    |    2 +-
 gi/enumeration.c                |    2 +-
 gi/foreign.c                    |    2 +-
 gi/function.c                   |    2 +-
 gi/keep-alive.c                 |    2 +-
 gi/ns.c                         |    2 +-
 gi/object.c                     |    2 +-
 gi/param.c                      |    2 +-
 gi/repo.c                       |    3 ---
 gi/repo.h                       |    4 +---
 gi/union.c                      |    2 +-
 gi/value.c                      |    2 +-
 gjs-1.0.pc.in                   |    8 +++-----
 gjs-internals-1.0.pc.in         |   18 ++++++++++++++++++
 gjs/byteArray.c                 |    2 +-
 gjs/console.c                   |    2 +-
 gjs/gjs-module.h                |   33 +++++++++++++++++++++++++++++++++
 gjs/gjs.h                       |    4 ----
 gjs/importer.c                  |    5 ++---
 gjs/importer.h                  |    4 ++--
 gjs/jsapi-util.h                |    4 ++--
 gjs/mem.h                       |    4 ++--
 gjs/native.h                    |    4 ++--
 gjs/unit-test-utils.c           |    2 +-
 modules/cairo-context.c         |    2 +-
 modules/cairo-gradient.c        |    2 +-
 modules/cairo-image-surface.c   |    2 +-
 modules/cairo-linear-gradient.c |    2 +-
 modules/cairo-path.c            |    2 +-
 modules/cairo-pattern.c         |    2 +-
 modules/cairo-pdf-surface.c     |    2 +-
 modules/cairo-ps-surface.c      |    2 +-
 modules/cairo-radial-gradient.c |    2 +-
 modules/cairo-solid-pattern.c   |    2 +-
 modules/cairo-surface-pattern.c |    2 +-
 modules/cairo-surface.c         |    2 +-
 modules/cairo-svg-surface.c     |    2 +-
 modules/cairo.c                 |    2 +-
 modules/console.c               |    2 +-
 modules/dbus-exports.c          |    2 +-
 modules/dbus-values.c           |    2 +-
 modules/dbus-values.h           |    3 +--
 modules/dbus.c                  |    4 ++--
 modules/gettext-native.c        |    2 +-
 modules/lang.c                  |    2 +-
 modules/mainloop.c              |    2 +-
 52 files changed, 116 insertions(+), 74 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2fc3d5f..614f8ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ depcomp
 gjs-1.0.pc
 gjs-console
 gjs-dbus-1.0.pc
+gjs-internals-1.0.pc
 gjs-gi-1.0.pc
 gjs-tests
 gjs-unit
diff --git a/Makefile-gjs-dbus.am b/Makefile-gjs-dbus.am
index 6906941..e2606f3 100644
--- a/Makefile-gjs-dbus.am
+++ b/Makefile-gjs-dbus.am
@@ -1,7 +1,7 @@
 
 lib_LTLIBRARIES += libgjs-dbus.la
 
-gjs_dbusheaderdir=$(gjsincludedir)/gjs-dbus
+gjs_dbusheaderdir=$(gjs_module_includedir)/gjs-dbus
 gjs_dbusheader_HEADERS =	\
 	gjs-dbus/dbus.h		\
 	gjs-dbus/dbus-proxy.h
diff --git a/Makefile.am b/Makefile.am
index c0d0e71..9b06a2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,14 +15,17 @@ gjsjsdir = @gjsjsdir@
 gjstweenerdir = @gjsjsdir@/tweener
 gjsnativedir = @gjsnativedir@
 
-gjsincludedir = $(includedir)/gjs-1.0
+gjs_public_includedir = $(includedir)/gjs-1.0
+gjs_module_includedir = $(includedir)/gjs-1.0
 
 ########################################################################
-nobase_gjsinclude_HEADERS =	\
-	gjs/byteArray.h		\
+nobase_gjs_public_include_HEADERS =	\
 	gjs/context.h		\
+	gjs/gjs.h
+
+nobase_gjs_module_include_HEADERS =	\
+	gjs/byteArray.h		\
 	gjs/importer.h		\
-	gjs/gjs.h		\
 	gjs/jsapi-util.h	\
 	gjs/mem.h		\
 	gjs/native.h
@@ -40,10 +43,11 @@ noinst_HEADERS +=		\
 
 ########################################################################
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gjs-1.0.pc
+pkgconfig_DATA = gjs-1.0.pc gjs-internals-1.0.pc
 
 EXTRA_DIST += 			\
-	gjs-1.0.pc.in
+	gjs-1.0.pc.in           \
+	gjs-internals-1.0.pc.in
 
 ########################################################################
 gjs_directory_defines = 				\
@@ -116,7 +120,6 @@ gjs_console_CFLAGS = 		\
 	$(AM_CFLAGS)		\
 	$(GJS_CFLAGS)
 gjs_console_LDADD =		\
-         $(GJS_LIBS)    \
          libgjs.la
 gjs_console_LDFLAGS = -R $(FIREFOX_JS_LIBDIR) -rdynamic
 gjs_console_SOURCES = gjs/console.c
diff --git a/configure.ac b/configure.ac
index 809a81d..22bfad0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -314,5 +314,5 @@ gjsnativedir="\${libdir}/gjs-1.0"
 AC_SUBST([gjsjsdir])
 AC_SUBST([gjsnativedir])
 
-AC_CONFIG_FILES([Makefile gjs-1.0.pc gjs-gi-1.0.pc gjs-dbus-1.0.pc])
+AC_CONFIG_FILES([Makefile gjs-1.0.pc gjs-gi-1.0.pc gjs-dbus-1.0.pc gjs-internals-1.0.pc])
 AC_OUTPUT
diff --git a/gi/arg.c b/gi/arg.c
index 4241a80..0663a12 100644
--- a/gi/arg.c
+++ b/gi/arg.c
@@ -30,7 +30,7 @@
 #include "union.h"
 #include "value.h"
 #include "gjs/byteArray.h"
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 
 #include <util/log.h>
diff --git a/gi/boxed.c b/gi/boxed.c
index b85ec2a..afc752a 100644
--- a/gi/boxed.c
+++ b/gi/boxed.c
@@ -28,7 +28,7 @@
 #include "boxed.h"
 #include "arg.h"
 #include "object.h"
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 #include "repo.h"
 #include "function.h"
diff --git a/gi/closure.c b/gi/closure.c
index f694cc7..873c28c 100644
--- a/gi/closure.c
+++ b/gi/closure.c
@@ -29,7 +29,7 @@
 
 #include "closure.h"
 #include "keep-alive.h"
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 
 typedef struct {
diff --git a/gi/enumeration.c b/gi/enumeration.c
index 34f9e36..09f166c 100644
--- a/gi/enumeration.c
+++ b/gi/enumeration.c
@@ -25,7 +25,7 @@
 
 #include <string.h>
 
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 #include "repo.h"
 
diff --git a/gi/foreign.c b/gi/foreign.c
index a921a15..548ddde 100644
--- a/gi/foreign.c
+++ b/gi/foreign.c
@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include <string.h>
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 #include <girepository.h>
 
diff --git a/gi/function.c b/gi/function.c
index 2588d68..4a4d247 100644
--- a/gi/function.c
+++ b/gi/function.c
@@ -28,7 +28,7 @@
 #include "object.h"
 #include "boxed.h"
 #include "union.h"
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 
 #include <util/log.h>
diff --git a/gi/keep-alive.c b/gi/keep-alive.c
index eac104d..b20a5f6 100644
--- a/gi/keep-alive.c
+++ b/gi/keep-alive.c
@@ -25,7 +25,7 @@
 
 #include "keep-alive.h"
 
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 
 #include <util/log.h>
diff --git a/gi/ns.c b/gi/ns.c
index 8dcf116..1fe1720 100644
--- a/gi/ns.c
+++ b/gi/ns.c
@@ -26,7 +26,7 @@
 #include "ns.h"
 #include "repo.h"
 #include "param.h"
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 
 #include <util/log.h>
diff --git a/gi/object.c b/gi/object.c
index 0a4fb6d..8f8a28e 100644
--- a/gi/object.c
+++ b/gi/object.c
@@ -33,7 +33,7 @@
 #include "keep-alive.h"
 #include "gjs_gi_trace.h"
 
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 
 #include <util/log.h>
diff --git a/gi/param.c b/gi/param.c
index dec875f..ae41367 100644
--- a/gi/param.c
+++ b/gi/param.c
@@ -27,7 +27,7 @@
 
 #include "param.h"
 #include "repo.h"
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 
 #include <util/log.h>
diff --git a/gi/repo.c b/gi/repo.c
index 803238d..9ce76bc 100644
--- a/gi/repo.c
+++ b/gi/repo.c
@@ -33,14 +33,11 @@
 #include "arg.h"
 #include "foreign.h"
 
-#include <gjs/mem.h>
 #include <gjs/compat.h>
 
 #include <util/log.h>
 #include <util/misc.h>
 
-#include <jsapi.h>
-
 #include <girepository.h>
 #include <string.h>
 
diff --git a/gi/repo.h b/gi/repo.h
index 7a02b92..8ac71d7 100644
--- a/gi/repo.h
+++ b/gi/repo.h
@@ -26,11 +26,9 @@
 
 #include <glib.h>
 
-#include <jsapi.h>
-
 #include <girepository.h>
 
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 
 G_BEGIN_DECLS
 
diff --git a/gi/union.c b/gi/union.c
index 1cf74a7..13442ba 100644
--- a/gi/union.c
+++ b/gi/union.c
@@ -31,7 +31,7 @@
 #include "union.h"
 #include "arg.h"
 #include "object.h"
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 #include "repo.h"
 #include "function.h"
diff --git a/gi/value.c b/gi/value.c
index af3cf3d..5999bd0 100644
--- a/gi/value.c
+++ b/gi/value.c
@@ -32,7 +32,7 @@
 #include "object.h"
 #include "boxed.h"
 #include "union.h"
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 
 #include <girepository.h>
diff --git a/gjs-1.0.pc.in b/gjs-1.0.pc.in
index 60f6c49..3d29c9b 100644
--- a/gjs-1.0.pc.in
+++ b/gjs-1.0.pc.in
@@ -7,12 +7,10 @@ datarootdir= datarootdir@
 datadir= datadir@
 
 gjs_console=${bindir}/gjs-console
-jsdir= gjsjsdir@
-jsnativedir= gjsnativedir@
-mozjslibdir= FIREFOX_JS_LIBDIR@
 
-Cflags: -I${includedir}/gjs-1.0 @JS_EXTRA_CFLAGS@
-Requires: gobject-introspection-1.0 @JS_PACKAGE@
+Cflags: -I${includedir}/gjs-1.0
+Requires: gobject-2.0
+Requires.private: gobject-introspection-1.0 @JS_PACKAGE@
 Libs: -L${libdir} -lgjs
 
 Name: gjs-1.0
diff --git a/gjs-internals-1.0.pc.in b/gjs-internals-1.0.pc.in
new file mode 100644
index 0000000..73dec9b
--- /dev/null
+++ b/gjs-internals-1.0.pc.in
@@ -0,0 +1,18 @@
+prefix= prefix@
+exec_prefix= exec_prefix@
+libdir= libdir@
+bindir= bindir@
+includedir= includedir@
+datarootdir= datarootdir@
+datadir= datadir@
+
+jsdir= gjsjsdir@
+jsnativedir= gjsnativedir@
+mozjslibdir= FIREFOX_JS_LIBDIR@
+
+Cflags: -I${includedir}/gjs-1.0 @JS_EXTRA_CFLAGS@
+Requires: gjs-1.0 gobject-introspection-1.0 @JS_PACKAGE@
+
+Name: gjs-internals-1.0
+Description: Internal API for gjs (for modules and embedders); uses mozjs
+Version: @VERSION@
diff --git a/gjs/byteArray.c b/gjs/byteArray.c
index 5842ce9..107e94f 100644
--- a/gjs/byteArray.c
+++ b/gjs/byteArray.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <glib.h>
 #include "byteArray.h"
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 #include <util/log.h>
 #include <jsapi.h>
diff --git a/gjs/console.c b/gjs/console.c
index 2fbd7cf..2ce5c12 100644
--- a/gjs/console.c
+++ b/gjs/console.c
@@ -27,7 +27,7 @@
 #include <locale.h>
 
 #include <util/log.h>
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 
 static char **include_path = NULL;
diff --git a/gjs/gjs-module.h b/gjs/gjs-module.h
new file mode 100644
index 0000000..38190be
--- /dev/null
+++ b/gjs/gjs-module.h
@@ -0,0 +1,33 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+/*
+ * Copyright (c) 2010  Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#ifndef __GJS_GJS_MODULE_H__
+#define __GJS_GJS_MODULE_H__
+
+#include <gjs/gjs.h>
+#include <gjs/native.h>
+#include <gjs/mem.h>
+#include <gjs/importer.h>
+#include <gjs/jsapi-util.h>
+
+#endif /* __GJS_GJS_umodule_H__ */
diff --git a/gjs/gjs.h b/gjs/gjs.h
index 7a05ddd..b2a32f2 100644
--- a/gjs/gjs.h
+++ b/gjs/gjs.h
@@ -25,9 +25,5 @@
 #define __GJS_GJS_H__
 
 #include <gjs/context.h>
-#include <gjs/importer.h>
-#include <gjs/jsapi-util.h>
-#include <gjs/native.h>
-#include <gjs/mem.h>
 
 #endif /* __GJS_GJS_H__ */
diff --git a/gjs/importer.c b/gjs/importer.c
index 8487c10..b5c8fb6 100644
--- a/gjs/importer.c
+++ b/gjs/importer.c
@@ -26,9 +26,8 @@
 #include <util/log.h>
 #include <util/glib.h>
 
-#include <jsapi.h>
-
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
+#include <gjs/importer.h>
 #include <gjs/compat.h>
 
 #include <string.h>
diff --git a/gjs/importer.h b/gjs/importer.h
index 0f3c964..fea7982 100644
--- a/gjs/importer.h
+++ b/gjs/importer.h
@@ -24,8 +24,8 @@
 #ifndef __GJS_IMPORTER_H__
 #define __GJS_IMPORTER_H__
 
-#if !defined (__GJS_GJS_H__) && !defined (GJS_COMPILATION)
-#error "Only <gjs/gjs.h> can be included directly."
+#if !defined (__GJS_GJS_MODULE_H__) && !defined (GJS_COMPILATION)
+#error "Only <gjs/gjs-module.h> can be included directly."
 #endif
 
 #include <glib.h>
diff --git a/gjs/jsapi-util.h b/gjs/jsapi-util.h
index 173c8b7..9cd507a 100644
--- a/gjs/jsapi-util.h
+++ b/gjs/jsapi-util.h
@@ -24,8 +24,8 @@
 #ifndef __GJS_JSAPI_UTIL_H__
 #define __GJS_JSAPI_UTIL_H__
 
-#if !defined (__GJS_GJS_H__) && !defined (GJS_COMPILATION)
-#error "Only <gjs/gjs.h> can be included directly."
+#if !defined (__GJS_GJS_MODULE_H__) && !defined (GJS_COMPILATION)
+#error "Only <gjs/gjs-module.h> can be included directly."
 #endif
 
 #include <jsapi.h>
diff --git a/gjs/mem.h b/gjs/mem.h
index 35c8f86..c766cd2 100644
--- a/gjs/mem.h
+++ b/gjs/mem.h
@@ -24,8 +24,8 @@
 #ifndef __GJS_MEM_H__
 #define __GJS_MEM_H__
 
-#if !defined (__GJS_GJS_H__) && !defined (GJS_COMPILATION)
-#error "Only <gjs/gjs.h> can be included directly."
+#if !defined (__GJS_GJS_MODULE_H__) && !defined (GJS_COMPILATION)
+#error "Only <gjs/gjs-module.h> can be included directly."
 #endif
 
 #include <glib.h>
diff --git a/gjs/native.h b/gjs/native.h
index 7d9d9fb..4a8224e 100644
--- a/gjs/native.h
+++ b/gjs/native.h
@@ -24,8 +24,8 @@
 #ifndef __GJS_NATIVE_H__
 #define __GJS_NATIVE_H__
 
-#if !defined (__GJS_GJS_H__) && !defined (GJS_COMPILATION)
-#error "Only <gjs/gjs.h> can be included directly."
+#if !defined (__GJS_GJS_MODULE_H__) && !defined (GJS_COMPILATION)
+#error "Only <gjs/gjs-module.h> can be included directly."
 #endif
 
 #include <glib.h>
diff --git a/gjs/unit-test-utils.c b/gjs/unit-test-utils.c
index 26dea22..86490f5 100644
--- a/gjs/unit-test-utils.c
+++ b/gjs/unit-test-utils.c
@@ -21,7 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include "unit-test-utils.h"
 
 static void
diff --git a/modules/cairo-context.c b/modules/cairo-context.c
index 246f826..175777e 100644
--- a/modules/cairo-context.c
+++ b/modules/cairo-context.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 #include <gi/foreign.h>
 
diff --git a/modules/cairo-gradient.c b/modules/cairo-gradient.c
index c752ddb..36148dc 100644
--- a/modules/cairo-gradient.c
+++ b/modules/cairo-gradient.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 #include <cairo.h>
 #include "cairo-private.h"
diff --git a/modules/cairo-image-surface.c b/modules/cairo-image-surface.c
index 6972a4c..d65b9f5 100644
--- a/modules/cairo-image-surface.c
+++ b/modules/cairo-image-surface.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 #include <cairo.h>
 #include "cairo-private.h"
diff --git a/modules/cairo-linear-gradient.c b/modules/cairo-linear-gradient.c
index bc18e82..5b7b4ee 100644
--- a/modules/cairo-linear-gradient.c
+++ b/modules/cairo-linear-gradient.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 #include <cairo.h>
 #include "cairo-private.h"
diff --git a/modules/cairo-path.c b/modules/cairo-path.c
index d58841d..b08f518 100644
--- a/modules/cairo-path.c
+++ b/modules/cairo-path.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 #include <cairo.h>
 #include "cairo-private.h"
diff --git a/modules/cairo-pattern.c b/modules/cairo-pattern.c
index ef2d2aa..730eccc 100644
--- a/modules/cairo-pattern.c
+++ b/modules/cairo-pattern.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 #include <cairo.h>
 #include "cairo-private.h"
diff --git a/modules/cairo-pdf-surface.c b/modules/cairo-pdf-surface.c
index b19e48b..fc54b7c 100644
--- a/modules/cairo-pdf-surface.c
+++ b/modules/cairo-pdf-surface.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 #include <cairo.h>
 #include "cairo-private.h"
diff --git a/modules/cairo-ps-surface.c b/modules/cairo-ps-surface.c
index 05f1e90..70b389c 100644
--- a/modules/cairo-ps-surface.c
+++ b/modules/cairo-ps-surface.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 #include <cairo.h>
 #include "cairo-private.h"
diff --git a/modules/cairo-radial-gradient.c b/modules/cairo-radial-gradient.c
index fe54b70..d20973d 100644
--- a/modules/cairo-radial-gradient.c
+++ b/modules/cairo-radial-gradient.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 #include <cairo.h>
 #include "cairo-private.h"
diff --git a/modules/cairo-solid-pattern.c b/modules/cairo-solid-pattern.c
index c93442d..47c68cb 100644
--- a/modules/cairo-solid-pattern.c
+++ b/modules/cairo-solid-pattern.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 #include <cairo.h>
 #include "cairo-private.h"
diff --git a/modules/cairo-surface-pattern.c b/modules/cairo-surface-pattern.c
index e43aa6b..11c6ee6 100644
--- a/modules/cairo-surface-pattern.c
+++ b/modules/cairo-surface-pattern.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 #include <cairo.h>
 #include "cairo-private.h"
diff --git a/modules/cairo-surface.c b/modules/cairo-surface.c
index d6fda11..f086af8 100644
--- a/modules/cairo-surface.c
+++ b/modules/cairo-surface.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 #include <cairo.h>
 #include "cairo-private.h"
diff --git a/modules/cairo-svg-surface.c b/modules/cairo-svg-surface.c
index f4c9637..81fa67c 100644
--- a/modules/cairo-svg-surface.c
+++ b/modules/cairo-svg-surface.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 #include <cairo.h>
 #include "cairo-private.h"
diff --git a/modules/cairo.c b/modules/cairo.c
index 56a6e09..ccd0bd1 100644
--- a/modules/cairo.c
+++ b/modules/cairo.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 
 #include "cairo-private.h"
diff --git a/modules/console.c b/modules/console.c
index afb66c4..7638125 100644
--- a/modules/console.c
+++ b/modules/console.c
@@ -52,7 +52,7 @@
 #include <jsapi.h>
 #include <glib.h>
 #include <glib/gprintf.h>
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 
 #include "console.h"
diff --git a/modules/dbus-exports.c b/modules/dbus-exports.c
index 1801274..8c2df2c 100644
--- a/modules/dbus-exports.c
+++ b/modules/dbus-exports.c
@@ -26,7 +26,7 @@
 
 #include "gjs-dbus/dbus.h"
 
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 
 #include <util/log.h>
diff --git a/modules/dbus-values.c b/modules/dbus-values.c
index 4519f93..2b23ca0 100644
--- a/modules/dbus-values.c
+++ b/modules/dbus-values.c
@@ -23,7 +23,7 @@
 
 #include "dbus-values.h"
 
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 
 #include <gjs-dbus/dbus.h>
diff --git a/modules/dbus-values.h b/modules/dbus-values.h
index ec9176c..2d206c5 100644
--- a/modules/dbus-values.h
+++ b/modules/dbus-values.h
@@ -22,9 +22,8 @@
 #ifndef __GJS_JS_DBUS_VALUES_H__
 #define __GJS_JS_DBUS_VALUES_H__
 
-#include <glib.h>
 #include <dbus/dbus.h>
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 
 G_BEGIN_DECLS
 
diff --git a/modules/dbus.c b/modules/dbus.c
index eade473..9702593 100644
--- a/modules/dbus.c
+++ b/modules/dbus.c
@@ -25,9 +25,9 @@
 #include "dbus-exports.h"
 #include "dbus-values.h"
 
-#include "../gjs/gjs.h"
-#include "../gjs/compat.h"
+#include <gjs/gjs-module.h>
 #include "../gi/closure.h"
+#include <gjs/compat.h>
 
 #include <util/log.h>
 #include <gjs-dbus/dbus.h>
diff --git a/modules/gettext-native.c b/modules/gettext-native.c
index 0000f56..e53ecdc 100644
--- a/modules/gettext-native.c
+++ b/modules/gettext-native.c
@@ -24,7 +24,7 @@
 #include "gettext-native.h"
 #include "../gi/closure.h"
 #include <util/log.h>
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 #include <jsapi.h>
 #include <glib/gi18n.h>
diff --git a/modules/lang.c b/modules/lang.c
index 76b3e67..1965fab 100644
--- a/modules/lang.c
+++ b/modules/lang.c
@@ -22,7 +22,7 @@
  */
 
 #include "lang.h"
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 
 #include <glib.h>
diff --git a/modules/mainloop.c b/modules/mainloop.c
index 5a49da8..c58b58e 100644
--- a/modules/mainloop.c
+++ b/modules/mainloop.c
@@ -22,7 +22,7 @@
  */
 
 #include "mainloop.h"
-#include <gjs/gjs.h>
+#include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 
 #include "../gi/closure.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]