diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2013-11-22 09:25:21 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2014-02-13 13:41:14 +0100 |
| commit | 4827e79848da98c600fd228d02ea6fb56dc4e814 (patch) | |
| tree | 5c593e5f9987211e5b5846b0af9c8b5320a79686 | |
| parent | 1eaa416f22d7d247a3a69afe6ff025984f10b491 (diff) | |
libmm-glib,tests: use gdbus-codegen to generate code for the new Test interface
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | docs/reference/libmm-glib/Makefile.am | 9 | ||||
| -rw-r--r-- | libmm-glib/generated/Makefile.am | 2 | ||||
| -rw-r--r-- | libmm-glib/generated/tests/Makefile.am | 38 |
5 files changed, 50 insertions, 1 deletions
@@ -37,6 +37,7 @@ libmm-glib/generated/mm-enums-types.[ch] libmm-glib/generated/mm-errors-types.[ch] libmm-glib/generated/mm-errors-quarks.c libmm-glib/generated/*.xml +libmm-glib/generated/tests/mm-gdbus-*.[ch] libmm-glib/tests/test-common-helpers libmm-glib/*.gir libmm-glib/*.typelib diff --git a/configure.ac b/configure.ac index fa4b0fa3..c6332685 100644 --- a/configure.ac +++ b/configure.ac @@ -302,6 +302,7 @@ docs/reference/libmm-glib/Makefile docs/reference/libmm-glib/version.xml libmm-glib/Makefile libmm-glib/generated/Makefile +libmm-glib/generated/tests/Makefile libmm-glib/tests/Makefile vapi/Makefile cli/Makefile diff --git a/docs/reference/libmm-glib/Makefile.am b/docs/reference/libmm-glib/Makefile.am index 53afed97..ad0f151c 100644 --- a/docs/reference/libmm-glib/Makefile.am +++ b/docs/reference/libmm-glib/Makefile.am @@ -28,6 +28,7 @@ CFILE_GLOB = IGNORE_HFILES = \ mm-helpers.h \ mm-common-helpers.h \ + mm-gdbus-test.h \ $(NULL) # CFLAGS and LDFLAGS for compiling scan program. Only needed @@ -45,7 +46,13 @@ GTKDOC_LIBS = \ $(NULL) # Extra options to supply to gtkdoc-mkdb -MKDB_OPTIONS = --output-format=xml --sgml-mode --name-space=mm +MKDB_OPTIONS = \ + --output-format=xml \ + --sgml-mode \ + --name-space=mm \ + --ignore-files=mm-gdbus-test.h \ + --ignore-files=mm-gdbus-test.c \ + $(NULL) # Images to copy into HTML directory HTML_IMAGES = \ diff --git a/libmm-glib/generated/Makefile.am b/libmm-glib/generated/Makefile.am index 14d7bf38..d277b659 100644 --- a/libmm-glib/generated/Makefile.am +++ b/libmm-glib/generated/Makefile.am @@ -1,4 +1,6 @@ +SUBDIRS = . tests + noinst_LTLIBRARIES = libmm-generated.la GENERATED_H = \ diff --git a/libmm-glib/generated/tests/Makefile.am b/libmm-glib/generated/tests/Makefile.am new file mode 100644 index 00000000..006b9fe8 --- /dev/null +++ b/libmm-glib/generated/tests/Makefile.am @@ -0,0 +1,38 @@ + + +noinst_LTLIBRARIES = libmm-test-generated.la + +GENERATED_H = mm-gdbus-test.h +GENERATED_C = mm-gdbus-test.c + +BUILT_SOURCES = $(GENERATED_H) $(GENERATED_C) + +# Test interface +mm_gdbus_test_generated = \ + mm-gdbus-test.h \ + mm-gdbus-test.c +$(mm_gdbus_test_generated): $(top_srcdir)/introspection/tests/org.freedesktop.ModemManager1.Test.xml + $(AM_V_GEN) gdbus-codegen \ + --interface-prefix org.freedesktop.ModemManager1. \ + --c-namespace=MmGdbus \ + --generate-c-code mm-gdbus-test \ + $< \ + $(NULL) + +nodist_libmm_test_generated_la_SOURCES = \ + $(GENERATED_H) \ + $(GENERATED_C) + +libmm_test_generated_la_CPPFLAGS = \ + $(LIBMM_GLIB_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/include \ + -I$(top_builddir)/include \ + -Wno-unused-function \ + -Wno-float-equal \ + -Wno-shadow + +libmm_test_generated_la_LIBADD = \ + $(LIBMM_GLIB_LIBS) + +CLEANFILES = $(GENERATED_H) $(GENERATED_C) |