diff options
| author | Corentin Noël <corentin.noel@collabora.com> | 2021-11-23 15:20:00 +0100 |
|---|---|---|
| committer | Corentin Noël <tintou@noel.tf> | 2022-04-09 00:10:36 +0200 |
| commit | f6c18ca557f745515f73d184573195b8b2de0429 (patch) | |
| tree | 88dd74f2f873e89e2202cdf72d028ab973bc57bd /docs | |
| parent | 36cadb9580d5135f8dd50ea63d1bd5d19893ebcc (diff) | |
| download | gcr-f6c18ca557f745515f73d184573195b8b2de0429.tar.gz | |
gcr: Remove gcr-base-3 and make gcr-3 independent of GTK
Also remove the post-install symlinks
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/gcr/gcr.toml.in (renamed from docs/gcr/gcr-base.toml.in) | 0 | ||||
| -rw-r--r-- | docs/gcr/meson.build | 12 | ||||
| -rw-r--r-- | docs/meson.build | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/docs/gcr/gcr-base.toml.in b/docs/gcr/gcr.toml.in index 1b89810..1b89810 100644 --- a/docs/gcr/gcr-base.toml.in +++ b/docs/gcr/gcr.toml.in diff --git a/docs/gcr/meson.build b/docs/gcr/meson.build index d80b7c7..b7a33fb 100644 --- a/docs/gcr/meson.build +++ b/docs/gcr/meson.build @@ -1,11 +1,11 @@ -gcr_base_content_files = [ +gcr_content_files = [ 'non-pageable-memory.md', 'pkcs11-configuration.md', 'trust-store.md', ] -gcr_base_toml = configure_file( - input: 'gcr-base.toml.in', +gcr_toml = configure_file( + input: 'gcr.toml.in', output: '@BASENAME@', configuration: { 'GCR_VERSION': gcr_api_version, @@ -13,7 +13,7 @@ gcr_base_toml = configure_file( }, ) -gcr_base_docs = custom_target('gcr-docs', +gcr_docs = custom_target('gcr-docs', input: gcr_gir[0], output: gcr_basename, command: [ @@ -22,13 +22,13 @@ gcr_base_docs = custom_target('gcr-docs', '--quiet', '--fatal-warnings', '--add-include-path=@0@'.format(build_root / 'gck'), - '--config', gcr_base_toml, + '--config', gcr_toml, '--output-dir=@OUTPUT@', '--no-namespace-dir', '--content-dir=@0@'.format(meson.current_source_dir()), '@INPUT@', ], - depend_files: [ gcr_base_toml, gcr_base_content_files ], + depend_files: [ gcr_toml, gcr_content_files ], depends: [ gck_gir[0] ], build_by_default: true, install: true, diff --git a/docs/meson.build b/docs/meson.build index b90095c..9cdebc3 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -7,6 +7,6 @@ subdir('ui') # Create a pseudo target that build all docs at once alias_target('docs', gck_docs, - gcr_base_docs, + gcr_docs, gcr_ui_docs, ) |