summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@aleksander.es>2021-09-15 22:03:13 +0200
committerAleksander Morgado <aleksander@aleksander.es>2021-09-16 09:31:25 +0200
commitaee12967ee263bea514ecf30fed4c331b6454080 (patch)
treec8750e166db6b5e43c9d44372024ec91df8b7467
parentd5a992d30fc7a0b496401c3a89ca98ddf6e9114a (diff)
downloadModemManager-aee12967ee263bea514ecf30fed4c331b6454080.tar.gz
build,meson: simplify build of daemon enums sources
-rw-r--r--src/meson.build38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/meson.build b/src/meson.build
index daa5cc2c3..d16149c5b 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -184,24 +184,6 @@ headers = files(
'mm-port-probe.h',
)
-enums_types = 'mm-daemon-enums-types'
-
-daemon_enums_sources = []
-daemon_enums_sources += gnome.mkenums(
- enums_types + '.c',
- sources: headers,
- c_template: build_aux_dir / enums_types + '.c.template',
- fhead: '#include "mm-daemon-enums-types.h"',
-)
-
-daemon_enums_sources += gnome.mkenums(
- enums_types + '.h',
- sources: headers,
- h_template: build_aux_dir / enums_types + '.h.template',
- fhead: '#include "mm-filter.h"\n#include "mm-base-bearer.h"\n#include "mm-port-probe.h"\n#ifndef __MM_DAEMON_ENUMS_TYPES_H__\n#define __MM_DAEMON_ENUMS_TYPES_H__\n',
- ftail: '#endif /* __MM_DAEMON_ENUMS_TYPES_H__ */\n',
-)
-
sources = files(
'main.c',
'mm-auth-provider.c',
@@ -240,6 +222,24 @@ sources = files(
'mm-sms-list.c',
)
+enums_types = 'mm-daemon-enums-types'
+
+
+sources += gnome.mkenums(
+ enums_types + '.c',
+ sources: headers,
+ c_template: build_aux_dir / enums_types + '.c.template',
+ fhead: '#include "mm-daemon-enums-types.h"',
+)
+
+sources += gnome.mkenums(
+ enums_types + '.h',
+ sources: headers,
+ h_template: build_aux_dir / enums_types + '.h.template',
+ fhead: '#include "mm-filter.h"\n#include "mm-base-bearer.h"\n#include "mm-port-probe.h"\n#ifndef __MM_DAEMON_ENUMS_TYPES_H__\n#define __MM_DAEMON_ENUMS_TYPES_H__\n',
+ ftail: '#endif /* __MM_DAEMON_ENUMS_TYPES_H__ */\n',
+)
+
deps = [
gmodule_dep,
libmm_test_generated_dep,
@@ -294,7 +294,7 @@ endif
executable(
'ModemManager',
- sources: sources + daemon_enums_sources,
+ sources: sources,
include_directories: top_inc,
dependencies: deps,
c_args: c_args,