diff --git a/bin/misc/meson.build b/bin/misc/meson.build index 1548675d5db2..7988ee96adb7 100644 --- a/bin/misc/meson.build +++ b/bin/misc/meson.build @@ -30,4 +30,3 @@ executable( c_args: acl_ldapconf, install: false, ) - diff --git a/bin/nbp/meson.build b/bin/nbp/meson.build index 2a0038d7a8db..e814de6e7db2 100644 --- a/bin/nbp/meson.build +++ b/bin/nbp/meson.build @@ -24,4 +24,3 @@ executable( install: true, install_rpath: rpath, ) - diff --git a/config/meson.build b/config/meson.build index 4dcceeb92b8a..acf5e917220d 100644 --- a/config/meson.build +++ b/config/meson.build @@ -12,8 +12,7 @@ endforeach foreach file : gen_templates if ( not fs.exists(pkgconfdir / file) - or (get_option('enable-overwrite') - and fs.exists(pkgconfdir / file)) + or (get_option('enable-overwrite') and fs.exists(pkgconfdir / file)) ) install_data(gen_files, install_dir: pkgconfdir) else @@ -40,8 +39,7 @@ endif foreach file : conf_files if ( not fs.exists(file) - or (get_option('enable-overwrite') - and fs.exists(file)) + or (get_option('enable-overwrite') and fs.exists(file)) ) install_data(conf_files, install_dir: pkgconfdir) else diff --git a/config/pam/meson.build b/config/pam/meson.build index 7964818a2c66..0e8908688746 100644 --- a/config/pam/meson.build +++ b/config/pam/meson.build @@ -6,11 +6,9 @@ netatalk_pamd = configure_file( if ( not fs.exists(pampath / 'netatalk') - or (get_option('enable-overwrite') - and fs.exists(pampath / 'netatalk')) + or (get_option('enable-overwrite') and fs.exists(pampath / 'netatalk')) ) install_data(netatalk_pamd, install_dir: pampath) else message('not overwriting', file) endif - diff --git a/contrib/a2boot/meson.build b/contrib/a2boot/meson.build index c781a2e9dfe1..9ce60bd569b7 100644 --- a/contrib/a2boot/meson.build +++ b/contrib/a2boot/meson.build @@ -4,8 +4,12 @@ executable( include_directories: root_includes, link_with: libatalk, c_args: [ - '-D_PATH_A_GS_BLOCKS="' + pkgconfdir + '/a2boot/ProDOS16\ Boot\ Blocks"', - '-D_PATH_A_2E_BLOCKS="' + pkgconfdir + '/a2boot/Apple\ :2f:2fe\ Boot\ Blocks"', + '-D_PATH_A_GS_BLOCKS="' + + pkgconfdir + + '/a2boot/ProDOS16\ Boot\ Blocks"', + '-D_PATH_A_2E_BLOCKS="' + + pkgconfdir + + '/a2boot/Apple\ :2f:2fe\ Boot\ Blocks"', '-D_PATH_P16_IMAGE="' + pkgconfdir + '/a2boot/ProDOS16\ Image"', ], install: true, diff --git a/distrib/initscripts/meson.build b/distrib/initscripts/meson.build index 4d2ee1e6c968..5a601d350668 100644 --- a/distrib/initscripts/meson.build +++ b/distrib/initscripts/meson.build @@ -13,8 +13,7 @@ if get_option('enable-redhat') ) meson.add_install_script( find_program('chkconfig'), - '--add', - '/etc/rc.d/init.d/netatalk', + '--add', '/etc/rc.d/init.d/netatalk', ) elif get_option('enable-systemd') init_style += 'systemd' @@ -94,19 +93,16 @@ elif get_option('enable-solaris') ) meson.add_install_script( find_program('rm'), - '-f', - '/etc/rc2.d/S90netatalk', + '-f', '/etc/rc2.d/S90netatalk', ) meson.add_install_script( find_program('ln'), - '-s', - '/etc/init.d/netatalk', + '-s', '/etc/init.d/netatalk', '/etc/rc2.d/S90netatalk', ) meson.add_install_script( find_program('ln'), - '-s', - '/etc/init.d/netatalk', + '-s', '/etc/init.d/netatalk', '/etc/rc0.d/K04netatalk', ) elif get_option('enable-openrc') @@ -161,12 +157,10 @@ elif get_option('enable-macos') meson.add_install_script( find_program('launchctl'), 'load', - '-w', - '/Library/LaunchDaemons/io.netatalk.daemon.plist', + '-w', '/Library/LaunchDaemons/io.netatalk.daemon.plist', ) endif else init_style += 'none' init_dir += 'none' endif - diff --git a/doc/manpages/meson.build b/doc/manpages/meson.build index c7d4a27d7d20..8ea4673c8f5a 100644 --- a/doc/manpages/meson.build +++ b/doc/manpages/meson.build @@ -1,10 +1,8 @@ manpages_command = [ xsltproc, - '--stringparam', - 'man.output.quietly', + '--stringparam', 'man.output.quietly', '1', - '-o', - '@OUTPUT@', + '-o', '@OUTPUT@', manpages_stylesheet, '@INPUT@', ] diff --git a/doc/meson.build b/doc/meson.build index 9f44948f564d..4d67b35c5eff 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -12,4 +12,3 @@ manual_stylesheet = configure_file( subdir('manpages') subdir('manual') - diff --git a/etc/afpd/meson.build b/etc/afpd/meson.build index ed05eb91d540..b00ad40ff188 100644 --- a/etc/afpd/meson.build +++ b/etc/afpd/meson.build @@ -58,8 +58,7 @@ executable( wrap, ], c_args: [ - '-DAPPLCNAME', - acl_ldapconf, + '-DAPPLCNAME', acl_ldapconf, afpdconf, afpddefvol, afpdpwfile, @@ -97,7 +96,3 @@ executable( c_args: '-DKAZLIB_TEST_MAIN', install: false, ) - - - - diff --git a/etc/papd/meson.build b/etc/papd/meson.build index 426cdb58ab5c..afe608372551 100644 --- a/etc/papd/meson.build +++ b/etc/papd/meson.build @@ -41,8 +41,3 @@ executable( install: true, install_rpath: rpath, ) - - - - - diff --git a/etc/uams/meson.build b/etc/uams/meson.build index 3b5feff1215c..c7148b84bc9d 100644 --- a/etc/uams/meson.build +++ b/etc/uams/meson.build @@ -275,6 +275,3 @@ if have_gssapi install_dir: libdir / 'netatalk', ) endif - - - diff --git a/libatalk/cnid/dbd/meson.build b/libatalk/cnid/dbd/meson.build index 5a72c05b4588..bff50ff5916b 100644 --- a/libatalk/cnid/dbd/meson.build +++ b/libatalk/cnid/dbd/meson.build @@ -4,4 +4,3 @@ libcnid_dbd = static_library( include_directories: root_includes, install: false, ) - diff --git a/libatalk/cnid/last/meson.build b/libatalk/cnid/last/meson.build index f0c5a45f628a..e6f2e51352fb 100644 --- a/libatalk/cnid/last/meson.build +++ b/libatalk/cnid/last/meson.build @@ -4,4 +4,3 @@ libcnid_last = static_library( include_directories: root_includes, install: false, ) - diff --git a/meson.build b/meson.build index 719b832c8c51..bf65716009b3 100644 --- a/meson.build +++ b/meson.build @@ -372,10 +372,8 @@ endif run_command( cc, - '-c', - meson.project_source_root() / 'libatalk/dummy.c', - '-o', - meson.global_build_root() / 'dummy.o', + '-c', meson.project_source_root() / 'libatalk/dummy.c', + '-o', meson.global_build_root() / 'dummy.o', check: false, ) compiler_mode = run_command( @@ -701,7 +699,6 @@ else enable_zeroconf = avahi.found() or have_dns endif - # # Check for CUPS # @@ -1118,7 +1115,6 @@ endif libiconv = cc.find_library('iconv', dirs: libsearch_dirs, required: false) - if iconv.found() or libiconv.found() if cc.compiles( ''' @@ -1459,16 +1455,11 @@ init_dir = '' sed_command = [ find_program('sed', required: false), - '-e', - 's@:BINDIR:@' + bindir + '@', - '-e', - 's@:ETCDIR:@' + pkgconfdir + '@', - '-e', - 's@:SBINDIR:@' + sbindir + '@', - '-e', - 's@:PKGLIBEXECDIR:@' + libexecdir + '@', - '-e', - 's@:NETATALK_VERSION:@' + version + '@', + '-e', 's@:BINDIR:@' + bindir + '@', + '-e', 's@:ETCDIR:@' + pkgconfdir + '@', + '-e', 's@:SBINDIR:@' + sbindir + '@', + '-e', 's@:PKGLIBEXECDIR:@' + libexecdir + '@', + '-e', 's@:NETATALK_VERSION:@' + version + '@', '@INPUT@', ] diff --git a/sys/meson.build b/sys/meson.build index 34b2d0208be6..972b053d862e 100644 --- a/sys/meson.build +++ b/sys/meson.build @@ -1,2 +1 @@ subdir('netatalk') - diff --git a/test/afpd/meson.build b/test/afpd/meson.build index 9d4e017bf2bf..0a0bc3c503f2 100644 --- a/test/afpd/meson.build +++ b/test/afpd/meson.build @@ -59,8 +59,7 @@ afpdtest = executable( wrap, ], c_args: [ - '-DAPPLCNAME', - acl_ldapconf, + '-DAPPLCNAME', acl_ldapconf, afpdconf, afpddefvol, afpdpwfile,