From 84cec7dc2c645e4d1bbab8e8496c4f6cd9562989 Mon Sep 17 00:00:00 2001 From: Gediminas Jakutis Date: Thu, 24 Oct 2019 14:34:19 +0300 Subject: remove pointless options. Less maintenence burden, especially since modules start using one another, complicating build requirements otherwise. Signed-off-by: Gediminas Jakutis --- meson_options.txt | 3 --- src/diagnostic/meson.build | 12 ++++-------- src/float/meson.build | 12 ++++-------- src/time/meson.build | 14 +++++--------- 4 files changed, 13 insertions(+), 28 deletions(-) diff --git a/meson_options.txt b/meson_options.txt index 41017ee..d39f677 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,6 +1,3 @@ option('static', type : 'boolean', value : false, description : 'Enable building a static library') option('shared', type : 'boolean', value : false, description : 'Enable building a dynamic library') option('tests', type : 'boolean', value : false, description : 'Enable building and running tests') -option('float', type : 'boolean', value : true, description : 'Enable building the floating point module') -option('diagnostic', type : 'boolean', value : true, description : 'Enable building the diagnostics module') -option('time', type : 'boolean', value : true, description : 'Enable building the time module') diff --git a/src/diagnostic/meson.build b/src/diagnostic/meson.build index 5f066c1..11ea1f9 100644 --- a/src/diagnostic/meson.build +++ b/src/diagnostic/meson.build @@ -1,10 +1,6 @@ -if get_option('diagnostic') - diagnostic_filenames = [ - 'diagnostic.c', - 'diagnostic_private.h', - ] -else - diagnostic_filenames = [] -endif +diagnostic_filenames = [ + 'diagnostic.c', + 'diagnostic_private.h', +] diagnostic_sources = files(diagnostic_filenames) diff --git a/src/float/meson.build b/src/float/meson.build index 129053e..76256ba 100644 --- a/src/float/meson.build +++ b/src/float/meson.build @@ -1,10 +1,6 @@ -if get_option('float') - float_filenames = [ - 'float.c', - 'float_private.h', - ] -else - float_filenames = [] -endif +float_filenames = [ + 'float.c', + 'float_private.h', +] float_sources = files(float_filenames) diff --git a/src/time/meson.build b/src/time/meson.build index 5a6d9cc..ce638ce 100644 --- a/src/time/meson.build +++ b/src/time/meson.build @@ -1,11 +1,7 @@ -if get_option('time') - time_filenames = [ - 'benchmark.c', - 'time.c', - 'time_private.h', - ] -else - time_filenames = [] -endif +time_filenames = [ + 'benchmark.c', + 'time.c', + 'time_private.h', +] time_sources = files(time_filenames) -- cgit v1.2.3