[gjs/wip/ptomato/internals: 3/6] module: Get rid of internals API
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs/wip/ptomato/internals: 3/6] module: Get rid of internals API
- Date: Sat, 8 Oct 2016 01:36:15 +0000 (UTC)
commit 784e105642c8fbf6797a3f0c7039d2a7b3d173b1
Author: Philip Chimento <philip endlessm com>
Date: Tue Oct 4 19:28:17 2016 -0700
module: Get rid of internals API
This removes gjs-internals-1.0.pc and gjs-module.h, and makes all the
module header files private, that were previously installed.
Removes "do not include separately" guards from those files, and makes
sure they are included with quotes instead of angle brackets. Untangles
any header inclusion problems resulting from the removal of gjs-module.h.
https://bugzilla.gnome.org/show_bug.cgi?id=772386
Makefile.am | 66 ++++++++++++++++++-------------------
configure.ac | 2 +-
gi/arg.cpp | 3 +-
gi/boxed.cpp | 4 +-
gi/closure.cpp | 4 +-
gi/enumeration.cpp | 3 +-
gi/foreign.cpp | 3 +-
gi/function.cpp | 6 ++--
gi/fundamental.cpp | 5 ++-
gi/gerror.cpp | 4 +-
gi/gtype.cpp | 3 +-
gi/interface.cpp | 4 +-
gi/keep-alive.cpp | 4 +--
gi/ns.cpp | 4 +-
gi/object.cpp | 11 +++---
gi/param.cpp | 4 +-
gi/proxyutils.h | 2 +-
gi/repo.cpp | 5 ++-
gi/repo.h | 2 +-
gi/union.cpp | 4 +-
gi/value.cpp | 3 +-
gjs-internals-1.0.pc.in | 16 ---------
gjs/byteArray.cpp | 5 +--
gjs/byteArray.h | 4 --
gjs/compat.h | 6 +---
gjs/console.cpp | 3 +-
gjs/coverage-internal.h | 4 --
gjs/coverage.cpp | 5 ++-
gjs/gjs-module.h | 34 -------------------
gjs/importer.cpp | 7 ++--
gjs/importer.h | 4 --
gjs/jsapi-util.h | 11 ++----
gjs/mem.h | 4 --
gjs/native.h | 4 --
installed-tests/gjs-unit.cpp | 7 +++-
modules/cairo-context.cpp | 5 +--
modules/cairo-gradient.cpp | 3 +-
modules/cairo-image-surface.cpp | 3 +-
modules/cairo-linear-gradient.cpp | 3 +-
modules/cairo-path.cpp | 3 +-
modules/cairo-pattern.cpp | 3 +-
modules/cairo-pdf-surface.cpp | 3 +-
modules/cairo-ps-surface.cpp | 3 +-
modules/cairo-radial-gradient.cpp | 3 +-
modules/cairo-region.cpp | 5 +--
modules/cairo-solid-pattern.cpp | 3 +-
modules/cairo-surface-pattern.cpp | 3 +-
modules/cairo-surface.cpp | 5 +--
modules/cairo-svg-surface.cpp | 3 +-
modules/cairo.cpp | 4 +--
modules/console.cpp | 5 +--
modules/modules.cpp | 2 +-
modules/system.cpp | 5 ++-
test/gjs-test-coverage.cpp | 6 ++--
test/gjs-tests.cpp | 4 ++-
55 files changed, 120 insertions(+), 214 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 68e7e34..6da3e00 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,48 +30,16 @@ gjsjsdir = @gjsjsdir@
gjsoverridedir = $(gjsjsdir)/overrides
gjs_public_includedir = $(includedir)/gjs-1.0
-gjs_module_includedir = $(includedir)/gjs-1.0
########################################################################
nobase_gjs_public_include_HEADERS = \
gjs/context.h \
gjs/gjs.h
-nobase_gjs_module_include_HEADERS = \
- gjs/gjs-module.h \
- gjs/compat.h \
- gjs/coverage.h \
- gjs/byteArray.h \
- gjs/importer.h \
- gjs/jsapi-util.h \
- gjs/runtime.h \
- gjs/type-module.h \
- gjs/mem.h \
- gjs/native.h \
- gi/ns.h \
- gi/object.h \
- gi/foreign.h \
- gi/fundamental.h \
- gi/param.h \
- gi/repo.h \
- gi/union.h \
- gi/value.h \
- gi/arg.h \
- gi/boxed.h \
- gi/closure.h \
- gi/enumeration.h \
- gi/function.h \
- gi/keep-alive.h \
- gi/interface.h \
- gi/gtype.h \
- gi/gerror.h
-
########################################################################
-pkgconfig_DATA = gjs-1.0.pc gjs-internals-1.0.pc
+pkgconfig_DATA = gjs-1.0.pc
-EXTRA_DIST += \
- gjs-1.0.pc.in \
- gjs-internals-1.0.pc.in
+EXTRA_DIST += gjs-1.0.pc.in
########################################################################
gjs_directory_defines = \
@@ -177,6 +145,36 @@ endif
libgjs_la_SOURCES += $(libgjs_private_source_files)
+# These used to be public headers for external modules
+libgjs_la_SOURCES += \
+ gjs/compat.h \
+ gjs/coverage.h \
+ gjs/byteArray.h \
+ gjs/importer.h \
+ gjs/jsapi-util.h \
+ gjs/runtime.h \
+ gjs/type-module.h \
+ gjs/mem.h \
+ gjs/native.h \
+ gi/ns.h \
+ gi/object.h \
+ gi/foreign.h \
+ gi/fundamental.h \
+ gi/param.h \
+ gi/repo.h \
+ gi/union.h \
+ gi/value.h \
+ gi/arg.h \
+ gi/boxed.h \
+ gi/closure.h \
+ gi/enumeration.h \
+ gi/function.h \
+ gi/keep-alive.h \
+ gi/interface.h \
+ gi/gtype.h \
+ gi/gerror.h \
+ $(NULL)
+
GjsPrivate-1.0.gir: libgjs.la
GjsPrivate_1_0_gir_LIBS = libgjs.la
GjsPrivate_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
diff --git a/configure.ac b/configure.ac
index 20dd4c1..ada7687 100644
--- a/configure.ac
+++ b/configure.ac
@@ -196,7 +196,7 @@ AC_SUBST([gjsjsdir], [\${datadir}/gjs-1.0])
dnl automake 1.11/1.12 defines this but does not substitute it
AC_SUBST([pkglibexecdir], ["${libexecdir}/${PACKAGE}"])
-AC_CONFIG_FILES([Makefile gjs-1.0.pc gjs-internals-1.0.pc])
+AC_CONFIG_FILES([Makefile gjs-1.0.pc])
dnl Symlink the files from gobject-introspection's test libraries into the tree;
dnl Automake plans to drop support for compiling them in-place.
AC_CONFIG_LINKS([
diff --git a/gi/arg.cpp b/gi/arg.cpp
index 8a9fb47..47773a3 100644
--- a/gi/arg.cpp
+++ b/gi/arg.cpp
@@ -35,8 +35,7 @@
#include "value.h"
#include "gerror.h"
#include "gjs/byteArray.h"
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
+#include "gjs/compat.h"
#include <util/log.h>
diff --git a/gi/boxed.cpp b/gi/boxed.cpp
index 5c38c3d..13275a3 100644
--- a/gi/boxed.cpp
+++ b/gi/boxed.cpp
@@ -28,8 +28,8 @@
#include "boxed.h"
#include "arg.h"
#include "object.h"
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
+#include "gjs/compat.h"
+#include "gjs/mem.h"
#include "repo.h"
#include "proxyutils.h"
#include "function.h"
diff --git a/gi/closure.cpp b/gi/closure.cpp
index ed0fd0e..4540c09 100644
--- a/gi/closure.cpp
+++ b/gi/closure.cpp
@@ -28,9 +28,9 @@
#include <util/log.h>
#include "closure.h"
+#include "gjs/compat.h"
+#include "gjs/mem.h"
#include "keep-alive.h"
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
typedef struct {
GClosure base;
diff --git a/gi/enumeration.cpp b/gi/enumeration.cpp
index 7d058fc..ac22160 100644
--- a/gi/enumeration.cpp
+++ b/gi/enumeration.cpp
@@ -25,8 +25,7 @@
#include <string.h>
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
+#include "gjs/compat.h"
#include "repo.h"
#include "gtype.h"
#include "function.h"
diff --git a/gi/foreign.cpp b/gi/foreign.cpp
index c65431f..c220213 100644
--- a/gi/foreign.cpp
+++ b/gi/foreign.cpp
@@ -24,12 +24,11 @@
#include <config.h>
#include <string.h>
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
#include <girepository.h>
#include "arg.h"
#include "foreign.h"
+#include "gjs/compat.h"
static struct {
char *gi_namespace;
diff --git a/gi/function.cpp b/gi/function.cpp
index 2b66214..e26f4f5 100644
--- a/gi/function.cpp
+++ b/gi/function.cpp
@@ -33,9 +33,9 @@
#include "closure.h"
#include "gtype.h"
#include "param.h"
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
-#include <gjs/jsapi-private.h>
+#include "gjs/compat.h"
+#include "gjs/jsapi-private.h"
+#include "gjs/mem.h"
#include <util/log.h>
diff --git a/gi/fundamental.cpp b/gi/fundamental.cpp
index faf4ebc..484d963 100644
--- a/gi/fundamental.cpp
+++ b/gi/fundamental.cpp
@@ -33,9 +33,10 @@
#include "gtype.h"
#include "proxyutils.h"
#include "repo.h"
+#include "gjs/compat.h"
+#include "gjs/mem.h"
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
+#include <gjs/context.h>
#include <util/log.h>
#include <girepository.h>
diff --git a/gi/gerror.cpp b/gi/gerror.cpp
index c2c59b3..80279d8 100644
--- a/gi/gerror.cpp
+++ b/gi/gerror.cpp
@@ -25,10 +25,10 @@
#include <string.h>
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
#include "boxed.h"
#include "enumeration.h"
+#include "gjs/compat.h"
+#include "gjs/mem.h"
#include "repo.h"
#include "gerror.h"
diff --git a/gi/gtype.cpp b/gi/gtype.cpp
index 6f8ef45..ac82e4f 100644
--- a/gi/gtype.cpp
+++ b/gi/gtype.cpp
@@ -26,8 +26,7 @@
#include "gtype.h"
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
+#include "gjs/compat.h"
#include <util/log.h>
#include <girepository.h>
diff --git a/gi/interface.cpp b/gi/interface.cpp
index b27a6b2..cee0538 100644
--- a/gi/interface.cpp
+++ b/gi/interface.cpp
@@ -28,9 +28,9 @@
#include "gtype.h"
#include "interface.h"
#include "repo.h"
+#include "gjs/compat.h"
+#include "gjs/mem.h"
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
#include <util/log.h>
#include <girepository.h>
diff --git a/gi/keep-alive.cpp b/gi/keep-alive.cpp
index 2923193..c533a53 100644
--- a/gi/keep-alive.cpp
+++ b/gi/keep-alive.cpp
@@ -23,11 +23,9 @@
#include <config.h>
+#include "gjs/compat.h"
#include "keep-alive.h"
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
-
#include <util/log.h>
#include <util/glib.h>
diff --git a/gi/ns.cpp b/gi/ns.cpp
index 3eafafb..38d6490 100644
--- a/gi/ns.cpp
+++ b/gi/ns.cpp
@@ -26,8 +26,8 @@
#include "ns.h"
#include "repo.h"
#include "param.h"
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
+#include "gjs/compat.h"
+#include "gjs/mem.h"
#include <util/log.h>
#include <girepository.h>
diff --git a/gi/object.cpp b/gi/object.cpp
index de7606c..97644dd 100644
--- a/gi/object.cpp
+++ b/gi/object.cpp
@@ -26,7 +26,7 @@
#include <memory>
#include <string.h>
-#include <gjs/gi.h>
+#include "gjs/gi.h"
#include "object.h"
#include "gtype.h"
#include "interface.h"
@@ -40,11 +40,10 @@
#include "keep-alive.h"
#include "closure.h"
#include "gjs_gi_trace.h"
-
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
-#include <gjs/type-module.h>
-#include <gjs/context-private.h>
+#include "gjs/compat.h"
+#include "gjs/context-private.h"
+#include "gjs/mem.h"
+#include "gjs/type-module.h"
#include <util/log.h>
#include <util/hash-x32.h>
diff --git a/gi/param.cpp b/gi/param.cpp
index 2bf5927..a35c5f5 100644
--- a/gi/param.cpp
+++ b/gi/param.cpp
@@ -31,8 +31,8 @@
#include "repo.h"
#include "gtype.h"
#include "function.h"
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
+#include "gjs/compat.h"
+#include "gjs/mem.h"
#include <util/log.h>
diff --git a/gi/proxyutils.h b/gi/proxyutils.h
index 6161f3b..dc1e051 100644
--- a/gi/proxyutils.h
+++ b/gi/proxyutils.h
@@ -24,8 +24,8 @@
#ifndef __GJS_PROXYUTILS_H__
#define __GJS_PROXYUTILS_H__
+#include "gjs/gi.h"
#include "gjs/jsapi-util.h"
-#include <gjs/gi.h>
G_BEGIN_DECLS
diff --git a/gi/repo.cpp b/gi/repo.cpp
index 22b1b50..2f5ae4e 100644
--- a/gi/repo.cpp
+++ b/gi/repo.cpp
@@ -37,8 +37,9 @@
#include "interface.h"
#include "gerror.h"
-#include <gjs/compat.h>
-#include <gjs/jsapi-private.h>
+#include "gjs/compat.h"
+#include "gjs/jsapi-private.h"
+#include "gjs/mem.h"
#include <util/misc.h>
diff --git a/gi/repo.h b/gi/repo.h
index 93d7414..064c71c 100644
--- a/gi/repo.h
+++ b/gi/repo.h
@@ -29,7 +29,7 @@
#include <girepository.h>
-#include <gjs/gjs-module.h>
+#include "gjs/compat.h"
#include <util/log.h>
G_BEGIN_DECLS
diff --git a/gi/union.cpp b/gi/union.cpp
index 6781efb..def9465 100644
--- a/gi/union.cpp
+++ b/gi/union.cpp
@@ -31,8 +31,8 @@
#include "union.h"
#include "arg.h"
#include "object.h"
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
+#include "gjs/compat.h"
+#include "gjs/mem.h"
#include "repo.h"
#include "proxyutils.h"
#include "function.h"
diff --git a/gi/value.cpp b/gi/value.cpp
index 1c5cc34..a71c07f 100644
--- a/gi/value.cpp
+++ b/gi/value.cpp
@@ -36,8 +36,7 @@
#include "union.h"
#include "gtype.h"
#include "gerror.h"
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
+#include "gjs/compat.h"
#include <girepository.h>
diff --git a/gjs/byteArray.cpp b/gjs/byteArray.cpp
index 771a70b..a5e6ede 100644
--- a/gjs/byteArray.cpp
+++ b/gjs/byteArray.cpp
@@ -25,9 +25,8 @@
#include <string.h>
#include <glib.h>
#include "byteArray.h"
-#include "../gi/boxed.h"
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
+#include "gi/boxed.h"
+#include "compat.h"
#include <girepository.h>
#include <util/log.h>
diff --git a/gjs/byteArray.h b/gjs/byteArray.h
index b001946..72cb393 100644
--- a/gjs/byteArray.h
+++ b/gjs/byteArray.h
@@ -24,10 +24,6 @@
#ifndef __GJS_BYTE_ARRAY_H__
#define __GJS_BYTE_ARRAY_H__
-#if !defined (__GJS_GJS_H__) && !defined (GJS_COMPILATION)
-#error "Only <gjs/gjs.h> can be included directly."
-#endif
-
#include <stdbool.h>
#include <glib.h>
#include "gjs/jsapi-util.h"
diff --git a/gjs/compat.h b/gjs/compat.h
index bb6db79..ccf17b7 100644
--- a/gjs/compat.h
+++ b/gjs/compat.h
@@ -22,10 +22,6 @@
* IN THE SOFTWARE.
*/
-#if !defined (__GJS_GJS_MODULE_H__) && !defined (GJS_COMPILATION)
-#error "Only <gjs/gjs-module.h> can be included directly."
-#endif
-
#ifndef __GJS_COMPAT_H__
#define __GJS_COMPAT_H__
@@ -48,7 +44,7 @@ _Pragma("GCC diagnostic pop")
#include <stdbool.h>
#include <glib.h>
-#include <gjs/jsapi-util.h>
+#include "jsapi-util.h"
G_BEGIN_DECLS
diff --git a/gjs/console.cpp b/gjs/console.cpp
index 4b76348..f32954f 100644
--- a/gjs/console.cpp
+++ b/gjs/console.cpp
@@ -27,7 +27,8 @@
#include <locale.h>
#include <gjs/gjs.h>
-#include <gjs/coverage.h>
+
+#include "coverage.h"
static char **include_path = NULL;
static char **coverage_prefixes = NULL;
diff --git a/gjs/coverage-internal.h b/gjs/coverage-internal.h
index 2a57b2a..3f5f4c9 100644
--- a/gjs/coverage-internal.h
+++ b/gjs/coverage-internal.h
@@ -21,10 +21,6 @@
#ifndef _GJS_COVERAGE_INTERNAL_H
#define _GJS_COVERAGE_INTERNAL_H
-#ifndef GJS_COMPILATION
-#error This file is for internal use and use in the tests only
-#endif
-
#include "jsapi-util.h"
#include "coverage.h"
diff --git a/gjs/coverage.cpp b/gjs/coverage.cpp
index d7546bd..a415a13 100644
--- a/gjs/coverage.cpp
+++ b/gjs/coverage.cpp
@@ -21,10 +21,11 @@
#include <sys/stat.h>
#include <gio/gio.h>
-#include "gjs-module.h"
+#include <gjs/context.h>
+
#include "coverage.h"
#include "coverage-internal.h"
-
+#include "importer.h"
#include "util/error.h"
struct _GjsCoveragePrivate {
diff --git a/gjs/importer.cpp b/gjs/importer.cpp
index afcb1bc..3202667 100644
--- a/gjs/importer.cpp
+++ b/gjs/importer.cpp
@@ -26,9 +26,10 @@
#include <util/log.h>
#include <util/glib.h>
-#include <gjs/gjs-module.h>
-#include <gjs/importer.h>
-#include <gjs/compat.h>
+#include "compat.h"
+#include "importer.h"
+#include "mem.h"
+#include "native.h"
#include <gio/gio.h>
diff --git a/gjs/importer.h b/gjs/importer.h
index 1ba2a7f..825a79a 100644
--- a/gjs/importer.h
+++ b/gjs/importer.h
@@ -24,10 +24,6 @@
#ifndef __GJS_IMPORTER_H__
#define __GJS_IMPORTER_H__
-#if !defined (__GJS_GJS_MODULE_H__) && !defined (GJS_COMPILATION)
-#error "Only <gjs/gjs-module.h> can be included directly."
-#endif
-
#include <stdbool.h>
#include <glib.h>
#include "gjs/jsapi-util.h"
diff --git a/gjs/jsapi-util.h b/gjs/jsapi-util.h
index fa8fda0..2740a0e 100644
--- a/gjs/jsapi-util.h
+++ b/gjs/jsapi-util.h
@@ -24,16 +24,13 @@
#ifndef __GJS_JSAPI_UTIL_H__
#define __GJS_JSAPI_UTIL_H__
-#if !defined (__GJS_GJS_MODULE_H__) && !defined (GJS_COMPILATION)
-#error "Only <gjs/gjs-module.h> can be included directly."
-#endif
-
#include <stdbool.h>
-#include <gjs/compat.h>
-#include <gjs/runtime.h>
#include <glib-object.h>
-#include <gi/gtype.h>
+
+#include "gjs/compat.h"
+#include "gjs/runtime.h"
+#include "gi/gtype.h"
G_BEGIN_DECLS
diff --git a/gjs/mem.h b/gjs/mem.h
index 4f4f8d6..2b74eb1 100644
--- a/gjs/mem.h
+++ b/gjs/mem.h
@@ -24,10 +24,6 @@
#ifndef __GJS_MEM_H__
#define __GJS_MEM_H__
-#if !defined (__GJS_GJS_MODULE_H__) && !defined (GJS_COMPILATION)
-#error "Only <gjs/gjs-module.h> can be included directly."
-#endif
-
#include <stdbool.h>
#include <glib.h>
#include "gjs/jsapi-util.h"
diff --git a/gjs/native.h b/gjs/native.h
index aedc50b..92a7827 100644
--- a/gjs/native.h
+++ b/gjs/native.h
@@ -24,10 +24,6 @@
#ifndef __GJS_NATIVE_H__
#define __GJS_NATIVE_H__
-#if !defined (__GJS_GJS_MODULE_H__) && !defined (GJS_COMPILATION)
-#error "Only <gjs/gjs-module.h> can be included directly."
-#endif
-
#include <stdbool.h>
#include <glib.h>
#include "gjs/jsapi-util.h"
diff --git a/installed-tests/gjs-unit.cpp b/installed-tests/gjs-unit.cpp
index 54f7804..4f093d4 100644
--- a/installed-tests/gjs-unit.cpp
+++ b/installed-tests/gjs-unit.cpp
@@ -26,12 +26,15 @@
#include <glib.h>
#include <glib/gstdio.h>
#include <girepository.h>
-#include <gjs/gjs-module.h>
-#include <gjs/coverage.h>
#include <locale.h>
#include <string.h>
+#include <gjs/gjs.h>
+
+#include "gjs/coverage.h"
+#include "gjs/mem.h"
+
typedef struct {
const char *coverage_prefix;
const char *coverage_output_path;
diff --git a/modules/cairo-context.cpp b/modules/cairo-context.cpp
index d7f2514..8b06d47 100644
--- a/modules/cairo-context.cpp
+++ b/modules/cairo-context.cpp
@@ -22,9 +22,8 @@
#include <config.h>
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
-#include <gi/foreign.h>
+#include "gjs/compat.h"
+#include "gi/foreign.h"
#include <cairo.h>
#include <cairo-gobject.h>
diff --git a/modules/cairo-gradient.cpp b/modules/cairo-gradient.cpp
index 15ba72e..3e1e253 100644
--- a/modules/cairo-gradient.cpp
+++ b/modules/cairo-gradient.cpp
@@ -22,8 +22,7 @@
#include <config.h>
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
+#include "gjs/compat.h"
#include <cairo.h>
#include "cairo-private.h"
diff --git a/modules/cairo-image-surface.cpp b/modules/cairo-image-surface.cpp
index ba670b7..dfd11ed 100644
--- a/modules/cairo-image-surface.cpp
+++ b/modules/cairo-image-surface.cpp
@@ -22,8 +22,7 @@
#include <config.h>
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
+#include "gjs/compat.h"
#include <cairo.h>
#include "cairo-private.h"
diff --git a/modules/cairo-linear-gradient.cpp b/modules/cairo-linear-gradient.cpp
index b4ff0c6..6571779 100644
--- a/modules/cairo-linear-gradient.cpp
+++ b/modules/cairo-linear-gradient.cpp
@@ -22,8 +22,7 @@
#include <config.h>
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
+#include "gjs/compat.h"
#include <cairo.h>
#include "cairo-private.h"
diff --git a/modules/cairo-path.cpp b/modules/cairo-path.cpp
index 30ab957..64b6630 100644
--- a/modules/cairo-path.cpp
+++ b/modules/cairo-path.cpp
@@ -22,8 +22,7 @@
#include <config.h>
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
+#include "gjs/compat.h"
#include <cairo.h>
#include "cairo-private.h"
diff --git a/modules/cairo-pattern.cpp b/modules/cairo-pattern.cpp
index d2d0c99..8f27cda 100644
--- a/modules/cairo-pattern.cpp
+++ b/modules/cairo-pattern.cpp
@@ -22,8 +22,7 @@
#include <config.h>
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
+#include "gjs/compat.h"
#include <cairo.h>
#include <cairo-gobject.h>
#include "cairo-private.h"
diff --git a/modules/cairo-pdf-surface.cpp b/modules/cairo-pdf-surface.cpp
index cbbb415..2812208 100644
--- a/modules/cairo-pdf-surface.cpp
+++ b/modules/cairo-pdf-surface.cpp
@@ -22,8 +22,7 @@
#include <config.h>
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
+#include "gjs/compat.h"
#include <cairo.h>
#include "cairo-private.h"
diff --git a/modules/cairo-ps-surface.cpp b/modules/cairo-ps-surface.cpp
index dee145d..63c60e3 100644
--- a/modules/cairo-ps-surface.cpp
+++ b/modules/cairo-ps-surface.cpp
@@ -22,8 +22,7 @@
#include <config.h>
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
+#include "gjs/compat.h"
#include <cairo.h>
#include "cairo-private.h"
diff --git a/modules/cairo-radial-gradient.cpp b/modules/cairo-radial-gradient.cpp
index ca373f0..23052f3 100644
--- a/modules/cairo-radial-gradient.cpp
+++ b/modules/cairo-radial-gradient.cpp
@@ -22,8 +22,7 @@
#include <config.h>
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
+#include "gjs/compat.h"
#include <cairo.h>
#include "cairo-private.h"
diff --git a/modules/cairo-region.cpp b/modules/cairo-region.cpp
index 9263821..66e1098 100644
--- a/modules/cairo-region.cpp
+++ b/modules/cairo-region.cpp
@@ -22,9 +22,8 @@
#include <config.h>
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
-#include <gi/foreign.h>
+#include "gjs/compat.h"
+#include "gi/foreign.h"
#include <cairo.h>
#include <cairo-gobject.h>
diff --git a/modules/cairo-solid-pattern.cpp b/modules/cairo-solid-pattern.cpp
index 5bb4a8b..e9ca032 100644
--- a/modules/cairo-solid-pattern.cpp
+++ b/modules/cairo-solid-pattern.cpp
@@ -22,8 +22,7 @@
#include <config.h>
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
+#include "gjs/compat.h"
#include <cairo.h>
#include "cairo-private.h"
diff --git a/modules/cairo-surface-pattern.cpp b/modules/cairo-surface-pattern.cpp
index 1a3b3c6..3440f32 100644
--- a/modules/cairo-surface-pattern.cpp
+++ b/modules/cairo-surface-pattern.cpp
@@ -22,8 +22,7 @@
#include <config.h>
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
+#include "gjs/compat.h"
#include <cairo.h>
#include "cairo-private.h"
diff --git a/modules/cairo-surface.cpp b/modules/cairo-surface.cpp
index feba845..7d2dc67 100644
--- a/modules/cairo-surface.cpp
+++ b/modules/cairo-surface.cpp
@@ -22,9 +22,8 @@
#include <config.h>
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
-#include <gi/foreign.h>
+#include "gjs/compat.h"
+#include "gi/foreign.h"
#include <cairo.h>
#include <cairo-gobject.h>
#include "cairo-private.h"
diff --git a/modules/cairo-svg-surface.cpp b/modules/cairo-svg-surface.cpp
index f305285..483cf2d 100644
--- a/modules/cairo-svg-surface.cpp
+++ b/modules/cairo-svg-surface.cpp
@@ -22,8 +22,7 @@
#include <config.h>
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
+#include "gjs/compat.h"
#include <cairo.h>
#include "cairo-private.h"
diff --git a/modules/cairo.cpp b/modules/cairo.cpp
index 1a840c4..7e4b915 100644
--- a/modules/cairo.cpp
+++ b/modules/cairo.cpp
@@ -22,9 +22,7 @@
#include <config.h>
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
-
+#include "gjs/compat.h"
#include "cairo-private.h"
#if CAIRO_HAS_XLIB_SURFACE
diff --git a/modules/console.cpp b/modules/console.cpp
index eb1faa7..e54a511 100644
--- a/modules/console.cpp
+++ b/modules/console.cpp
@@ -51,11 +51,10 @@
#include <glib.h>
#include <glib/gprintf.h>
-#include <gjs/gjs-module.h>
-#include <gjs/compat.h>
-#include <gjs/jsapi-private.h>
#include "console.h"
+#include "gjs/compat.h"
+#include "gjs/jsapi-private.h"
static void
gjs_console_error_reporter(JSContext *cx, const char *message, JSErrorReport *report)
diff --git a/modules/modules.cpp b/modules/modules.cpp
index aae3569..555171d 100644
--- a/modules/modules.cpp
+++ b/modules/modules.cpp
@@ -23,7 +23,7 @@
#include <config.h>
-#include <gjs/native.h>
+#include "gjs/native.h"
#include "modules.h"
#ifdef ENABLE_CAIRO
diff --git a/modules/system.cpp b/modules/system.cpp
index 06f7367..bab0667 100644
--- a/modules/system.cpp
+++ b/modules/system.cpp
@@ -28,8 +28,9 @@
#include <unistd.h>
#include <time.h>
-#include <gjs/gjs-module.h>
-#include <gi/object.h>
+#include <gjs/context.h>
+
+#include "gi/object.h"
#include "system.h"
static JSBool
diff --git a/test/gjs-test-coverage.cpp b/test/gjs-test-coverage.cpp
index 47e567d..c413c50 100644
--- a/test/gjs-test-coverage.cpp
+++ b/test/gjs-test-coverage.cpp
@@ -32,9 +32,9 @@
#include <gio/gio.h>
#include <gio/gunixoutputstream.h>
#include <gjs/gjs.h>
-#include <gjs/coverage.h>
-#include <gjs/coverage-internal.h>
-#include <gjs/gjs-module.h>
+
+#include "gjs/coverage.h"
+#include "gjs/coverage-internal.h"
typedef struct _GjsCoverageFixture {
GjsContext *context;
diff --git a/test/gjs-tests.cpp b/test/gjs-tests.cpp
index 0a17c8d..ac186d7 100644
--- a/test/gjs-tests.cpp
+++ b/test/gjs-tests.cpp
@@ -24,10 +24,12 @@
#include <config.h>
#include <glib.h>
#include <glib-object.h>
-#include <gjs/gjs-module.h>
#include <util/glib.h>
#include <util/crash.h>
+#include <gjs/context.h>
+
+#include "gjs/compat.h"
#include "gjs-tests-add-funcs.h"
typedef struct _GjsUnitTestFixture GjsUnitTestFixture;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
