project: Update meson files

I probably have OCD. Seeing these files
with this poor alignment gives me physical
pain.
parent 36af5e51
install_subdir(
'hicolor',
install_dir: control_center_icondir
'hicolor',
install_dir : control_center_icondir
)
......@@ -17,10 +17,10 @@ xsltproc_cmd = [
output = meson.project_name() + '.1'
custom_target(
output,
input: meson.project_name() + '.xml',
output: output,
command: xsltproc_cmd,
install: true,
install_dir: join_paths(control_center_mandir, 'man1')
output,
input : meson.project_name() + '.xml',
output : output,
command : xsltproc_cmd,
install : true,
install_dir : join_paths(control_center_mandir, 'man1')
)
......@@ -65,7 +65,6 @@ optimized_src = '''
'''
control_center_optimized = get_option('buildtype').contains('optimized') and cc.compiles(optimized_src)
message('whether_optimization is enabled: ' + control_center_optimized.to_string())
if control_center_optimized
common_flags += '-Wp,-D_FORTIFY_SOURCE=2'
......@@ -282,6 +281,7 @@ output += ' Options \n'
output += ' Documentation .............................. ' + get_option('documentation').to_string() + '\n'
output += ' Tracing .................................... ' + enable_tracing.to_string() + '\n'
output += ' gnome-session libexecdir ................... ' + gnome_session_libexecdir + '\n'
output += ' Optimized .................................. ' + control_center_optimized.to_string() + '\n'
output += ' Panels \n'
output += ' GNOME Bluetooth (Bluetooth panel) .......... ' + host_is_linux_not_s390.to_string() + '\n'
output += ' Cheese (Users panel webcam support) ........ ' + enable_cheese.to_string() + '\n'
......
......@@ -15,19 +15,19 @@ panels_list += cappletname
desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
desktop_in = configure_file(
input: desktop + '.in.in',
output: desktop + '.in',
configuration: desktop_conf
input : desktop + '.in.in',
output : desktop + '.in',
configuration : desktop_conf
)
i18n.merge_file(
desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
po_dir: po_dir,
install: true,
install_dir: control_center_desktopdir
desktop,
type : 'desktop',
input : desktop_in,
output : desktop,
po_dir : po_dir,
install : true,
install_dir : control_center_desktopdir
)
common_sources = files(
......@@ -62,10 +62,10 @@ resource_data = files(
common_sources += gnome.compile_resources(
'cc-' + cappletname + '-resources',
cappletname + '.gresource.xml',
source_dir: '.',
c_name: 'cc_' + cappletname,
dependencies: resource_data,
export: true
source_dir : '.',
c_name : 'cc_' + cappletname,
dependencies : resource_data,
export : true
)
sources = common_sources + files(
......@@ -82,13 +82,11 @@ incs = [
panels_libs += static_library(
cappletname + '-properties',
sources: sources,
include_directories: incs,
dependencies: deps,
c_args: cflags,
link_with: [
libwacom_calibrator
]
sources : sources,
include_directories : incs,
dependencies : deps,
c_args : cflags,
link_with : [ libwacom_calibrator ]
)
name = 'test-wacom'
......@@ -96,12 +94,10 @@ name = 'test-wacom'
sources = common_sources + files(name + '.c')
executable(
name,
sources,
include_directories: incs,
dependencies: deps,
c_args: test_cflags,
link_with: [
libwacom_calibrator_test
]
name,
sources,
include_directories : incs,
dependencies : deps,
c_args : test_cflags,
link_with : [ libwacom_calibrator_test ]
)
......@@ -4,11 +4,11 @@ service_conf.set('libexecdir', control_center_libexecdir)
service = 'org.gnome.ControlCenter.SearchProvider.service'
configure_file(
input: service + '.in',
output: service,
install: true,
install_dir: join_paths(control_center_datadir, 'dbus-1', 'services'),
configuration: service_conf
input : service + '.in',
output : service,
install : true,
install_dir : join_paths(control_center_datadir, 'dbus-1', 'services'),
configuration : service_conf
)
install_data(
......@@ -26,8 +26,8 @@ sources = files(
sources += gnome.gdbus_codegen(
'cc-shell-search-provider-generated',
'org.gnome.ShellSearchProvider2.xml',
interface_prefix: 'org.gnome.',
namespace: 'Cc'
interface_prefix : 'org.gnome.',
namespace : 'Cc'
)
cflags = '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir)
......@@ -38,12 +38,12 @@ libs = [
]
executable(
meson.project_name() + '-search-provider',
sources,
include_directories: top_inc,
dependencies: shell_deps,
c_args: cflags,
link_with: libs,
install: true,
install_dir: control_center_libexecdir
'gnome-control-center-search-provider',
sources,
include_directories : top_inc,
dependencies : shell_deps,
c_args : cflags,
link_with : libs,
install : true,
install_dir : control_center_libexecdir
)
......@@ -7,39 +7,39 @@ service_conf.set('bindir', control_center_bindir)
service = 'org.gnome.ControlCenter.service'
configure_file(
input: service + '.in',
output: service,
install: true,
install_dir: join_paths(control_center_datadir, 'dbus-1', 'services'),
configuration: service_conf
input : service + '.in',
output : service,
install : true,
install_dir : join_paths(control_center_datadir, 'dbus-1', 'services'),
configuration : service_conf
)
desktop = 'gnome-control-center.desktop'
desktop_in = configure_file(
input: desktop + '.in.in',
output: desktop + '.in',
configuration: desktop_conf
input : desktop + '.in.in',
output : desktop + '.in',
configuration : desktop_conf
)
i18n.merge_file(
desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
po_dir: po_dir,
install: true,
install_dir: control_center_desktopdir
desktop,
type : 'desktop',
input : desktop_in,
output : desktop,
po_dir : po_dir,
install : true,
install_dir : control_center_desktopdir
)
cflags = ['-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir)]
libshell = static_library(
'shell',
sources: 'cc-shell-model.c',
include_directories: [top_inc, common_inc],
dependencies: common_deps,
c_args: cflags
'shell',
sources : 'cc-shell-model.c',
include_directories : [top_inc, common_inc],
dependencies : common_deps,
c_args : cflags
)
sources = files(
......@@ -93,30 +93,30 @@ debug_conf.set('BUGREPORT_URL', 'http://bugzilla.gnome.org/enter_bug.cgi?product
debug_conf.set10('ENABLE_TRACING', enable_tracing)
sources += configure_file(
input: 'cc-debug.h.in',
output: 'cc-debug.h',
configuration: debug_conf
input : 'cc-debug.h.in',
output : 'cc-debug.h',
configuration : debug_conf
)
executable(
meson.project_name(),
sources,
include_directories: top_inc,
dependencies: shell_deps,
c_args: cflags,
link_with: panels_libs + [libshell],
install: true
sources,
include_directories : top_inc,
dependencies : shell_deps,
c_args : cflags,
link_with : panels_libs + [libshell],
install : true
)
# Because it is confusing and somewhat problematic to directly add and compile
# cc-panel-loader.o by another directory (i.e. the shell search provider), we
# have to create a library and link it there, just like libshell.la.
libpanel_loader = static_library(
'panel_loader',
sources: 'cc-panel-loader.c',
include_directories: top_inc,
dependencies: common_deps,
c_args: cflags + ['-DCC_PANEL_LOADER_NO_GTYPES']
'panel_loader',
sources : 'cc-panel-loader.c',
include_directories : top_inc,
dependencies : common_deps,
c_args : cflags + ['-DCC_PANEL_LOADER_NO_GTYPES']
)
# libshell_test
......@@ -127,19 +127,21 @@ sources = files(
'cc-object-storage.c',
)
libtestshell = static_library(
'testshell',
sources,
include_directories: top_inc,
dependencies: common_deps + [ libwidgets_dep ],
c_args: cflags,
link_with: panels_libs
'testshell',
sources,
include_directories : top_inc,
dependencies : common_deps + [ libwidgets_dep ],
c_args : cflags,
link_with : panels_libs
)
libtestshell_dep = declare_dependency(
include_directories: top_inc,
link_with: libtestshell
include_directories : top_inc,
link_with : libtestshell
)
libtestshell_deps = common_deps + [ libwidgets_dep, libtestshell_dep ]
install_data ('org.gnome.ControlCenter.gschema.xml',
install_dir: control_center_schemadir)
install_data (
'org.gnome.ControlCenter.gschema.xml',
install_dir : control_center_schemadir
)
......@@ -12,11 +12,11 @@ cflags = [
]
exe = executable(
test_unit,
sources,
include_directories: [ top_inc, common_inc ],
dependencies: common_deps + [libwidgets_dep],
c_args: cflags,
test_unit,
sources,
include_directories : [ top_inc, common_inc ],
dependencies : common_deps + [libwidgets_dep],
c_args : cflags,
)
test(test_unit, exe)
......
test_units = [
#'test-timezone',
'test-timezone',
'test-timezone-gfx',
'test-endianess',
]
......@@ -13,12 +13,12 @@ cflags = [
foreach unit: test_units
exe = executable(
unit,
[unit + '.c'],
include_directories: includes,
dependencies: common_deps + [m_dep],
link_with: [datetime_panel_lib],
c_args: cflags
unit,
[unit + '.c'],
include_directories : includes,
dependencies : common_deps + [m_dep],
link_with : [datetime_panel_lib],
c_args : cflags
)
test(unit, exe)
......
......@@ -8,12 +8,12 @@ cflags = '-DTEST_SRCDIR="@0@"'.format(meson.current_source_dir())
foreach unit: test_units
exe = executable(
unit,
[unit + '.c'],
include_directories: includes,
dependencies: common_deps,
link_with: [info_panel_lib],
c_args: cflags
unit,
[unit + '.c'],
include_directories : includes,
dependencies : common_deps,
link_with : [info_panel_lib],
c_args : cflags
)
test(unit, exe)
......
......@@ -11,20 +11,21 @@ cflags = [
exe = executable(
'test-network-panel',
['test-network-panel.c', 'cc-test-window.c', 'nm-utils/nm-test-utils-impl.c'],
include_directories: includes + [common_inc],
dependencies: common_deps + network_manager_deps + [libtestshell_dep],
link_with: [network_panel_lib],
c_args: cflags
include_directories : includes + [common_inc],
dependencies : common_deps + network_manager_deps + [libtestshell_dep],
link_with : [network_panel_lib],
c_args : cflags
)
envs = [
'G_MESSAGES_DEBUG=all',
'BUILDDIR=' + meson.current_build_dir(),
'TOP_BUILDDIR=' + meson.build_root()
'BUILDDIR=' + meson.current_build_dir(),
'TOP_BUILDDIR=' + meson.build_root()
]
test('test-network-panel',
test(
'test-network-panel',
find_program('test-network-panel.py'),
env: envs,
timeout: 10
env : envs,
timeout : 10
)
......@@ -9,12 +9,12 @@ cflags = '-DTEST_SRCDIR="@0@"'.format(meson.current_source_dir())
foreach unit: test_units
exe = executable(
unit,
[unit + '.c'],
include_directories: includes,
dependencies: common_deps,
link_with: [printers_panel_lib],
c_args: cflags
unit,
[unit + '.c'],
include_directories : includes,
dependencies : common_deps,
link_with : [printers_panel_lib],
c_args : cflags
)
test(unit, exe)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment