util: also move scripts related to socket-protocol-list.[ch] to shared/

The source files were moved to shared/. Let's also move the relevant scripts.

diff --git a/src/basic/meson.build b/src/basic/meson.build
index 3853792..b13897f 100644 (file)
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -207,19 +207,11 @@ errno_list_txt = custom_target(
         command : [generate_errno_list, cpp],
         capture : true)
 
-generate_socket_protocol_list = find_program('generate-socket-protocol-list.sh')
-socket_protocol_list_txt = custom_target(
-        'socket-protocol-list.txt',
-        output : 'socket-protocol-list.txt',
-        command : [generate_socket_protocol_list, cpp],
-        capture : true)
-
 generated_gperf_headers = []
 foreach item : [['af',     af_list_txt,     'af',         ''],
                 ['arphrd', arphrd_list_txt, 'arphrd',     'ARPHRD_'],
                 ['cap',    cap_list_txt,    'capability', ''],
-                ['errno',  errno_list_txt,  'errno',      ''],
-                ['socket-protocol', socket_protocol_list_txt, 'socket_protocol',     'IPPROTO_']]
+                ['errno',  errno_list_txt,  'errno',      '']]
 
         fname = '@0@-from-name.gperf'.format(item[0])
         gperf_file = custom_target(

diff --git a/src/basic/generate-socket-protocol-list.sh b/src/shared/generate-socket-protocol-list.sh
similarity index 100%
rename from src/basic/generate-socket-protocol-list.sh
rename to src/shared/generate-socket-protocol-list.sh

diff --git a/src/shared/meson.build b/src/shared/meson.build
index f7c2c7f..b7676b6 100644 (file)
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -186,6 +186,45 @@ if conf.get('HAVE_KMOD') == 1
         shared_sources += files('module-util.c')
 endif
 
+generate_socket_protocol_list = find_program('generate-socket-protocol-list.sh')
+socket_protocol_list_txt = custom_target(
+        'socket-protocol-list.txt',
+        output : 'socket-protocol-list.txt',
+        command : [generate_socket_protocol_list, cpp],
+        capture : true)
+
+fname = 'socket-protocol-from-name.gperf'
+gperf_file = custom_target(
+        fname,
+        input : socket_protocol_list_txt,
+        output : fname,
+        command : [generate_gperfs, 'socket_protocol', 'IPPROTO_', '@INPUT@'],
+        capture : true)
+
+fname = 'socket-protocol-from-name.h'
+target1 = custom_target(
+        fname,
+        input : gperf_file,
+        output : fname,
+        command : [gperf,
+                   '-L', 'ANSI-C', '-t', '--ignore-case',
+                   '-N', 'lookup_socket_protocol',
+                   '-H', 'hash_socket_protocol_name',
+                   '-p', '-C',
+                   '@INPUT@'],
+        capture : true)
+
+fname = 'socket-protocol-to-name.h'
+awkscript = 'socket-protocol-to-name.awk'
+target2 = custom_target(
+        fname,
+        input : [awkscript, socket_protocol_list_txt],
+        output : fname,
+        command : [awk, '-f', '@INPUT0@', '@INPUT1@'],
+        capture : true)
+
+shared_sources += [target1, target2]
+
 libshared_name = 'systemd-shared-@0@'.format(meson.project_version())
 
 libshared_deps = [threads,

diff --git a/src/basic/socket-protocol-to-name.awk b/src/shared/socket-protocol-to-name.awk
similarity index 100%
rename from src/basic/socket-protocol-to-name.awk
rename to src/shared/socket-protocol-to-name.awk