diff options
author | Emmanuele Bassi <ebassi@gnome.org> | 2017-08-03 13:15:04 +0100 |
---|---|---|
committer | Emmanuele Bassi <ebassi@gnome.org> | 2017-08-03 13:19:47 +0100 |
commit | b09e4ca69b4dca6fd9d2e98a3722d765f86c837f (patch) | |
tree | 6b8044d29eaaf43066fce365eeb6e1f37111848c | |
parent | 861a6dbea289d1ed98af1f66eb8024bc04464bd9 (diff) | |
download | gdk-pixbuf-b09e4ca69b4dca6fd9d2e98a3722d765f86c837f.tar.gz |
Move all aux scripts to their own directory
This makes it easier to find them and reference them.
-rw-r--r-- | Makefile.am | 7 | ||||
-rwxr-xr-x | build-aux/gen-color-table.pl (renamed from gdk-pixbuf/gen-color-table.pl) | 0 | ||||
-rw-r--r-- | build-aux/gen-installed-test.py (renamed from tests/gen-installed-test.py) | 0 | ||||
-rw-r--r-- | build-aux/gen-resources.py (renamed from tests/gen-resources.py) | 0 | ||||
-rw-r--r-- | build-aux/gen-thumbnailer.py (renamed from thumbnailer/gen-thumbnailer.py) | 0 | ||||
-rw-r--r-- | gdk-pixbuf/Makefile.am | 1 | ||||
-rw-r--r-- | meson.build | 5 | ||||
-rw-r--r-- | tests/meson.build | 3 | ||||
-rw-r--r-- | thumbnailer/meson.build | 1 |
9 files changed, 9 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 9779b24a2..68cb49f9d 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 index 8b02fe583..8b02fe583 100755 --- a/gdk-pixbuf/gen-color-table.pl +++ b/build-aux/gen-color-table.pl diff --git a/tests/gen-installed-test.py b/build-aux/gen-installed-test.py index 745abf339..745abf339 100644 --- a/tests/gen-installed-test.py +++ b/build-aux/gen-installed-test.py diff --git a/tests/gen-resources.py b/build-aux/gen-resources.py index 4c182d9cf..4c182d9cf 100644 --- a/tests/gen-resources.py +++ b/build-aux/gen-resources.py diff --git a/thumbnailer/gen-thumbnailer.py b/build-aux/gen-thumbnailer.py index 9994043f9..9994043f9 100644 --- a/thumbnailer/gen-thumbnailer.py +++ b/build-aux/gen-thumbnailer.py diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index d5901dcdf..01b693ce9 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 b0be82acf..a754c9d49 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 50d4b1d19..a40ea9413 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 6a2fd2ac5..e80114491 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', |