aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRasmus Thomsen <oss@cogitri.dev>2020-10-01 17:56:12 +0200
committerTimo Teräs <timo.teras@iki.fi>2020-10-02 12:07:05 +0300
commit4483a58386f5e320d8aafb1087cc537af8e1ee6a (patch)
tree013501b2a55f14dba4580c3782f7c202e1c589ba
parent193a1bb253157b4ce97e185923f642db1b00ba26 (diff)
build: use tabs for meson files
-rw-r--r--meson.build18
-rw-r--r--src/meson.build248
2 files changed, 133 insertions, 133 deletions
diff --git a/meson.build b/meson.build
index c2fa337..9bf7748 100644
--- a/meson.build
+++ b/meson.build
@@ -1,9 +1,9 @@
project(
- 'apk-tools',
- ['c'],
- default_options : ['c_std=gnu99'],
- version: '2.10.5',
- meson_version: '>=0.51'
+ 'apk-tools',
+ ['c'],
+ default_options : ['c_std=gnu99'],
+ version: '2.10.5',
+ meson_version: '>=0.51'
)
pkgc = import('pkgconfig')
@@ -15,13 +15,13 @@ lua_dep = dependency('lua' + get_option('lua_version'), required: get_option('lu
scdoc_dep = dependency('scdoc', version: '>=1.10', required: get_option('docs'))
shared_deps = [
- dependency('zlib'),
- dependency('openssl'),
+ dependency('zlib'),
+ dependency('openssl'),
]
static_deps = [
- dependency('openssl', static: true),
- dependency('zlib', static: true),
+ dependency('openssl', static: true),
+ dependency('zlib', static: true),
]
add_project_arguments('-D_GNU_SOURCE', language: 'c')
diff --git a/src/meson.build b/src/meson.build
index e104a05..a5a0f73 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,165 +1,165 @@
libapk_src = [
- 'atom.c',
- 'blob.c',
- 'commit.c',
- 'common.c',
- 'database.c',
- 'hash.c',
- 'io.c',
- 'io_archive.c',
- 'io_url.c',
- 'io_gunzip.c',
- 'package.c',
- 'print.c',
- 'solver.c',
- 'version.c',
+ 'atom.c',
+ 'blob.c',
+ 'commit.c',
+ 'common.c',
+ 'database.c',
+ 'hash.c',
+ 'io.c',
+ 'io_archive.c',
+ 'io_url.c',
+ 'io_gunzip.c',
+ 'package.c',
+ 'print.c',
+ 'solver.c',
+ 'version.c',
]
libapk_headers = [
- 'apk_applet.h',
- 'apk_atom.h',
- 'apk_archive.h',
- 'apk_blob.h',
- 'apk_database.h',
- 'apk_defines.h',
- 'apk_hash.h',
- 'apk_io.h',
- 'apk_openssl.h',
- 'apk_package.h',
- 'apk_print.h',
- 'apk_provider_data.h',
- 'apk_solver_data.h',
- 'apk_solver.h',
- 'apk_version.h',
+ 'apk_applet.h',
+ 'apk_atom.h',
+ 'apk_archive.h',
+ 'apk_blob.h',
+ 'apk_database.h',
+ 'apk_defines.h',
+ 'apk_hash.h',
+ 'apk_io.h',
+ 'apk_openssl.h',
+ 'apk_package.h',
+ 'apk_print.h',
+ 'apk_provider_data.h',
+ 'apk_solver_data.h',
+ 'apk_solver.h',
+ 'apk_version.h',
]
apk_src = [
- 'apk.c',
- 'app_add.c',
- 'app_audit.c',
- 'app_cache.c',
- 'app_del.c',
- 'app_dot.c',
- 'app_fetch.c',
- 'app_fix.c',
- 'app_index.c',
- 'app_info.c',
- 'app_list.c',
- 'app_manifest.c',
- 'app_policy.c',
- 'app_update.c',
- 'app_upgrade.c',
- 'app_search.c',
- 'app_stats.c',
- 'app_verify.c',
- 'app_version.c',
- 'help.c',
+ 'apk.c',
+ 'app_add.c',
+ 'app_audit.c',
+ 'app_cache.c',
+ 'app_del.c',
+ 'app_dot.c',
+ 'app_fetch.c',
+ 'app_fix.c',
+ 'app_index.c',
+ 'app_info.c',
+ 'app_list.c',
+ 'app_manifest.c',
+ 'app_policy.c',
+ 'app_update.c',
+ 'app_upgrade.c',
+ 'app_search.c',
+ 'app_stats.c',
+ 'app_verify.c',
+ 'app_version.c',
+ 'help.c',
]
if lua_bin.found()
- genhelp_script = find_program('genhelp.lua')
+ genhelp_script = find_program('genhelp.lua')
- generated_help = custom_target(
- 'help.h',
- capture: true,
- output: 'help.h',
- input: man_files,
- command: [genhelp_script, '@INPUT@'],
- )
+ generated_help = custom_target(
+ 'help.h',
+ capture: true,
+ output: 'help.h',
+ input: man_files,
+ command: [genhelp_script, '@INPUT@'],
+ )
else
- generated_help = custom_target(
- 'help.h',
- capture: true,
- output: 'help.h',
- command: ['echo', '#define NO_HELP'],
- )
+ generated_help = custom_target(
+ 'help.h',
+ capture: true,
+ output: 'help.h',
+ command: ['echo', '#define NO_HELP'],
+ )
endif
apk_src += [ generated_help ]
apk_cargs = [
- '-DAPK_VERSION="' + meson.project_version() + '"',
- '-D_ATFILE_SOURCE',
+ '-DAPK_VERSION="' + meson.project_version() + '"',
+ '-D_ATFILE_SOURCE',
]
libapk_shared = shared_library(
- 'apk',
- libapk_src,
- version: meson.project_version(),
- install: not subproject,
- dependencies: [
- libfetch_dep,
- shared_deps,
- ],
- c_args: apk_cargs,
+ 'apk',
+ libapk_src,
+ version: meson.project_version(),
+ install: not subproject,
+ dependencies: [
+ libfetch_dep,
+ shared_deps,
+ ],
+ c_args: apk_cargs,
)
libapk_static = static_library(
- 'apk',
- libapk_src,
- install: not subproject,
- dependencies: [
- libfetch_dep,
- static_deps,
- ],
- c_args: [apk_cargs, '-DOPENSSL_NO_ENGINE'],
+ 'apk',
+ libapk_src,
+ install: not subproject,
+ dependencies: [
+ libfetch_dep,
+ static_deps,
+ ],
+ c_args: [apk_cargs, '-DOPENSSL_NO_ENGINE'],
)
libapk_dep = declare_dependency(
- link_with: libapk_shared,
+ link_with: libapk_shared,
)
if not subproject
- pkgc.generate(
- libapk_shared,
- name: 'apk',
- version: meson.project_version(),
- )
+ pkgc.generate(
+ libapk_shared,
+ name: 'apk',
+ version: meson.project_version(),
+ )
- install_headers(
- libapk_headers,
- subdir: 'apk',
- )
+ install_headers(
+ libapk_headers,
+ subdir: 'apk',
+ )
endif
if(lua_dep.found())
- luaapk_src = [
- 'lua-apk.c',
- ]
+ luaapk_src = [
+ 'lua-apk.c',
+ ]
- libluaapk = library(
- 'luaapk',
- luaapk_src,
- dependencies: [lua_dep, libapk_dep],
- install: true,
- install_dir: lua_dep.get_pkgconfig_variable('libdir'),
- c_args: apk_cargs,
- )
+ libluaapk = library(
+ 'luaapk',
+ luaapk_src,
+ dependencies: [lua_dep, libapk_dep],
+ install: true,
+ install_dir: lua_dep.get_pkgconfig_variable('libdir'),
+ c_args: apk_cargs,
+ )
endif
apk_exe = executable(
- 'apk',
- apk_src,
- install: not subproject,
- dependencies: [
- libapk_dep,
- shared_deps,
- libfetch_dep.partial_dependency(includes: true),
- ],
- c_args: apk_cargs,
+ 'apk',
+ apk_src,
+ install: not subproject,
+ dependencies: [
+ libapk_dep,
+ shared_deps,
+ libfetch_dep.partial_dependency(includes: true),
+ ],
+ c_args: apk_cargs,
)
if get_option('static_apk')
- apk_static_exe = executable(
- 'apk.static',
- apk_src,
- install: not subproject,
- dependencies: [
- static_deps,
- libfetch_dep.partial_dependency(includes: true),
- ],
- link_with: libapk_static,
- c_args: [apk_cargs, '-DOPENSSL_NO_ENGINE'],
- link_args: '-static',
- )
+ apk_static_exe = executable(
+ 'apk.static',
+ apk_src,
+ install: not subproject,
+ dependencies: [
+ static_deps,
+ libfetch_dep.partial_dependency(includes: true),
+ ],
+ link_with: libapk_static,
+ c_args: [apk_cargs, '-DOPENSSL_NO_ENGINE'],
+ link_args: '-static',
+ )
endif