diff options
| -rw-r--r-- | .gitignore | 25 | ||||
| -rw-r--r-- | cli/Makefile.am | 3 | ||||
| -rw-r--r-- | cli/test/Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | docs/reference/libqmi-glib/Makefile.am | 3 | ||||
| -rw-r--r-- | libqmi-glib/Makefile.am | 177 | ||||
| -rw-r--r-- | libqmi-glib/generated/Makefile.am | 161 | ||||
| -rw-r--r-- | libqmi-glib/test/Makefile.am | 6 |
8 files changed, 191 insertions, 188 deletions
@@ -37,26 +37,11 @@ libqmi-glib/.deps libqmi-glib/Makefile libqmi-glib/Makefile.in libqmi-glib/libqmi-glib.la -libqmi-glib/qmi-error-quarks.c -libqmi-glib/qmi-error-types.c -libqmi-glib/qmi-error-types.h -libqmi-glib/qmi-enum-types.h -libqmi-glib/qmi-enum-types.c -libqmi-glib/qmi-flags64-types.h -libqmi-glib/qmi-flags64-types.c -libqmi-glib/qmi-ctl.h -libqmi-glib/qmi-ctl.c -libqmi-glib/qmi-dms.h -libqmi-glib/qmi-dms.c -libqmi-glib/qmi-wds.h -libqmi-glib/qmi-wds.c -libqmi-glib/qmi-nas.h -libqmi-glib/qmi-nas.c -libqmi-glib/qmi-wms.h -libqmi-glib/qmi-wms.c -libqmi-glib/qmi-pds.h -libqmi-glib/qmi-pds.c -libqmi-glib/*.stamp + +libqmi-glib/generated/.libs +libqmi-glib/generated/.deps +libqmi-glib/generated/*.c +libqmi-glib/generated/*.h libqmi-glib/test/.libs libqmi-glib/test/.deps diff --git a/cli/Makefile.am b/cli/Makefile.am index 7675619..8b11722 100644 --- a/cli/Makefile.am +++ b/cli/Makefile.am @@ -7,7 +7,8 @@ qmicli_CPPFLAGS = \ $(QMICLI_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/libqmi-glib \ - -I$(top_builddir)/libqmi-glib + -I$(top_srcdir)/libqmi-glib/generated \ + -I$(top_builddir)/libqmi-glib/generated qmicli_SOURCES = \ qmicli.c \ diff --git a/cli/test/Makefile.am b/cli/test/Makefile.am index b30a6e9..8e556ee 100644 --- a/cli/test/Makefile.am +++ b/cli/test/Makefile.am @@ -12,7 +12,8 @@ test_helpers_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/cli \ -I$(top_srcdir)/libqmi-glib \ - -I$(top_builddir)/libqmi-glib + -I$(top_srcdir)/libqmi-glib/generated \ + -I$(top_builddir)/libqmi-glib/generated test_helpers_LDADD = \ $(QMICLI_LIBS) \ diff --git a/configure.ac b/configure.ac index b2def16..2a41e2c 100644 --- a/configure.ac +++ b/configure.ac @@ -89,6 +89,7 @@ AC_CONFIG_FILES([Makefile build-aux/templates/Makefile build-aux/qmi-codegen/Makefile libqmi-glib/Makefile + libqmi-glib/generated/Makefile libqmi-glib/test/Makefile cli/Makefile cli/test/Makefile diff --git a/docs/reference/libqmi-glib/Makefile.am b/docs/reference/libqmi-glib/Makefile.am index 5cdf0ef..7d0ec26 100644 --- a/docs/reference/libqmi-glib/Makefile.am +++ b/docs/reference/libqmi-glib/Makefile.am @@ -8,7 +8,8 @@ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml SCAN_OPTIONS = # The directory containing the source code. -DOC_SOURCE_DIR = $(top_srcdir)/libqmi-glib +DOC_SOURCE_DIR = \ + $(top_srcdir)/libqmi-glib HFILE_GLOB = CFILE_GLOB = diff --git a/libqmi-glib/Makefile.am b/libqmi-glib/Makefile.am index b4e57c7..d1d9bff 100644 --- a/libqmi-glib/Makefile.am +++ b/libqmi-glib/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = . test +SUBDIRS = generated . test lib_LTLIBRARIES = libqmi-glib.la @@ -8,186 +8,37 @@ libqmi_glib_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_srcdir)/libqmi-glib \ - -I$(top_builddir)/libqmi-glib - -# Error types -qmi-error-types.h: qmi-errors.h $(top_srcdir)/build-aux/templates/qmi-error-types-template.h - $(AM_V_GEN) $(GLIB_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 \ - --ftail "#endif /* __LIBQMI_GLIB_ERROR_TYPES_H__ */\n" \ - qmi-errors.h > $@ - -qmi-error-types.c: qmi-errors.h qmi-error-types.h $(top_srcdir)/build-aux/templates/qmi-error-types-template.c - $(AM_V_GEN) $(GLIB_MKENUMS) \ - --fhead "#include \"qmi-errors.h\"\n#include \"qmi-error-types.h\"\n" \ - --template $(top_srcdir)/build-aux/templates/qmi-error-types-template.c \ - qmi-errors.h > $@ - -qmi-error-quarks.c: qmi-errors.h qmi-error-types.h $(top_srcdir)/build-aux/templates/qmi-error-quarks-template.c - $(AM_V_GEN) $(GLIB_MKENUMS) \ - --fhead "#include \"qmi-errors.h\"\n#include \"qmi-error-types.h\"\n" \ - --template $(top_srcdir)/build-aux/templates/qmi-error-quarks-template.c \ - qmi-errors.h > $@ - -# Enum/Flag types -ENUMS = qmi-enums.h qmi-enums-wds.h qmi-enums-dms.h qmi-enums-nas.h qmi-enums-wms.h qmi-enums-pds.h -qmi-enum-types.h: $(ENUMS) $(top_srcdir)/build-aux/templates/qmi-enum-types-template.h - $(AM_V_GEN) $(GLIB_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" \ - --template $(top_srcdir)/build-aux/templates/qmi-enum-types-template.h \ - --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 - $(AM_V_GEN) $(GLIB_MKENUMS) \ - --fhead "#include \"qmi-enum-types.h\"\n" \ - --template $(top_srcdir)/build-aux/templates/qmi-enum-types-template.c \ - $(ENUMS) > $@ - -# 64bit flag types -FLAGS64 = qmi-flags64-dms.h qmi-flags64-nas.h -qmi-flags64-types.h: $(FLAGS64) $(top_srcdir)/build-aux/templates/qmi-flags64-types-template.h - $(AM_V_GEN) $(GLIB_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" \ - --template $(top_srcdir)/build-aux/templates/qmi-flags64-types-template.h \ - --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 - $(AM_V_GEN) $(GLIB_MKENUMS) \ - --fhead "#include \"qmi-flags64-types.h\"\n" \ - --template $(top_srcdir)/build-aux/templates/qmi-flags64-types-template.c \ - $(FLAGS64) > $@ - -# CTL service -qmi-ctl.stamp: $(top_srcdir)/data/qmi-service-ctl.json $(top_srcdir)/build-aux/qmi-codegen/*.py $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen - $(AM_V_GEN) \ - rm -f qmi-ctl.h && \ - rm -f qmi-ctl.c && \ - $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen \ - --input $(top_srcdir)/data/qmi-service-ctl.json \ - --include $(top_srcdir)/data/qmi-common.json \ - --output qmi-ctl && \ - touch $@ - -# DMS service -qmi-dms.stamp: $(top_srcdir)/data/qmi-service-dms.json $(top_srcdir)/build-aux/qmi-codegen/*.py $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen - $(AM_V_GEN) \ - rm -f qmi-dms.h && \ - rm -f qmi-dms.c && \ - $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen \ - --input $(top_srcdir)/data/qmi-service-dms.json \ - --include $(top_srcdir)/data/qmi-common.json \ - --output qmi-dms && \ - touch $@ - -# WDS service -qmi-wds.stamp: $(top_srcdir)/data/qmi-service-wds.json $(top_srcdir)/build-aux/qmi-codegen/*.py $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen - $(AM_V_GEN) \ - rm -f qmi-wds.h && \ - rm -f qmi-wds.c && \ - $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen \ - --input $(top_srcdir)/data/qmi-service-wds.json \ - --include $(top_srcdir)/data/qmi-common.json \ - --output qmi-wds && \ - touch $@ - -# NAS service -qmi-nas.stamp: $(top_srcdir)/data/qmi-service-nas.json $(top_srcdir)/build-aux/qmi-codegen/*.py $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen - $(AM_V_GEN) \ - rm -f qmi-nas.h && \ - rm -f qmi-nas.c && \ - $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen \ - --input $(top_srcdir)/data/qmi-service-nas.json \ - --include $(top_srcdir)/data/qmi-common.json \ - --output qmi-nas && \ - touch $@ - -# WMS service -qmi-wms.stamp: $(top_srcdir)/data/qmi-service-wms.json $(top_srcdir)/build-aux/qmi-codegen/*.py $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen - $(AM_V_GEN) \ - rm -f qmi-wms.h && \ - rm -f qmi-wms.c && \ - $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen \ - --input $(top_srcdir)/data/qmi-service-wms.json \ - --include $(top_srcdir)/data/qmi-common.json \ - --output qmi-wms && \ - touch $@ - -# PDS service -qmi-pds.stamp: $(top_srcdir)/data/qmi-service-pds.json $(top_srcdir)/build-aux/qmi-codegen/*.py $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen - $(AM_V_GEN) \ - rm -f qmi-pds.h && \ - rm -f qmi-pds.c && \ - $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen \ - --input $(top_srcdir)/data/qmi-service-pds.json \ - --include $(top_srcdir)/data/qmi-common.json \ - --output qmi-pds && \ - touch $@ - -# Additional dependencies -qmi-device.c: qmi-error-types.h qmi-enum-types.h qmi-ctl.h qmi-dms.h qmi-wds.h qmi-nas.h qmi-wms.h qmi-pds.h -qmi-client.c: qmi-error-types.h qmi-enum-types.h -qmi-message.c: qmi-error-types.h qmi-enum-types.h qmi-ctl.h qmi-dms.h qmi-wds.h qmi-nas.h qmi-wms.h qmi-pds.h -qmi-ctl.h: qmi-ctl.stamp -qmi-ctl.c: qmi-error-types.h qmi-enum-types.h qmi-ctl.h -qmi-dms.h: qmi-dms.stamp qmi-enums-dms.h -qmi-dms.c: qmi-error-types.h qmi-enum-types.h qmi-flags64-types.h qmi-dms.h -qmi-wds.h: qmi-wds.stamp qmi-enums-wds.h -qmi-wds.c: qmi-error-types.h qmi-enum-types.h qmi-wds.h -qmi-enums-wds.c: qmi-enum-types.h qmi-enums-wds.h -qmi-nas.h: qmi-nas.stamp qmi-enums-nas.h -qmi-nas.c: qmi-error-types.h qmi-enum-types.h qmi-flags64-types.h qmi-nas.h -qmi-wms.h: qmi-wms.stamp qmi-enums-wms.h -qmi-wms.c: qmi-error-types.h qmi-enum-types.h qmi-wms.h -qmi-pds.h: qmi-pds.stamp qmi-enums-pds.h -qmi-pds.c: qmi-error-types.h qmi-enum-types.h qmi-pds.h + -I$(top_srcdir)/libqmi-glib/generated \ + -I$(top_builddir)/libqmi-glib/generated libqmi_glib_la_SOURCES = \ libqmi-glib.h \ - qmi-errors.h qmi-error-types.h qmi-error-types.c qmi-error-quarks.c \ + qmi-errors.h \ qmi-enums-wds.h qmi-enums-wds.c \ qmi-enums-dms.h \ qmi-enums-nas.h \ qmi-enums-wms.h \ qmi-enums-pds.h \ - qmi-enums.h qmi-enum-types.h qmi-enum-types.c qmi-flags64-types.h qmi-flags64-types.c \ + qmi-enums.h \ qmi-utils.h qmi-utils.c \ qmi-message.h qmi-message.c \ qmi-device.h qmi-device.c \ qmi-client.h qmi-client.c -nodist_libqmi_glib_la_SOURCES = \ - qmi-ctl.c qmi-ctl.h \ - qmi-dms.c qmi-dms.h \ - qmi-wds.c qmi-wds.h \ - qmi-nas.c qmi-nas.h \ - qmi-wms.c qmi-wms.h \ - qmi-pds.c qmi-pds.h - libqmi_glib_la_LIBADD = \ + ${top_builddir}/libqmi-glib/generated/libqmi-glib-generated.la \ $(LIBQMI_GLIB_LIBS) includedir = @includedir@/libqmi-glib include_HEADERS = \ libqmi-glib.h \ - qmi-errors.h qmi-error-types.h \ - qmi-enums.h qmi-enum-types.h qmi-flags64-types.h \ + qmi-errors.h \ + qmi-enums.h \ + qmi-enums-dms.h qmi-flags64-dms.h \ + qmi-enums-wds.h \ + qmi-enums-nas.h qmi-flags64-nas.h \ + qmi-enums-wms.h \ + qmi-enums-pds.h \ qmi-message.h \ qmi-device.h \ - qmi-client.h \ - qmi-ctl.h \ - qmi-enums-dms.h qmi-flags64-dms.h qmi-dms.h \ - qmi-enums-wds.h qmi-wds.h \ - qmi-enums-nas.h qmi-flags64-nas.h qmi-nas.h \ - qmi-enums-wms.h qmi-wms.h \ - qmi-enums-pds.h qmi-pds.h - -CLEANFILES = \ - qmi-ctl.h qmi-ctl.c qmi-ctl.stamp \ - qmi-dms.h qmi-dms.c qmi-dms.stamp \ - qmi-wds.h qmi-wds.c qmi-wds.stamp \ - qmi-nas.h qmi-nas.c qmi-nas.stamp \ - qmi-wms.h qmi-wms.c qmi-wms.stamp \ - qmi-pds.h qmi-pds.c qmi-pds.stamp + qmi-client.h diff --git a/libqmi-glib/generated/Makefile.am b/libqmi-glib/generated/Makefile.am new file mode 100644 index 0000000..6305a07 --- /dev/null +++ b/libqmi-glib/generated/Makefile.am @@ -0,0 +1,161 @@ + +noinst_LTLIBRARIES = libqmi-glib-generated.la + +GENERATED_H = \ + qmi-error-types.h \ + qmi-enum-types.h \ + qmi-flags64-types.h \ + qmi-ctl.h \ + qmi-dms.h \ + qmi-nas.h \ + qmi-wds.h \ + qmi-wms.h \ + qmi-pds.h + +GENERATED_C = \ + qmi-error-types.c \ + qmi-error-quarks.c \ + qmi-enum-types.c \ + qmi-flags64-types.c \ + qmi-ctl.c \ + qmi-dms.c \ + qmi-nas.c \ + qmi-wds.c \ + qmi-wms.c \ + qmi-pds.c + +# Error types +qmi-error-types.h: $(top_srcdir)/libqmi-glib/qmi-errors.h $(top_srcdir)/build-aux/templates/qmi-error-types-template.h + $(AM_V_GEN) $(GLIB_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 \ + --ftail "#endif /* __LIBQMI_GLIB_ERROR_TYPES_H__ */\n" \ + $(top_srcdir)/libqmi-glib/qmi-errors.h > $@ + +qmi-error-types.c: $(top_srcdir)/libqmi-glib/qmi-errors.h qmi-error-types.h $(top_srcdir)/build-aux/templates/qmi-error-types-template.c + $(AM_V_GEN) $(GLIB_MKENUMS) \ + --fhead "#include \"qmi-errors.h\"\n#include \"qmi-error-types.h\"\n" \ + --template $(top_srcdir)/build-aux/templates/qmi-error-types-template.c \ + $(top_srcdir)/libqmi-glib/qmi-errors.h > $@ + +qmi-error-quarks.c: $(top_srcdir)/libqmi-glib/qmi-errors.h qmi-error-types.h $(top_srcdir)/build-aux/templates/qmi-error-quarks-template.c + $(AM_V_GEN) $(GLIB_MKENUMS) \ + --fhead "#include \"qmi-errors.h\"\n#include \"qmi-error-types.h\"\n" \ + --template $(top_srcdir)/build-aux/templates/qmi-error-quarks-template.c \ + $(top_srcdir)/libqmi-glib/qmi-errors.h > $@ + +# Enum/Flag types +ENUMS = \ + $(top_srcdir)/libqmi-glib/qmi-enums.h \ + $(top_srcdir)/libqmi-glib/qmi-enums-wds.h \ + $(top_srcdir)/libqmi-glib/qmi-enums-dms.h \ + $(top_srcdir)/libqmi-glib/qmi-enums-nas.h \ + $(top_srcdir)/libqmi-glib/qmi-enums-wms.h \ + $(top_srcdir)/libqmi-glib/qmi-enums-pds.h +qmi-enum-types.h: $(ENUMS) $(top_srcdir)/build-aux/templates/qmi-enum-types-template.h + $(AM_V_GEN) $(GLIB_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" \ + --template $(top_srcdir)/build-aux/templates/qmi-enum-types-template.h \ + --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 + $(AM_V_GEN) $(GLIB_MKENUMS) \ + --fhead "#include \"qmi-enum-types.h\"\n" \ + --template $(top_srcdir)/build-aux/templates/qmi-enum-types-template.c \ + $(ENUMS) > $@ + +# 64bit flag types +FLAGS64 = $(top_srcdir)/libqmi-glib/qmi-flags64-dms.h $(top_srcdir)/libqmi-glib/qmi-flags64-nas.h +qmi-flags64-types.h: $(FLAGS64) $(top_srcdir)/build-aux/templates/qmi-flags64-types-template.h + $(AM_V_GEN) $(GLIB_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" \ + --template $(top_srcdir)/build-aux/templates/qmi-flags64-types-template.h \ + --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 + $(AM_V_GEN) $(GLIB_MKENUMS) \ + --fhead "#include \"qmi-flags64-types.h\"\n" \ + --template $(top_srcdir)/build-aux/templates/qmi-flags64-types-template.c \ + $(FLAGS64) > $@ + +# CTL service +qmi-ctl.h qmi-ctl.c: $(top_srcdir)/data/qmi-service-ctl.json $(top_srcdir)/build-aux/qmi-codegen/*.py $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen + $(AM_V_GEN) \ + rm -f qmi-ctl.h && \ + rm -f qmi-ctl.c && \ + $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen \ + --input $(top_srcdir)/data/qmi-service-ctl.json \ + --include $(top_srcdir)/data/qmi-common.json \ + --output qmi-ctl + +# DMS service +qmi-dms.h qmi-dms.c: $(top_srcdir)/data/qmi-service-dms.json $(top_srcdir)/build-aux/qmi-codegen/*.py $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen + $(AM_V_GEN) \ + rm -f qmi-dms.h && \ + rm -f qmi-dms.c && \ + $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen \ + --input $(top_srcdir)/data/qmi-service-dms.json \ + --include $(top_srcdir)/data/qmi-common.json \ + --output qmi-dms + +# WDS service +qmi-wds.h qmi-wds.c: $(top_srcdir)/data/qmi-service-wds.json $(top_srcdir)/build-aux/qmi-codegen/*.py $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen + $(AM_V_GEN) \ + rm -f qmi-wds.h && \ + rm -f qmi-wds.c && \ + $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen \ + --input $(top_srcdir)/data/qmi-service-wds.json \ + --include $(top_srcdir)/data/qmi-common.json \ + --output qmi-wds + +# NAS service +qmi-nas.h qmi-nas.c: $(top_srcdir)/data/qmi-service-nas.json $(top_srcdir)/build-aux/qmi-codegen/*.py $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen + $(AM_V_GEN) \ + rm -f qmi-nas.h && \ + rm -f qmi-nas.c && \ + $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen \ + --input $(top_srcdir)/data/qmi-service-nas.json \ + --include $(top_srcdir)/data/qmi-common.json \ + --output qmi-nas + +# WMS service +qmi-wms.h qmi-wms.c: $(top_srcdir)/data/qmi-service-wms.json $(top_srcdir)/build-aux/qmi-codegen/*.py $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen + $(AM_V_GEN) \ + rm -f qmi-wms.h && \ + rm -f qmi-wms.c && \ + $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen \ + --input $(top_srcdir)/data/qmi-service-wms.json \ + --include $(top_srcdir)/data/qmi-common.json \ + --output qmi-wms + +# PDS service +qmi-pds.h qmi-pds.c: $(top_srcdir)/data/qmi-service-pds.json $(top_srcdir)/build-aux/qmi-codegen/*.py $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen + $(AM_V_GEN) \ + rm -f qmi-pds.h && \ + rm -f qmi-pds.c && \ + $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen \ + --input $(top_srcdir)/data/qmi-service-pds.json \ + --include $(top_srcdir)/data/qmi-common.json \ + --output qmi-pds + +BUILT_SOURCES = $(GENERATED_H) $(GENERATED_C) + +nodist_libqmi_glib_generated_la_SOURCES = \ + $(GENERATED_H) \ + $(GENERATED_C) + +libqmi_glib_generated_la_CPPFLAGS = \ + $(LIBQMI_GLIB_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/libqmi-glib + +libqmi_glib_generated_la_LIBADD = \ + $(LIBQMI_GLIB_LIBS) + +includedir = @includedir@/libqmi-glib +nodist_include_HEADERS = $(GENERATED_H) + +CLEANFILES = $(GENERATED_H) $(GENERATED_C) + diff --git a/libqmi-glib/test/Makefile.am b/libqmi-glib/test/Makefile.am index 9a5c967..a93bdee 100644 --- a/libqmi-glib/test/Makefile.am +++ b/libqmi-glib/test/Makefile.am @@ -9,7 +9,8 @@ test_utils_CPPFLAGS = \ $(LIBQMI_GLIB_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/libqmi-glib \ - -I$(top_builddir)/libqmi-glib + -I$(top_srcdir)/libqmi-glib/generated \ + -I$(top_builddir)/libqmi-glib/generated test_utils_LDADD = \ $(top_builddir)/libqmi-glib/libqmi-glib.la \ $(LIBQMI_GLIB_LIBS) @@ -20,7 +21,8 @@ test_message_CPPFLAGS = \ $(LIBQMI_GLIB_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/libqmi-glib \ - -I$(top_builddir)/libqmi-glib + -I$(top_srcdir)/libqmi-glib/generated \ + -I$(top_builddir)/libqmi-glib/generated test_message_LDADD = \ $(top_builddir)/libqmi-glib/libqmi-glib.la \ $(LIBQMI_GLIB_LIBS) |