[gdk-pixbuf] Move all aux scripts to their own directory



commit b09e4ca69b4dca6fd9d2e98a3722d765f86c837f
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Thu Aug 3 13:15:04 2017 +0100

    Move all aux scripts to their own directory
    
    This makes it easier to find them and reference them.

 Makefile.am                                   |    7 ++++---
 {gdk-pixbuf => build-aux}/gen-color-table.pl  |    0
 {tests => build-aux}/gen-installed-test.py    |    0
 {tests => build-aux}/gen-resources.py         |    0
 {thumbnailer => build-aux}/gen-thumbnailer.py |    0
 gdk-pixbuf/Makefile.am                        |    1 -
 meson.build                                   |    5 +++++
 tests/meson.build                             |    3 ---
 thumbnailer/meson.build                       |    1 -
 9 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 9779b24..68cb49f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,10 +9,11 @@ meson_files = \
        contrib/gdk-pixbuf-xlib/meson.build \
        po/meson.build \
        tests/meson.build \
-       tests/gen-installed-test.py \
-       tests/gen-resources.py \
        thumbnailer/meson.build \
-       thumbnailer/gen-thumbnailer.py \
+       build-aux/gen-color-table.pl \
+       build-aux/gen-installed-test.py \
+       build-aux/gen-resources.py \
+       build-aux/gen-thumbnailer.py \
        $()
 
 EXTRA_DIST =                   \
diff --git a/gdk-pixbuf/gen-color-table.pl b/build-aux/gen-color-table.pl
similarity index 100%
rename from gdk-pixbuf/gen-color-table.pl
rename to build-aux/gen-color-table.pl
diff --git a/tests/gen-installed-test.py b/build-aux/gen-installed-test.py
similarity index 100%
rename from tests/gen-installed-test.py
rename to build-aux/gen-installed-test.py
diff --git a/tests/gen-resources.py b/build-aux/gen-resources.py
similarity index 100%
rename from tests/gen-resources.py
rename to build-aux/gen-resources.py
diff --git a/thumbnailer/gen-thumbnailer.py b/build-aux/gen-thumbnailer.py
similarity index 100%
rename from thumbnailer/gen-thumbnailer.py
rename to build-aux/gen-thumbnailer.py
diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index d5901dc..01b693c 100644
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -595,7 +595,6 @@ EXTRA_DIST =                                        \
        gdk-pixbuf-marshal.list                 \
        gdk-pixbuf-enum-types.c.template        \
        gdk-pixbuf-enum-types.h.template        \
-       gen-color-table.pl                      \
        gdiplus.def                             \
        fallback-c89.c
 
diff --git a/meson.build b/meson.build
index b0be82a..a754c9d 100644
--- a/meson.build
+++ b/meson.build
@@ -283,6 +283,11 @@ configure_file(input: 'gdk-pixbuf-2.0.pc.in',
 
 root_inc = include_directories('.')
 
+# Auxiliary scripts
+gen_resources = find_program('build-aux/gen-resources.py')
+gen_installed_test = find_program('build-aux/gen-installed-test.py')
+gen_thumbnailer = find_program('build-aux/gen-thumbnailer.py')
+
 gnome = import('gnome')
 
 subdir('gdk-pixbuf')
diff --git a/tests/meson.build b/tests/meson.build
index 50d4b1d..a40ea94 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,7 +1,6 @@
 # Resources; we cannot use gnome.compile_resources() here, because we need to
 # override the environment in order to use the utilities we just built instead
 # of the system ones
-gen_resources = find_program('gen-resources.py')
 resources_c = custom_target('resources.c',
                             input: 'resources.gresource.xml',
                             output: 'resources.c',
@@ -83,8 +82,6 @@ test_data = [
   'aero.gif',
 ]
 
-gen_installed_test = find_program('gen-installed-test.py')
-
 installed_test_bindir = join_paths(gdk_pixbuf_libexecdir, 'installed-tests', gdk_pixbuf_api_name)
 installed_test_datadir = join_paths(gdk_pixbuf_datadir, 'installed-tests', gdk_pixbuf_api_name)
 
diff --git a/thumbnailer/meson.build b/thumbnailer/meson.build
index 6a2fd2a..e801144 100644
--- a/thumbnailer/meson.build
+++ b/thumbnailer/meson.build
@@ -12,7 +12,6 @@ gdk_pixbuf_print_mime_types = executable('gdk-pixbuf-print-mime-types',
                                          c_args: common_cflags,
                                          dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ])
 
-gen_thumbnailer = find_program('gen-thumbnailer.py')
 custom_target('thumbnailer',
               input: 'gdk-pixbuf-thumbnailer.thumbnailer.in',
               output: 'gdk-pixbuf-thumbnailer.thumbnailer',


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]