Commit 4cd52519 authored by Ting-Wei Lan's avatar Ting-Wei Lan Committed by Øyvind "pippin" Kolås

docs: Depend on operations

Documentation generation relies on programs built in 'tools' directory,
which load modules at runtime from 'operations' directory. While the
dependency on 'tools' is correctly handled by meson because the use of
meson variables, 'operations' is not handled at all. This makes it
possible for 'gallery-stamp' target, which uses 'gegl-tester', to run
before modules in 'operations' are built. 'gegl-tester' fails badly in
this case. It ends up being killed by the kernel because it uses up the
memory on the system.

Fixes: #204
parent f7ad2c71
......@@ -15,6 +15,7 @@ html_files += custom_target('class-hierarchy.html',
'GEGL_PATH='+ meson.build_root() / 'operations',
introspect,
],
depends: gegl_operations,
build_by_default : true,
capture: true,
)
......@@ -174,6 +175,7 @@ gnome.gtkdoc('gegl',
'-e', '"' + exclusion_pattern + '"', '||', 'true', '&&', 'touch', '../gallery-stamp'
])
],
depends: gegl_operations,
)
meson.add_install_script('install-docs.sh')
......@@ -32,3 +32,5 @@ gegl_common_cxx = shared_library('gegl-common-cxx',
install: true,
install_dir: get_option('libdir') / api_name,
)
gegl_operations += gegl_common_cxx
......@@ -80,3 +80,5 @@ gegl_common_gpl3 = shared_library('gegl-common-gpl3',
install: true,
install_dir: get_option('libdir') / api_name,
)
gegl_operations += gegl_common_gpl3
......@@ -142,3 +142,5 @@ gegl_common = shared_library('gegl-common',
install: true,
install_dir: get_option('libdir') / api_name,
)
gegl_operations += gegl_common
......@@ -37,3 +37,5 @@ gegl_core = shared_library('gegl-core',
install: true,
install_dir: get_option('libdir') / api_name,
)
gegl_operations += gegl_core
......@@ -115,7 +115,7 @@ foreach operation : operations
libsrcs = operation.get('srcs', libname + '.c')
libdeps = operation.get('deps', [])
shared_library(libname,
gegl_operations += shared_library(libname,
libsrcs,
dependencies: [ babl, gio, glib, gobject, math, libdeps, ],
include_directories: [ rootInclude, geglInclude, ],
......
......@@ -54,3 +54,5 @@ gegl_generated = shared_library('gegl-generated',
install: true,
install_dir: get_option('libdir') / api_name,
)
gegl_operations += gegl_generated
gegl_operations = []
subdir('common-gpl3+')
subdir('common-cxx')
subdir('common')
......
......@@ -5,7 +5,7 @@ seamless_clone_libs = [
]
foreach lib : seamless_clone_libs
shared_library(lib,
gegl_operations += shared_library(lib,
files(lib + '.c'),
include_directories: [ rootInclude, geglInclude, seamlessInclude, ],
dependencies: [
......
......@@ -29,3 +29,5 @@ gegl_transformops = shared_library('transformops',
install: true,
install_dir: get_option('libdir') / api_name,
)
gegl_operations += gegl_transformops
if lua.found()
shared_library('gluas',
gegl_operations += shared_library('gluas',
'gluas.c',
include_directories: [ rootInclude, geglInclude, seamlessInclude, ],
dependencies: [
......@@ -20,7 +20,7 @@ if lua.found()
endif
if lensfun.found()
shared_library('lens-correct',
gegl_operations += shared_library('lens-correct',
'lens-correct.c',
include_directories: [ rootInclude, geglInclude, seamlessInclude, ],
dependencies: [
......@@ -40,7 +40,7 @@ if lensfun.found()
endif
if cairo.found()
shared_library('line-profile',
gegl_operations += shared_library('line-profile',
'line-profile.c',
include_directories: [ rootInclude, geglInclude, seamlessInclude, ],
dependencies: [
......@@ -60,7 +60,7 @@ if cairo.found()
endif
if libv4l2.found()
shared_library('v4l2',
gegl_operations += shared_library('v4l2',
'v4l2.c',
include_directories: [ rootInclude, geglInclude, seamlessInclude, ],
dependencies: [
......
......@@ -9,7 +9,7 @@ libraries = [
]
foreach lib : libraries
shared_library(lib,
gegl_operations += shared_library(lib,
lib + '.c',
include_directories: [ rootInclude, geglInclude, seamlessInclude, ],
dependencies: [
......
......@@ -24,7 +24,7 @@ libraries = [
foreach lib : libraries
libname = lib.get('name')
libsrcs = lib.get('srcs', libname + '.c')
shared_library(libname,
gegl_operations += shared_library(libname,
libsrcs,
opencl_headers,
include_directories: [ rootInclude, geglInclude, seamlessInclude, ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment