colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: Rename template files

Browse Source 
The template files in the `build-aux` directory used in enums sources
and headers generation use the `{$name}-template.[ch]` pattern.
However, the examples in the official guide[0] and usually GNOME and
Freedesktop packages use the `{$name}.[ch].template` pattern.

Due to this, the name of the template files and build commands have
been changed.

[0] https://developer.gnome.org/gobject/stable/glib-mkenums.html
This commit is contained in:
Iñigo Martínez
2021-07-29 23:45:52 +02:00
committed by Aleksander Morgado
parent b935782010
commit 7c4db66eb3
9 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build-aux/Makefile.am
View File

@@ -1,8 +1,8 @@
EXTRA_DIST = \
header-generator.xsl \
mm-enums-template.h \
mm-enums-template.c \
mm-errors-template.h \
mm-errors-template.c \
mm-errors-quarks-template.c
mm-enums-types.h.template \
mm-enums-types.c.template \
mm-errors-types.h.template \
mm-errors-types.c.template \
mm-errors-quarks.c.template

0
build-aux/mm-enums-template.c → build-aux/mm-enums-types.c.template
View File

0
build-aux/mm-enums-template.h → build-aux/mm-enums-types.h.template
View File

0
build-aux/mm-errors-quarks-template.c → build-aux/mm-errors-quarks.c.template
View File

0
build-aux/mm-errors-template.c → build-aux/mm-errors-types.c.template
View File

0
build-aux/mm-errors-template.h → build-aux/mm-errors-types.h.template
View File

20
libmm-glib/generated/Makefile.am
View File

@@ -54,37 +54,37 @@ GENERATED_DOC = \
BUILT_SOURCES = $(GENERATED_H) $(GENERATED_C) $(GENERATED_DOC)
# Enum types
mm-enums-types.h: Makefile.am $(top_srcdir)/include/ModemManager-enums.h $(top_srcdir)/build-aux/mm-enums-template.h
mm-enums-types.h: Makefile.am $(top_srcdir)/include/ModemManager-enums.h $(top_srcdir)/build-aux/mm-enums-types.h.template
$(AM_V_GEN) $(GLIB_MKENUMS) \
--fhead "#include <ModemManager.h>\n#ifndef __MM_ENUMS_TYPES_H__\n#define __MM_ENUMS_TYPES_H__\n" \
--template $(top_srcdir)/build-aux/mm-enums-template.h \
--template $(top_srcdir)/build-aux/mm-enums-types.h.template \
--ftail "#endif /* __MM_ENUMS_TYPES_H__ */\n" \
$(top_srcdir)/include/ModemManager-enums.h > $@
mm-enums-types.c: Makefile.am $(top_srcdir)/include/ModemManager-enums.h $(top_srcdir)/build-aux/mm-enums-template.c mm-enums-types.h
mm-enums-types.c: Makefile.am $(top_srcdir)/include/ModemManager-enums.h $(top_srcdir)/build-aux/mm-enums-types.c.template mm-enums-types.h
$(AM_V_GEN) $(GLIB_MKENUMS) \
--fhead "#include \"mm-enums-types.h\"\n" \
--template $(top_srcdir)/build-aux/mm-enums-template.c \
--template $(top_srcdir)/build-aux/mm-enums-types.c.template \
$(top_srcdir)/include/ModemManager-enums.h > $@
# Error types & quarks
mm-errors-types.h: Makefile.am $(top_srcdir)/include/ModemManager-errors.h $(top_srcdir)/build-aux/mm-errors-template.h
mm-errors-types.h: Makefile.am $(top_srcdir)/include/ModemManager-errors.h $(top_srcdir)/build-aux/mm-errors-types.h.template
$(AM_V_GEN) $(GLIB_MKENUMS) \
--fhead "#ifndef __MM_ERRORS_TYPES_H__\n#define __MM_ERRORS_TYPES_H__\n" \
--template $(top_srcdir)/build-aux/mm-errors-template.h \
--template $(top_srcdir)/build-aux/mm-errors-types.h.template \
--ftail "#endif /* __MM_ERRORS_TYPES_H__ */\n" \
$(top_srcdir)/include/ModemManager-errors.h > $@
mm-errors-types.c: Makefile.am $(top_srcdir)/include/ModemManager-errors.h $(top_srcdir)/build-aux/mm-errors-template.c mm-errors-types.h
mm-errors-types.c: Makefile.am $(top_srcdir)/include/ModemManager-errors.h $(top_srcdir)/build-aux/mm-errors-types.c.template mm-errors-types.h
$(AM_V_GEN) $(GLIB_MKENUMS) \
--fhead "#include <ModemManager.h>\n#include \"mm-errors-types.h\"\n" \
--template $(top_srcdir)/build-aux/mm-errors-template.c \
--template $(top_srcdir)/build-aux/mm-errors-types.c.template \
$(top_srcdir)/include/ModemManager-errors.h > $@
mm-errors-quarks.c: Makefile.am $(top_srcdir)/include/ModemManager-errors.h $(top_srcdir)/build-aux/mm-errors-quarks-template.c $(top_builddir)/include/ModemManager-names.h mm-errors-types.h
mm-errors-quarks.c: Makefile.am $(top_srcdir)/include/ModemManager-errors.h $(top_srcdir)/build-aux/mm-errors-quarks.c.template $(top_builddir)/include/ModemManager-names.h mm-errors-types.h
$(AM_V_GEN) $(GLIB_MKENUMS) \
--fhead "#include <ModemManager.h>\n#include \"mm-errors-types.h\"\n" \
--template $(top_srcdir)/build-aux/mm-errors-quarks-template.c \
--template $(top_srcdir)/build-aux/mm-errors-quarks.c.template \
$(top_srcdir)/include/ModemManager-errors.h > $@
# Manager interface

24
plugins/Makefile.am
View File

@@ -342,21 +342,21 @@ TELIT_ENUMS_GENERATED = \
BUILT_SOURCES += $(TELIT_ENUMS_GENERATED)
CLEANFILES += $(TELIT_ENUMS_GENERATED)
telit/mm-telit-enums-types.h: Makefile.am $(TELIT_ENUMS_INPUTS) $(top_srcdir)/build-aux/mm-enums-template.h
telit/mm-telit-enums-types.h: Makefile.am $(TELIT_ENUMS_INPUTS) $(top_srcdir)/build-aux/mm-enums-types.h.template
$(AM_V_GEN) \
$(MKDIR_P) telit; \
$(GLIB_MKENUMS) \
--fhead "#include \"mm-modem-helpers-telit.h\"\n#ifndef __MM_TELIT_ENUMS_TYPES_H__\n#define __MM_TELIT_ENUMS_TYPES_H__\n" \
--template $(top_srcdir)/build-aux/mm-enums-template.h \
--template $(top_srcdir)/build-aux/mm-enums-types.h.template \
--ftail "#endif /* __MM_TELIT_ENUMS_TYPES_H__ */\n" \
$(TELIT_ENUMS_INPUTS) > $@
telit/mm-telit-enums-types.c: Makefile.am $(top_srcdir)/build-aux/mm-enums-template.c telit/mm-telit-enums-types.h
telit/mm-telit-enums-types.c: Makefile.am $(top_srcdir)/build-aux/mm-enums-types.c.template telit/mm-telit-enums-types.h
$(AM_V_GEN) \
$(MKDIR_P) telit; \
$(GLIB_MKENUMS) \
--fhead "#include \"mm-telit-enums-types.h\"" \
--template $(top_srcdir)/build-aux/mm-enums-template.c \
--template $(top_srcdir)/build-aux/mm-enums-types.c.template \
$(TELIT_ENUMS_INPUTS) > $@
noinst_LTLIBRARIES += libhelpers-telit.la
@@ -799,21 +799,21 @@ HUAWEI_ENUMS_GENERATED = \
BUILT_SOURCES += $(HUAWEI_ENUMS_GENERATED)
CLEANFILES += $(HUAWEI_ENUMS_GENERATED)
huawei/mm-huawei-enums-types.h: Makefile.am $(HUAWEI_ENUMS_INPUTS) $(top_srcdir)/build-aux/mm-enums-template.h
huawei/mm-huawei-enums-types.h: Makefile.am $(HUAWEI_ENUMS_INPUTS) $(top_srcdir)/build-aux/mm-enums-types.h.template
$(AM_V_GEN) \
$(MKDIR_P) huawei; \
$(GLIB_MKENUMS) \
--fhead "#include \"mm-modem-helpers-huawei.h\"\n#ifndef __MM_HUAWEI_ENUMS_TYPES_H__\n#define __MM_HUAWEI_ENUMS_TYPES_H__\n" \
--template $(top_srcdir)/build-aux/mm-enums-template.h \
--template $(top_srcdir)/build-aux/mm-enums-types.h.template \
--ftail "#endif /* __MM_HUAWEI_ENUMS_TYPES_H__ */\n" \
$(HUAWEI_ENUMS_INPUTS) > $@
huawei/mm-huawei-enums-types.c: Makefile.am $(top_srcdir)/build-aux/mm-enums-template.c huawei/mm-huawei-enums-types.h
huawei/mm-huawei-enums-types.c: Makefile.am $(top_srcdir)/build-aux/mm-enums-types.c.template huawei/mm-huawei-enums-types.h
$(AM_V_GEN) \
$(MKDIR_P) huawei; \
$(GLIB_MKENUMS) \
--fhead "#include \"mm-huawei-enums-types.h\"" \
--template $(top_srcdir)/build-aux/mm-enums-template.c \
--template $(top_srcdir)/build-aux/mm-enums-types.c.template \
$(HUAWEI_ENUMS_INPUTS) > $@
noinst_LTLIBRARIES += libhelpers-huawei.la
@@ -1543,21 +1543,21 @@ UBLOX_ENUMS_GENERATED = \
ublox/mm-ublox-enums-types.c \
$(NULL)
ublox/mm-ublox-enums-types.h: Makefile.am $(UBLOX_ENUMS_INPUTS) $(top_srcdir)/build-aux/mm-enums-template.h
ublox/mm-ublox-enums-types.h: Makefile.am $(UBLOX_ENUMS_INPUTS) $(top_srcdir)/build-aux/mm-enums-types.h.template
$(AM_V_GEN) \
$(MKDIR_P) ublox; \
$(GLIB_MKENUMS) \
--fhead "#include \"mm-modem-helpers-ublox.h\"\n#ifndef __MM_UBLOX_ENUMS_TYPES_H__\n#define __MM_UBLOX_ENUMS_TYPES_H__\n" \
--template $(top_srcdir)/build-aux/mm-enums-template.h \
--template $(top_srcdir)/build-aux/mm-enums-types.h.template \
--ftail "#endif /* __MM_UBLOX_ENUMS_TYPES_H__ */\n" \
$(UBLOX_ENUMS_INPUTS) > $@
ublox/mm-ublox-enums-types.c: Makefile.am $(top_srcdir)/build-aux/mm-enums-template.c ublox/mm-ublox-enums-types.h
ublox/mm-ublox-enums-types.c: Makefile.am $(top_srcdir)/build-aux/mm-enums-types.c.template ublox/mm-ublox-enums-types.h
$(AM_V_GEN) \
$(MKDIR_P) ublox; \
$(GLIB_MKENUMS) \
--fhead "#include \"mm-ublox-enums-types.h\"" \
--template $(top_srcdir)/build-aux/mm-enums-template.c \
--template $(top_srcdir)/build-aux/mm-enums-types.c.template \
$(UBLOX_ENUMS_INPUTS) > $@
libhelpers_ublox_la_SOURCES = \

