Rename config-parser.h to libweston/config-parser.h

It is a public installed header used by libweston.h.

See "Rename compositor.h to libweston/libweston.h" for rationale.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>

clients/desktop-shell.c

@@ -43,7 +43,7 @@
 #include <wayland-client.h>
 #include "window.h"
 #include "shared/cairo-util.h"
-#include "shared/config-parser.h"
+#include <libweston/config-parser.h>
 #include "shared/helpers.h"
 #include "shared/xalloc.h"
 #include "shared/zalloc.h"

clients/editor.c

@@ -38,7 +38,7 @@
 
 #include <pango/pangocairo.h>
 
-#include "shared/config-parser.h"
+#include <libweston/config-parser.h>
 #include "shared/helpers.h"
 #include "shared/xalloc.h"
 #include "window.h"

clients/ivi-shell-user-interface.c

@@ -38,7 +38,7 @@
 #include <wayland-cursor.h>
 #include <wayland-client-protocol.h>
 #include "shared/cairo-util.h"
-#include "shared/config-parser.h"
+#include <libweston/config-parser.h>
 #include "shared/helpers.h"
 #include "shared/os-compatibility.h"
 #include "shared/xalloc.h"

clients/terminal.c

@@ -44,7 +44,7 @@
 
 #include <wayland-client.h>
 
-#include "shared/config-parser.h"
+#include <libweston/config-parser.h>
 #include "shared/helpers.h"
 #include "shared/xalloc.h"
 #include "window.h"

clients/window.h

@@ -31,7 +31,7 @@
 #include <xkbcommon/xkbcommon.h>
 #include <wayland-client.h>
 #include <cairo.h>
-#include "shared/config-parser.h"
+#include <libweston/config-parser.h>
 #include "shared/zalloc.h"
 #include "shared/platform.h"
 

desktop-shell/shell.c

@@ -39,7 +39,7 @@
 #include "shell.h"
 #include "compositor/weston.h"
 #include "weston-desktop-shell-server-protocol.h"
-#include "shared/config-parser.h"
+#include <libweston/config-parser.h>
 #include "shared/helpers.h"
 #include "shared/timespec-util.h"
 #include "libweston-desktop/libweston-desktop.h"

include/libweston/libweston.h

@@ -42,7 +42,7 @@ extern "C" {
 #include <wayland-server.h>
 
 #include <libweston/matrix.h>
-#include "config-parser.h"
+#include <libweston/config-parser.h>
 #include "zalloc.h"
 #include <libweston/timeline-object.h>
 

include/libweston/meson.build

@@ -1,4 +1,5 @@
 install_headers(
+	'config-parser.h',
 	'libweston.h',
 	'matrix.h',
 	'plugin-registry.h',

libweston/compositor-x11.c

@@ -52,7 +52,6 @@
 
 #include <libweston/libweston.h>
 #include <libweston/backend-x11.h>
-#include "shared/config-parser.h"
 #include "shared/helpers.h"
 #include "shared/image-loader.h"
 #include "shared/timespec-util.h"

libweston/meson.build

@@ -57,7 +57,6 @@ srcs_libweston = [
 ]
 
 install_headers(
-	'../shared/config-parser.h',
 	'../shared/zalloc.h',
 	subdir: dir_include_libweston
 )

shared/cairo-util.c

@@ -37,7 +37,7 @@
 
 #include "shared/helpers.h"
 #include "image-loader.h"
-#include "config-parser.h"
+#include <libweston/config-parser.h>
 
 #ifdef HAVE_PANGO
 #include <pango/pangocairo.h>
@@ -543,7 +543,7 @@ theme_render_frame(struct theme *t,
 		text_height = logical.height;
 		if (text_width < logical.width)
 		  pango_layout_set_width (title_layout, text_width * PANGO_SCALE);
-		
+
 #else
 		cairo_text_extents_t extents;
 		cairo_font_extents_t font_extents;

shared/config-parser.c

@@ -39,7 +39,7 @@
 #include <errno.h>
 
 #include <wayland-util.h>
-#include "config-parser.h"
+#include <libweston/config-parser.h>
 #include "helpers.h"
 #include "string-helpers.h"
 

shared/meson.build

@@ -10,7 +10,7 @@ deps_libshared = dep_wayland_client
 lib_libshared = static_library(
 	'shared',
 	srcs_libshared,
-	include_directories: include_directories('..'),
+	include_directories: [ include_directories('..'), public_inc ],
 	dependencies: deps_libshared,
 	pic: true,
 	install: false

shared/option-parser.c

@@ -33,7 +33,7 @@
 #include <assert.h>
 #include <errno.h>
 
-#include "config-parser.h"
+#include <libweston/config-parser.h>
 #include "string-helpers.h"
 
 static bool

tests/config-parser-test.c

@@ -33,7 +33,7 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "config-parser.h"
+#include <libweston/config-parser.h>
 
 #include "shared/helpers.h"
 #include "zunitc/zunitc.h"

tests/weston-test-desktop-shell.c

@@ -37,7 +37,7 @@
 #include <sys/types.h>
 
 #include "compositor/weston.h"
-#include "shared/config-parser.h"
+#include <libweston/config-parser.h>
 #include "shared/helpers.h"
 #include "libweston-desktop/libweston-desktop.h"
 

tools/zunitc/src/zunitc_impl.c

@@ -46,7 +46,7 @@
 #include "zuc_event_listener.h"
 #include "zuc_junit_reporter.h"
 
-#include "shared/config-parser.h"
+#include <libweston/config-parser.h>
 #include "shared/helpers.h"
 #include "shared/zalloc.h"