diff options
| author | Thibault Saunier <thibault.saunier@osg.samsung.com> | 2017-07-26 16:15:16 -0400 |
|---|---|---|
| committer | Thibault Saunier <thibault.saunier@osg.samsung.com> | 2017-07-26 16:18:02 -0400 |
| commit | 8ef1050d1efebbaa2af3c9141ce414e78d429203 (patch) | |
| tree | b5fc102ec5b9ee746f2650fffbacd3ac774ec1e6 | |
| parent | b9d6f9df9eb59a0d4abfbb89bc71d9249e0218fe (diff) | |
validate: Also mkenums with autotools
And fix the build with stricter gcc arguments.
| -rw-r--r-- | validate/gst/validate/Makefile.am | 24 | ||||
| -rw-r--r-- | validate/gst/validate/gst-validate-enum-types.c.template | 1 | ||||
| -rw-r--r-- | validate/gst/validate/gst-validate-pipeline-monitor.c | 2 |
3 files changed, 25 insertions, 2 deletions
diff --git a/validate/gst/validate/Makefile.am b/validate/gst/validate/Makefile.am index f591975..2c8ef45 100644 --- a/validate/gst/validate/Makefile.am +++ b/validate/gst/validate/Makefile.am @@ -1,3 +1,6 @@ +built_header_make = gst-validate-enum-types.h +built_source_make = gst-validate-enum-types.c + source_c = \ gst-validate-runner.c \ gst-validate-reporter.c \ @@ -39,6 +42,25 @@ source_h = \ gst-validate-scenario.h \ gst-validate-utils.h \ gst-validate-media-info.h +# +# do not put files in the distribution that are generated +nodist_libgstvalidate_@GST_API_VERSION@_la_SOURCES = $(built_source_make) +nodist_libgstvalidate_@GST_API_VERSION@include_HEADERS = $(built_header_make) + +gst-validate-enum-types.h: $(source_h) + $(AM_V_GEN)$(GLIB_MKENUMS) \ + --template gst-validate-enum-types.h.template \ + $^ > gst-validate-enum-types.h + +gst-validate-enum-types.c: $(source_h) + $(AM_V_GEN)$(GLIB_MKENUMS) \ + --template gst-validate-enum-types.c.template \ + $^ > gst-validate-enum-types.c + +# BUILT_SOURCES are built on make all/check/install before all other targets +BUILT_SOURCES = \ + $(built_header_make) \ + $(built_source_make) noinst_HEADERS = \ gettext.h \ @@ -75,7 +97,7 @@ libgstvalidatetracer_la_LIBADD = \ $(GST_ALL_LIBS) $(GIO_LIBS) $(GST_PBUTILS_LIBS) \ $(JSON_GLIB_LIBS) $(GLIB_LIBS) $(LIBM) -CLEANFILES = +CLEANFILES = $(built_header_make) $(built_source_make) $(as_dll_cleanfiles) *.gcno *.gcda *.gcov *.gcov.out if HAVE_INTROSPECTION BUILT_GIRSOURCES = GstValidate-@GST_API_VERSION@.gir diff --git a/validate/gst/validate/gst-validate-enum-types.c.template b/validate/gst/validate/gst-validate-enum-types.c.template index bca1ab4..ee4787b 100644 --- a/validate/gst/validate/gst-validate-enum-types.c.template +++ b/validate/gst/validate/gst-validate-enum-types.c.template @@ -1,4 +1,5 @@ /*** BEGIN file-header ***/ +#include "gst-validate-enum-types.h" #include <gst/validate/validate.h> #define C_ENUM(v) ((gint) v) #define C_FLAGS(v) ((guint) v) diff --git a/validate/gst/validate/gst-validate-pipeline-monitor.c b/validate/gst/validate/gst-validate-pipeline-monitor.c index 26c9bbe..69eb57d 100644 --- a/validate/gst/validate/gst-validate-pipeline-monitor.c +++ b/validate/gst/validate/gst-validate-pipeline-monitor.c @@ -522,7 +522,7 @@ _bus_handler (GstBus * bus, GstMessage * message, } else { g_string_append (str, "no message details\n"); } - gst_validate_printf (NULL, str->str); + gst_validate_printf (NULL, "%s", str->str); g_string_free (str, TRUE); } switch (GST_MESSAGE_TYPE (message)) { |