24
src/Makefile.am
View File

@@ -85,17 +85,17 @@ HELPER_ENUMS_GENERATED = \
mm-helper-enums-types.c \
$(NULL)
mm-helper-enums-types.h: Makefile.am $(HELPER_ENUMS_INPUTS) $(top_srcdir)/build-aux/mm-enums-template.h
mm-helper-enums-types.h: Makefile.am $(HELPER_ENUMS_INPUTS) $(top_srcdir)/build-aux/mm-enums-types.h.template
$(AM_V_GEN) $(GLIB_MKENUMS) \
--fhead "#include \"mm-sms-part.h\"\n#include \"mm-modem-helpers.h\"\n#ifndef __MM_HELPER_ENUMS_TYPES_H__\n#define __MM_HELPER_ENUMS_TYPES_H__\n" \
--template $(top_srcdir)/build-aux/mm-enums-template.h \
--template $(top_srcdir)/build-aux/mm-enums-types.h.template \
--ftail "#endif /* __MM_HELPER_ENUMS_TYPES_H__ */\n" \
$(HELPER_ENUMS_INPUTS) > $@
mm-helper-enums-types.c: Makefile.am $(top_srcdir)/build-aux/mm-enums-template.c mm-helper-enums-types.h
mm-helper-enums-types.c: Makefile.am $(top_srcdir)/build-aux/mm-enums-types.c.template mm-helper-enums-types.h
$(AM_V_GEN) $(GLIB_MKENUMS) \
--fhead "#include \"mm-helper-enums-types.h\"" \
--template $(top_srcdir)/build-aux/mm-enums-template.c \
--template $(top_srcdir)/build-aux/mm-enums-types.c.template \
$(HELPER_ENUMS_INPUTS) > $@
libhelpers_la_SOURCES = \
@@ -198,17 +198,17 @@ PORT_ENUMS_GENERATED = \
mm-port-enums-types.c \
$(NULL)
mm-port-enums-types.h: Makefile.am $(PORT_ENUMS_INPUTS) $(top_srcdir)/build-aux/mm-enums-template.h
mm-port-enums-types.h: Makefile.am $(PORT_ENUMS_INPUTS) $(top_srcdir)/build-aux/mm-enums-types.h.template
$(AM_V_GEN) $(GLIB_MKENUMS) \
--fhead "#include \"config.h\"\n#include \"mm-port.h\"\n#include \"mm-port-serial-at.h\"\n#if defined WITH_QMI\n#include \"mm-port-qmi.h\"\n#endif\n#ifndef __MM_PORT_ENUMS_TYPES_H__\n#define __MM_PORT_ENUMS_TYPES_H__\n" \
--template $(top_srcdir)/build-aux/mm-enums-template.h \
--template $(top_srcdir)/build-aux/mm-enums-types.h.template \
--ftail "#endif /* __MM_PORT_ENUMS_TYPES_H__ */\n" \
$(PORT_ENUMS_INPUTS) > $@
mm-port-enums-types.c: Makefile.am $(top_srcdir)/build-aux/mm-enums-template.c mm-port-enums-types.h
mm-port-enums-types.c: Makefile.am $(top_srcdir)/build-aux/mm-enums-types.c.template mm-port-enums-types.h
$(AM_V_GEN) $(GLIB_MKENUMS) \
--fhead "#include \"mm-port-enums-types.h\"" \
--template $(top_srcdir)/build-aux/mm-enums-template.c \
--template $(top_srcdir)/build-aux/mm-enums-types.c.template \
$(PORT_ENUMS_INPUTS) > $@
libport_la_SOURCES = \
@@ -273,17 +273,17 @@ DAEMON_ENUMS_GENERATED = \
mm-daemon-enums-types.c \
$(NULL)
mm-daemon-enums-types.h: Makefile.am $(DAEMON_ENUMS_INPUTS) $(top_srcdir)/build-aux/mm-enums-template.h
mm-daemon-enums-types.h: Makefile.am $(DAEMON_ENUMS_INPUTS) $(top_srcdir)/build-aux/mm-enums-types.h.template
$(AM_V_GEN) $(GLIB_MKENUMS) \
--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" \
--template $(top_srcdir)/build-aux/mm-enums-template.h \
--template $(top_srcdir)/build-aux/mm-enums-types.h.template \
--ftail "#endif /* __MM_DAEMON_ENUMS_TYPES_H__ */\n" \
$(DAEMON_ENUMS_INPUTS) > $@
mm-daemon-enums-types.c: Makefile.am $(top_srcdir)/build-aux/mm-enums-template.c mm-daemon-enums-types.h
mm-daemon-enums-types.c: Makefile.am $(top_srcdir)/build-aux/mm-enums-types.c.template mm-daemon-enums-types.h
$(AM_V_GEN) $(GLIB_MKENUMS) \
--fhead "#include \"mm-daemon-enums-types.h\"" \
--template $(top_srcdir)/build-aux/mm-enums-template.c \
--template $(top_srcdir)/build-aux/mm-enums-types.c.template \
$(DAEMON_ENUMS_INPUTS) > $@
# Request to build enum types before anything else