fdo-mirrors/libei
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libei.git synced 2026-02-04 20:00:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move the C proto templates to the src directory

Browse source 
These are very specific to libei/libeis, so let's not leave them
somewhere where they look like official bindings or something.
This commit is contained in:
Peter Hutterer 2023-02-16 09:21:52 +10:00
parent 29cf354de6
commit 273eda39ca
5 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
meson.build
View file

@ -45,7 +45,6 @@ add_project_arguments(cc.get_supported_arguments(cflags), language: 'c')
inc_builddir = include_directories('.')
inc_src = include_directories('src')
inc_proto = include_directories('proto')
protocol_version = 1
@ -72,6 +71,18 @@ lib_util = static_library('util', src_libutil)
dep_libutil = declare_dependency(link_with: lib_util)
proto_c_template = files('src/ei-proto.c.tmpl')
proto_h_template = files('src/ei-proto.h.tmpl')
ei_proto_headers = custom_target('ei-proto-headers',
input: protocol_xml,
output: ['ei-proto.h'],
command: [scanner, '--component=ei', '--output=@OUTPUT@', '@INPUT@', proto_h_template])
ei_proto_sources = custom_target('ei-proto-sources',
input: protocol_xml,
output: ['ei-proto.c'],
command: [scanner, '--component=ei', '--output=@OUTPUT@', '@INPUT@', proto_c_template])
src_libei = files(
'src/brei-shared.c',
'src/libei.c',
@ -99,7 +110,6 @@ deps_libei = [
lib_libei = shared_library('ei',
src_libei,
dependencies: deps_libei,
include_directories: [inc_proto],
gnu_symbol_visibility: 'hidden',
include_directories: ['src'],
install: true
@ -121,6 +131,15 @@ pkgconfig.generate(lib_libei,
],
)
eis_proto_headers = custom_target('eis-proto-headers',
input: protocol_xml,
output: ['eis-proto.h'],
command: [scanner, '--component=eis', '--output=@OUTPUT@', '@INPUT@', proto_h_template])
eis_proto_sources = custom_target('eis-proto-sources',
input: protocol_xml,
output: ['eis-proto.c'],
command: [scanner, '--component=eis', '--output=@OUTPUT@', '@INPUT@', proto_c_template])
src_libeis = files(
'src/brei-shared.c',
'src/libeis.c',
@ -144,7 +163,7 @@ src_libeis = files(
lib_libeis = shared_library('eis',
src_libeis,
dependencies: [dep_libutil],
include_directories: [inc_proto, inc_src],
include_directories: [inc_src],
gnu_symbol_visibility: 'hidden',
install: true
)

19
proto/meson.build
View file

@ -1,21 +1,2 @@
proto_c_template = files('ei-proto.c.tmpl')
proto_h_template = files('ei-proto.h.tmpl')
scanner = find_program('scanner.py')
protocol_xml = files('protocol.xml')
ei_proto_headers = custom_target('ei-proto-headers',
input: protocol_xml,
output: ['ei-proto.h'],
command: [scanner, '--component=ei', '--output=@OUTPUT@', '@INPUT@', proto_h_template])
ei_proto_sources = custom_target('ei-proto-sources',
input: protocol_xml,
output: ['ei-proto.c'],
command: [scanner, '--component=ei', '--output=@OUTPUT@', '@INPUT@', proto_c_template])
eis_proto_headers = custom_target('eis-proto-headers',
input: protocol_xml,
output: ['eis-proto.h'],
command: [scanner, '--component=eis', '--output=@OUTPUT@', '@INPUT@', proto_h_template])
eis_proto_sources = custom_target('eis-proto-sources',
input: protocol_xml,
output: ['eis-proto.c'],
command: [scanner, '--component=eis', '--output=@OUTPUT@', '@INPUT@', proto_c_template])

0
proto/ei-proto.c.tmpl → src/ei-proto.c.tmpl
View file

0
proto/ei-proto.h.tmpl → src/ei-proto.h.tmpl
View file

4
test/meson.build
View file

@ -25,7 +25,7 @@ test('unit-tests-ei',
executable('unit-tests-ei',
'unit-tests.c',
src_libei,
include_directories: [inc_src, inc_proto, inc_builddir],
include_directories: [inc_src, inc_builddir],
c_args: ['-D_enable_tests_'],
dependencies: deps_libei + [dep_unittest]))
@ -33,7 +33,7 @@ test('unit-tests-eis',
executable('unit-tests-eis',
'unit-tests.c',
src_libeis,
include_directories: [inc_src, inc_proto, inc_builddir],
include_directories: [inc_src, inc_builddir],
c_args: ['-D_enable_tests_'],
dependencies: [dep_unittest, dep_libutil]))