--- gst-plugins-base-1.16.2/common/glib-gen.mak +++ gst-plugins-base-1.16.2/common/glib-gen.mak @@ -1,11 +1,13 @@ # these are the variables your Makefile.am should set # the example is based on the colorbalance interface +H := \# + #glib_enum_headers=$(colorbalance_headers) #glib_enum_define=GST_COLOR_BALANCE #glib_enum_prefix=gst_color_balance -enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") +enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") # these are all the rules generating the relevant files %-marshal.h: %-marshal.list --- gst-plugins-base-1.16.2/common/gst-glib-gen.mak +++ gst-plugins-base-1.16.2/common/gst-glib-gen.mak @@ -1,14 +1,16 @@ # these are the variables your Makefile.am should set # the example is based on the colorbalance interface +H := \# + #glib_enum_headers=$(colorbalance_headers) #glib_enum_define=GST_COLOR_BALANCE #glib_gen_prefix=gst_color_balance #glib_gen_basename=colorbalance #glib_gen_decl_banner=GST_EXPORT -#glib_gen_decl_include=\#include +#glib_gen_decl_include=$(H)include -enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") +enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") # these are all the rules generating the relevant files $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list --- gst-plugins-base-1.16.2/gst-libs/gst/app/Makefile.am +++ gst-plugins-base-1.16.2/gst-libs/gst/app/Makefile.am @@ -1,10 +1,12 @@ lib_LTLIBRARIES = libgstapp-@GST_API_VERSION@.la +H := \# + glib_enum_define = GST_APP glib_gen_prefix = __gst_app glib_gen_basename = app glib_gen_decl_banner=GST_APP_API -glib_gen_decl_include=\#include +glib_gen_decl_include=$(H)include glib_enum_headers = gstappsrc.h --- gst-plugins-base-1.16.2/gst-libs/gst/audio/Makefile.am +++ gst-plugins-base-1.16.2/gst-libs/gst/audio/Makefile.am @@ -16,11 +16,13 @@ gstaudiocdsrc.h \ gstaudiobasesink.h +H := \# + glib_enum_define = GST_AUDIO glib_gen_prefix = gst_audio glib_gen_basename = audio glib_gen_decl_banner=GST_AUDIO_API -glib_gen_decl_include=\#include +glib_gen_decl_include=$(H)include built_sources = audio-enumtypes.c built_headers = audio-enumtypes.h --- gst-plugins-base-1.16.2/gst-libs/gst/gl/Makefile.am +++ gst-plugins-base-1.16.2/gst-libs/gst/gl/Makefile.am @@ -168,12 +168,14 @@ # DISTCLEANFILES is for files generated by configure DISTCLEANFILES = $(built_sys_header_configure) +H := \# + glib_enum_headers = $(gstgl_headers) glib_enum_define = GST_GL glib_gen_prefix = gst_gl glib_gen_basename = gl glib_gen_decl_banner=GST_GL_API -glib_gen_decl_include=\#include +glib_gen_decl_include=$(H)include built_sources = gl-enumtypes.c built_headers = gl-enumtypes.h --- gst-plugins-base-1.16.2/gst-libs/gst/pbutils/Makefile.am +++ gst-plugins-base-1.16.2/gst-libs/gst/pbutils/Makefile.am @@ -12,13 +12,15 @@ gstdiscoverer.h \ gstaudiovisualizer.h +H := \# + # variables used for enum/marshal generation glib_enum_headers = $(headers_pbutils) glib_enum_define = PB_UTILS glib_gen_prefix = pbutils glib_gen_basename = pbutils glib_gen_decl_banner=GST_PBUTILS_API -glib_gen_decl_include=\#include +glib_gen_decl_include=$(H)include built_headers_configure = \ gstpluginsbaseversion.h --- gst-plugins-base-1.16.2/gst-libs/gst/rtp/Makefile.am +++ gst-plugins-base-1.16.2/gst-libs/gst/rtp/Makefile.am @@ -37,12 +37,14 @@ BUILT_SOURCES = $(built_headers) $(built_sources) CLEANFILES = $(BUILT_SOURCES) +H := \# + glib_gen_prefix = __gst_rtp glib_enum_define = gst_rtp glib_enum_headers = $(libgstrtpinclude_HEADERS) glib_gen_basename = gstrtp glib_gen_decl_banner=GST_RTP_API -glib_gen_decl_include=\#include +glib_gen_decl_include=$(H)include include $(top_srcdir)/common/gst-glib-gen.mak --- gst-plugins-base-1.16.2/gst-libs/gst/rtsp/Makefile.am +++ gst-plugins-base-1.16.2/gst-libs/gst/rtsp/Makefile.am @@ -41,12 +41,14 @@ BUILT_SOURCES = $(built_headers) $(built_sources) CLEANFILES = $(BUILT_SOURCES) +H := \# + glib_gen_prefix = __gst_rtsp glib_enum_define = gst_rtsp glib_enum_headers = $(libgstrtspinclude_HEADERS) glib_gen_basename = gstrtsp glib_gen_decl_banner=GST_RTSP_API -glib_gen_decl_include=\#include +glib_gen_decl_include=$(H)include include $(top_srcdir)/common/gst-glib-gen.mak --- gst-plugins-base-1.16.2/gst-libs/gst/tag/Makefile.am +++ gst-plugins-base-1.16.2/gst-libs/gst/tag/Makefile.am @@ -1,11 +1,13 @@ libgsttagincludedir = \ $(includedir)/gstreamer-@GST_API_VERSION@/gst/tag +H := \# + glib_enum_define = GST_TAG glib_gen_prefix = gst_tag glib_gen_basename = tag glib_gen_decl_banner=GST_TAG_API -glib_gen_decl_include=\#include +glib_gen_decl_include=$(H)include glib_enum_headers = tag.h gsttagdemux.h --- gst-plugins-base-1.16.2/gst-libs/gst/video/Makefile.am +++ gst-plugins-base-1.16.2/gst-libs/gst/video/Makefile.am @@ -2,6 +2,8 @@ ORC_SOURCE=video-orc include $(top_srcdir)/common/orc.mak +H := \# + glib_enum_headers = video.h video-format.h video-color.h video-info.h video-dither.h \ colorbalance.h navigation.h video-chroma.h video-tile.h video-converter.h \ video-resampler.h video-frame.h video-scaler.h video-anc.h \ @@ -10,7 +12,7 @@ glib_gen_prefix = gst_video glib_gen_basename = video glib_gen_decl_banner=GST_VIDEO_API -glib_gen_decl_include=\#include +glib_gen_decl_include=$(H)include built_sources = video-enumtypes.c built_headers = video-enumtypes.h