aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIñigo Martínez <inigomartinez@gmail.com>2019-01-10 09:39:01 +0100
committerIñigo Martínez <inigomartinez@gmail.com>2021-04-20 21:41:18 +0200
commitc4a0fe4d793cc334d3002e491e738a3e995ef5d5 (patch)
treede798a594b373d60c4f3a77d24ed7b74c21d9ee2
parent2f1ba03aa9f4b7169d6f255764cbdbb13d16b0b9 (diff)
build: Rename template files
The template files in the `build-aux/templates` 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
Diffstat
-rw-r--r--build-aux/templates/Makefile.am14
-rw-r--r--build-aux/templates/qmi-enum-types.c.template (renamed from build-aux/templates/qmi-enum-types-template.c)0
-rw-r--r--build-aux/templates/qmi-enum-types.h.template (renamed from build-aux/templates/qmi-enum-types-template.h)0
-rw-r--r--build-aux/templates/qmi-error-quarks.c.template (renamed from build-aux/templates/qmi-error-quarks-template.c)0
-rw-r--r--build-aux/templates/qmi-error-types.c.template (renamed from build-aux/templates/qmi-error-types-template.c)0
-rw-r--r--build-aux/templates/qmi-error-types.h.template (renamed from build-aux/templates/qmi-error-types-template.h)0
-rw-r--r--build-aux/templates/qmi-flags64-types.c.template (renamed from build-aux/templates/qmi-flags64-types-template.c)0
-rw-r--r--build-aux/templates/qmi-flags64-types.h.template (renamed from build-aux/templates/qmi-flags64-types-template.h)0
-rw-r--r--src/libqmi-glib/generated/Makefile.am36
-rw-r--r--src/qmi-firmware-update/Makefile.am8
10 files changed, 29 insertions, 29 deletions
diff --git a/build-aux/templates/Makefile.am b/build-aux/templates/Makefile.am
index 1c0e358..7709e1c 100644
--- a/build-aux/templates/Makefile.am
+++ b/build-aux/templates/Makefile.am
@@ -1,9 +1,9 @@
EXTRA_DIST = \
- qmi-error-types-template.h \
- qmi-error-types-template.c \
- qmi-error-quarks-template.c \
- qmi-enum-types-template.h \
- qmi-enum-types-template.c \
- qmi-flags64-types-template.h \
- qmi-flags64-types-template.c
+ qmi-error-types.h.template \
+ qmi-error-types.c.template \
+ qmi-error-quarks.c.template \
+ qmi-enum-types.h.template \
+ qmi-enum-types.c.template \
+ qmi-flags64-types.h.template \
+ qmi-flags64-types.c.template
diff --git a/build-aux/templates/qmi-enum-types-template.c b/build-aux/templates/qmi-enum-types.c.template
index 0e55689..0e55689 100644
--- a/build-aux/templates/qmi-enum-types-template.c
+++ b/build-aux/templates/qmi-enum-types.c.template
diff --git a/build-aux/templates/qmi-enum-types-template.h b/build-aux/templates/qmi-enum-types.h.template
index 5500038..5500038 100644
--- a/build-aux/templates/qmi-enum-types-template.h
+++ b/build-aux/templates/qmi-enum-types.h.template
diff --git a/build-aux/templates/qmi-error-quarks-template.c b/build-aux/templates/qmi-error-quarks.c.template
index 4386a60..4386a60 100644
--- a/build-aux/templates/qmi-error-quarks-template.c
+++ b/build-aux/templates/qmi-error-quarks.c.template
diff --git a/build-aux/templates/qmi-error-types-template.c b/build-aux/templates/qmi-error-types.c.template
index 2e13803..2e13803 100644
--- a/build-aux/templates/qmi-error-types-template.c
+++ b/build-aux/templates/qmi-error-types.c.template
diff --git a/build-aux/templates/qmi-error-types-template.h b/build-aux/templates/qmi-error-types.h.template
index 0af0374..0af0374 100644
--- a/build-aux/templates/qmi-error-types-template.h
+++ b/build-aux/templates/qmi-error-types.h.template
diff --git a/build-aux/templates/qmi-flags64-types-template.c b/build-aux/templates/qmi-flags64-types.c.template
index 61d541c..61d541c 100644
--- a/build-aux/templates/qmi-flags64-types-template.c
+++ b/build-aux/templates/qmi-flags64-types.c.template
diff --git a/build-aux/templates/qmi-flags64-types-template.h b/build-aux/templates/qmi-flags64-types.h.template
index 9ba53cb..9ba53cb 100644
--- a/build-aux/templates/qmi-flags64-types-template.h
+++ b/build-aux/templates/qmi-flags64-types.h.template
diff --git a/src/libqmi-glib/generated/Makefile.am b/src/libqmi-glib/generated/Makefile.am
index 113576b..e80eab4 100644
--- a/src/libqmi-glib/generated/Makefile.am
+++ b/src/libqmi-glib/generated/Makefile.am
@@ -74,23 +74,23 @@ GENERATED_SECTIONS = \
$(NULL)
# Error types
-qmi-error-types.h: $(top_srcdir)/src/libqmi-glib/qmi-errors.h $(top_srcdir)/build-aux/templates/qmi-error-types-template.h
+qmi-error-types.h: $(top_srcdir)/src/libqmi-glib/qmi-errors.h $(top_srcdir)/build-aux/templates/qmi-error-types.h.template
$(AM_V_GEN) $(PYTHON) $(top_srcdir)/build-aux/qmi-mkenums \
--fhead "#ifndef __LIBQMI_GLIB_ERROR_TYPES_H__\n#define __LIBQMI_GLIB_ERROR_TYPES_H__\n#include \"qmi-errors.h\"\n" \
- --template $(top_srcdir)/build-aux/templates/qmi-error-types-template.h \
+ --template $(top_srcdir)/build-aux/templates/qmi-error-types.h.template \
--ftail "#endif /* __LIBQMI_GLIB_ERROR_TYPES_H__ */\n" \
$(top_srcdir)/src/libqmi-glib/qmi-errors.h > $@
-qmi-error-types.c: $(top_srcdir)/src/libqmi-glib/qmi-errors.h qmi-error-types.h $(top_srcdir)/build-aux/templates/qmi-error-types-template.c
+qmi-error-types.c: $(top_srcdir)/src/libqmi-glib/qmi-errors.h qmi-error-types.h $(top_srcdir)/build-aux/templates/qmi-error-types.c.template
$(AM_V_GEN) $(PYTHON) $(top_srcdir)/build-aux/qmi-mkenums \
--fhead "#include \"qmi-errors.h\"\n#include \"qmi-error-types.h\"\n" \
- --template $(top_srcdir)/build-aux/templates/qmi-error-types-template.c \
+ --template $(top_srcdir)/build-aux/templates/qmi-error-types.c.template \
$(top_srcdir)/src/libqmi-glib/qmi-errors.h > $@
-qmi-error-quarks.c: $(top_srcdir)/src/libqmi-glib/qmi-errors.h qmi-error-types.h $(top_srcdir)/build-aux/templates/qmi-error-quarks-template.c
+qmi-error-quarks.c: $(top_srcdir)/src/libqmi-glib/qmi-errors.h qmi-error-types.h $(top_srcdir)/build-aux/templates/qmi-error-quarks.c.template
$(AM_V_GEN) $(PYTHON) $(top_srcdir)/build-aux/qmi-mkenums \
--fhead "#include \"qmi-errors.h\"\n#include \"qmi-error-types.h\"\n" \
- --template $(top_srcdir)/build-aux/templates/qmi-error-quarks-template.c \
+ --template $(top_srcdir)/build-aux/templates/qmi-error-quarks.c.template \
$(top_srcdir)/src/libqmi-glib/qmi-errors.h > $@
# Enum/Flag types
@@ -113,33 +113,33 @@ ENUMS = \
$(top_srcdir)/src/libqmi-glib/qmi-enums-gas.h \
$(top_srcdir)/src/libqmi-glib/qmi-enums-dsd.h \
$(top_srcdir)/src/libqmi-glib/qmi-device.h
-qmi-enum-types.h: $(ENUMS) $(top_srcdir)/build-aux/templates/qmi-enum-types-template.h
+qmi-enum-types.h: $(ENUMS) $(top_srcdir)/build-aux/templates/qmi-enum-types.h.template
$(AM_V_GEN) $(PYTHON) $(top_srcdir)/build-aux/qmi-mkenums \
--fhead "#ifndef __LIBQMI_GLIB_ENUM_TYPES_H__\n#define __LIBQMI_GLIB_ENUM_TYPES_H__\n#include \"qmi-enums.h\"\n#include \"qmi-enums-wds.h\"\n#include \"qmi-enums-dms.h\"\n#include \"qmi-enums-nas.h\"\n#include \"qmi-enums-wms.h\"\n#include \"qmi-enums-pds.h\"\n#include \"qmi-enums-pdc.h\"\n#include \"qmi-enums-pbm.h\"\n#include \"qmi-enums-uim.h\"\n#include \"qmi-enums-sar.h\"\n#include \"qmi-enums-oma.h\"\n#include \"qmi-enums-wda.h\"\n#include \"qmi-enums-voice.h\"\n#include \"qmi-enums-loc.h\"\n#include \"qmi-enums-qos.h\"\n#include \"qmi-enums-gas.h\"\n#include \"qmi-enums-dsd.h\"\n#include \"qmi-device.h\"\n" \
- --template $(top_srcdir)/build-aux/templates/qmi-enum-types-template.h \
+ --template $(top_srcdir)/build-aux/templates/qmi-enum-types.h.template \
--ftail "#endif /* __LIBQMI_GLIB_ENUM_TYPES_H__ */\n" \
$(ENUMS) > $@
-qmi-enum-types.c: $(ENUMS) qmi-enum-types.h $(top_srcdir)/build-aux/templates/qmi-enum-types-template.c
+qmi-enum-types.c: $(ENUMS) qmi-enum-types.h $(top_srcdir)/build-aux/templates/qmi-enum-types.c.template
$(AM_V_GEN) $(PYTHON) $(top_srcdir)/build-aux/qmi-mkenums \
--fhead "#include \"qmi-enum-types.h\"\n" \
- --template $(top_srcdir)/build-aux/templates/qmi-enum-types-template.c \
+ --template $(top_srcdir)/build-aux/templates/qmi-enum-types.c.template \
$(ENUMS) > $@
# Private Enum/Flag types
PRIVATE_ENUMS = \
$(top_srcdir)/src/libqmi-glib/qmi-enums-private.h
-qmi-enum-types-private.h: $(PRIVATE_ENUMS) $(top_srcdir)/build-aux/templates/qmi-enum-types-template.h
+qmi-enum-types-private.h: $(PRIVATE_ENUMS) $(top_srcdir)/build-aux/templates/qmi-enum-types.h.template
$(AM_V_GEN) $(PYTHON) $(top_srcdir)/build-aux/qmi-mkenums \
--fhead "#ifndef __LIBQMI_GLIB_ENUM_TYPES_PRIVATE_H__\n#define __LIBQMI_GLIB_ENUM_TYPES_PRIVATE_H__\n#include \"qmi-enums-private.h\"\n" \
- --template $(top_srcdir)/build-aux/templates/qmi-enum-types-template.h \
+ --template $(top_srcdir)/build-aux/templates/qmi-enum-types.h.template \
--ftail "#endif /* __LIBQMI_GLIB_ENUM_TYPES_PRIVATE_H__ */\n" \
$(PRIVATE_ENUMS) > $@
-qmi-enum-types-private.c: $(PRIVATE_ENUMS) qmi-enum-types-private.h $(top_srcdir)/build-aux/templates/qmi-enum-types-template.c
+qmi-enum-types-private.c: $(PRIVATE_ENUMS) qmi-enum-types-private.h $(top_srcdir)/build-aux/templates/qmi-enum-types.c.template
$(AM_V_GEN) $(PYTHON) $(top_srcdir)/build-aux/qmi-mkenums \
--fhead "#include \"qmi-enum-types-private.h\"\n" \
- --template $(top_srcdir)/build-aux/templates/qmi-enum-types-template.c \
+ --template $(top_srcdir)/build-aux/templates/qmi-enum-types.c.template \
$(PRIVATE_ENUMS) > $@
# 64bit flag types
@@ -149,17 +149,17 @@ FLAGS64 = \
$(top_srcdir)/src/libqmi-glib/qmi-flags64-loc.h \
$(top_srcdir)/src/libqmi-glib/qmi-flags64-dsd.h \
$(top_srcdir)/src/libqmi-glib/qmi-flags64-wds.h
-qmi-flags64-types.h: $(FLAGS64) $(top_srcdir)/build-aux/templates/qmi-flags64-types-template.h
+qmi-flags64-types.h: $(FLAGS64) $(top_srcdir)/build-aux/templates/qmi-flags64-types.h.template
$(AM_V_GEN) $(PYTHON) $(top_srcdir)/build-aux/qmi-mkenums \
--fhead "#ifndef __LIBQMI_GLIB_FLAGS64_TYPES_H__\n#define __LIBQMI_GLIB_FLAGS64_TYPES_H__\n#include \"qmi-flags64-dms.h\"\n#include \"qmi-flags64-nas.h\"\n#include \"qmi-flags64-loc.h\"\n#include \"qmi-flags64-dsd.h\"\n#include \"qmi-flags64-wds.h\"\n" \
- --template $(top_srcdir)/build-aux/templates/qmi-flags64-types-template.h \
+ --template $(top_srcdir)/build-aux/templates/qmi-flags64-types.h.template \
--ftail "#endif /* __LIBQMI_GLIB_FLAGS64_TYPES_H__ */\n" \
$(FLAGS64) > $@
-qmi-flags64-types.c: $(FLAGS64) qmi-flags64-types.h $(top_srcdir)/build-aux/templates/qmi-flags64-types-template.c
+qmi-flags64-types.c: $(FLAGS64) qmi-flags64-types.h $(top_srcdir)/build-aux/templates/qmi-flags64-types.c.template
$(AM_V_GEN) $(PYTHON) $(top_srcdir)/build-aux/qmi-mkenums \
--fhead "#include \"qmi-flags64-types.h\"\n" \
- --template $(top_srcdir)/build-aux/templates/qmi-flags64-types-template.c \
+ --template $(top_srcdir)/build-aux/templates/qmi-flags64-types.c.template \
$(FLAGS64) > $@
# CTL service (always available, regardless of collection)
diff --git a/src/qmi-firmware-update/Makefile.am b/src/qmi-firmware-update/Makefile.am
index 4c196fc..cf32899 100644
--- a/src/qmi-firmware-update/Makefile.am
+++ b/src/qmi-firmware-update/Makefile.am
@@ -66,17 +66,17 @@ ENUMS_GENERATED = \
qfu-enum-types.h qfu-enum-types.c \
$(NULL)
-qfu-enum-types.h: Makefile.am $(ENUMS) $(top_srcdir)/build-aux/templates/qmi-enum-types-template.h
+qfu-enum-types.h: Makefile.am $(ENUMS) $(top_srcdir)/build-aux/templates/qmi-enum-types.h.template
$(AM_V_GEN) $(PYTHON) $(top_srcdir)/build-aux/qmi-mkenums \
--fhead "#ifndef QFU_ENUM_TYPES_H\n#define QFU_ENUM_TYPES_H\n#include \"qfu-image.h\"\n#include \"qfu-qdl-message.h\"\n#include \"qfu-dload-message.h\"\n#include \"qfu-sahara-message.h\"\n" \
- --template $(top_srcdir)/build-aux/templates/qmi-enum-types-template.h \
+ --template $(top_srcdir)/build-aux/templates/qmi-enum-types.h.template \
--ftail "#endif /* __QFUENUM_TYPES_H__ */\n" \
$(ENUMS) > $@
-qfu-enum-types.c: $(ENUMS) qfu-enum-types.h $(top_srcdir)/build-aux/templates/qmi-enum-types-template.c
+qfu-enum-types.c: $(ENUMS) qfu-enum-types.h $(top_srcdir)/build-aux/templates/qmi-enum-types.c.template
$(AM_V_GEN) $(PYTHON) $(top_srcdir)/build-aux/qmi-mkenums \
--fhead "#include \"qfu-enum-types.h\"\n" \
- --template $(top_srcdir)/build-aux/templates/qmi-enum-types-template.c \
+ --template $(top_srcdir)/build-aux/templates/qmi-enum-types.c.template \
$(ENUMS) > $@
nodist_qmi_firmware_update_SOURCES = \