From 273eda39ca4bbb6747049802e8d68018b8acdf96 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 16 Feb 2023 09:21:52 +1000
Subject: [PATCH] Move the C proto templates to the src directory

These are very specific to libei/libeis, so let's not leave them
somewhere where they look like official bindings or something.
---
 meson.build                    | 25 ++++++++++++++++++++++---
 proto/meson.build              | 19 -------------------
 {proto => src}/ei-proto.c.tmpl |  0
 {proto => src}/ei-proto.h.tmpl |  0
 test/meson.build               |  4 ++--
 5 files changed, 24 insertions(+), 24 deletions(-)
 rename {proto => src}/ei-proto.c.tmpl (100%)
 rename {proto => src}/ei-proto.h.tmpl (100%)

diff --git a/meson.build b/meson.build
index 2280113..2102b62 100644
--- a/meson.build
+++ b/meson.build
@@ -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
 )
diff --git a/proto/meson.build b/proto/meson.build
index a449bad..db7bb46 100644
--- a/proto/meson.build
+++ b/proto/meson.build
@@ -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])
diff --git a/proto/ei-proto.c.tmpl b/src/ei-proto.c.tmpl
similarity index 100%
rename from proto/ei-proto.c.tmpl
rename to src/ei-proto.c.tmpl
diff --git a/proto/ei-proto.h.tmpl b/src/ei-proto.h.tmpl
similarity index 100%
rename from proto/ei-proto.h.tmpl
rename to src/ei-proto.h.tmpl
diff --git a/test/meson.build b/test/meson.build
index b0dc15d..84567ca 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -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]))