From fe88bee331957858362644dd46f5e3f47a98543e Mon Sep 17 00:00:00 2001 From: Dustin Falgout Date: Thu, 29 Sep 2016 01:40:49 -0500 Subject: [PATCH] move gresource files into separate directory --- src/greeter.c | 2 +- src/{ => gresource}/greeter-style-css.c | 0 src/{ => gresource}/greeter-style-css.h | 0 src/gresource/meson.build | 7 +++++++ src/meson.build | 12 ++++++++++++ 5 files changed, 20 insertions(+), 1 deletion(-) rename src/{ => gresource}/greeter-style-css.c (100%) rename src/{ => gresource}/greeter-style-css.h (100%) create mode 100644 src/gresource/meson.build diff --git a/src/greeter.c b/src/greeter.c index eadbaa3..8bd60b2 100644 --- a/src/greeter.c +++ b/src/greeter.c @@ -48,7 +48,7 @@ #include -#include "greeter-style-css.h" +#include "gresource/greeter-style-css.h" static GtkWidget *web_view; static GtkWidget *window; diff --git a/src/greeter-style-css.c b/src/gresource/greeter-style-css.c similarity index 100% rename from src/greeter-style-css.c rename to src/gresource/greeter-style-css.c diff --git a/src/greeter-style-css.h b/src/gresource/greeter-style-css.h similarity index 100% rename from src/greeter-style-css.h rename to src/gresource/greeter-style-css.h diff --git a/src/gresource/meson.build b/src/gresource/meson.build new file mode 100644 index 0000000..aea0fb7 --- /dev/null +++ b/src/gresource/meson.build @@ -0,0 +1,7 @@ +# =============================== # +# ------->>> GRESOURCE <<<------- # +# =============================== # + +gresource_headers = ['greeter-style-css.h'] + +install_headers(gresource_headers, subdir : 'lightdm-webkit2-greeter') diff --git a/src/meson.build b/src/meson.build index 18dbafa..54a1b5a 100644 --- a/src/meson.build +++ b/src/meson.build @@ -22,6 +22,7 @@ webext = shared_library( greeter_headers = ['greeter-style-css.h'] greeter_sources = ['greeter-style-css.c', 'greeter.c'] +gresource_sources = include_directories('gresource') extdir = '"@0@/@1@"'.format(get_option('libdir'), 'lightdm-webkit2-greeter') @@ -37,3 +38,14 @@ greeter = executable( dependencies: deps, c_args: greeter_cargs, install: true) + + +# ===================================== # +# ------->>> Sub Directories <<<------- # +# ===================================== # + +subdirs = ['gresource'] + +foreach s : subdirs + subdir(s) +endforeach