Merge pull request #2 from jpakkane/5.2.1

Updated definitions to new Meson release.

meson.build

@@ -1,5 +1,5 @@
 # liblzma is what upstream uses for their pkg-config name
-project('liblzma', 'c')
+project('liblzma', 'c', version : '5.2.1', license : 'pd/lgpl2/gpl2/gpl3')
 
 cc = meson.get_compiler('c')
 cdata = configuration_data()
@@ -76,11 +76,6 @@ configure_file(input : 'config.h.meson',
   configuration : cdata
 )
 
-if get_option('shared_lib')
-  libtype = 'shared_library'
-else
-  libtype = 'static_library'
-endif
-
 confinc = include_directories('.')
 subdir('src')
+

meson_options.txt

@@ -1,5 +1,3 @@
-option('shared_lib', type : 'boolean', value : false)
-
 option('decoder_arm', type : 'boolean', value : false)
 option('decoder_armthumb', type : 'boolean', value : false)
 option('decoder_delta', type : 'boolean', value : true)

src/liblzma/meson.build

@@ -121,11 +121,10 @@ endif
 lzmainc = include_directories('api', 'common',
   'check', 'lz', 'rangecoder', 'lzma', 'delta', 'simple', '../common')
 
-liblzma = build_target('lzma', lzma_sources,
+liblzma = library('lzma', lzma_sources,
   main_dec_sources, main_enc_sources, check_sources,
   simplefilter_sources, lzma1_sources,
   lz_sources, delta_sources,
   include_directories : [confinc, lzmainc],
   c_args : ['-DHAVE_CONFIG_H', '-DTUKLIB_SYMBOL_PREFIX=lzma_'],
-  target_type : libtype,
 )