diff options
| author | Colin Walters <walters@verbum.org> | 2010-10-21 09:18:41 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2010-10-21 10:38:19 -0400 |
| commit | 25681375970de9a8ecbb4a6165df2e2cc4a7a39d (patch) | |
| tree | 38556b91efdaf9d9bc1c7421a5151060a69e09b0 | |
| parent | da877651d1af5da29576a2e5daca705effc7a1a4 (diff) | |
| download | gjs-25681375970de9a8ecbb4a6165df2e2cc4a7a39d.tar.gz | |
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
52 files changed, 116 insertions, 74 deletions
@@ -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 69069411..e2606f3a 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 c0d0e71d..9b06a2e4 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 809a81dd..22bfad0d 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 @@ -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> @@ -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 f694cc7c..873c28c0 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 34f9e367..09f166c0 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 a921a156..548dddef 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 2588d687..4a4d2476 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 eac104d8..b20a5f6c 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> @@ -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 0a4fb6da..8f8a28e4 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> @@ -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> @@ -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> @@ -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 @@ -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" @@ -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 60f6c49c..3d29c9bd 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 00000000..73dec9b5 --- /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 5842ce96..107e94fe 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 2fbd7cf3..2ce5c12e 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 00000000..38190be2 --- /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__ */ @@ -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 8487c107..b5c8fb65 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 0f3c964f..fea79823 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 173c8b7f..9cd507ae 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> @@ -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 7d9d9fb7..4a8224ea 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 26dea22f..86490f5f 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 246f826d..175777eb 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 c752ddba..36148dc3 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 6972a4c1..d65b9f53 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 bc18e82c..5b7b4ee0 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 d58841d5..b08f5180 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 ef2d2aaa..730ecccf 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 b19e48b7..fc54b7cc 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 05f1e90f..70b389c2 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 fe54b704..d20973db 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 c93442d6..47c68cb7 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 e43aa6bf..11c6ee6f 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 d6fda113..f086af84 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 f4c96372..81fa67c3 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 56a6e099..ccd0bd1f 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 afb66c44..76381257 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 18012748..8c2df2cd 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 4519f934..2b23ca02 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 ec9176c6..2d206c51 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 eade473e..97025938 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 0000f568..e53ecdcf 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 76b3e672..1965fab4 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 5a49da89..c58b58ef 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" |