diff --git common/glib-gen.mak common/glib-gen.mak index ef93a5f..2aef8f8 100644 --- common/glib-gen.mak +++ 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 diff --git common/gst-glib-gen.mak common/gst-glib-gen.mak index 76b2233..3244901 100644 --- common/gst-glib-gen.mak +++ 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 diff --git ext/srt/Makefile.in ext/srt/Makefile.in index 09109c3..cec6031 100644 --- ext/srt/Makefile.in +++ ext/srt/Makefile.in @@ -17,12 +17,14 @@ # 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 VPATH = @srcdir@ @@ -794,7 +796,7 @@ noinst_HEADERS = \ gstsrtsrc.h \ $(NULL) -enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") +enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am diff --git ext/srtp/Makefile.in ext/srtp/Makefile.in index 758db8e..0bb5ce5 100644 --- ext/srtp/Makefile.in +++ ext/srtp/Makefile.in @@ -17,12 +17,14 @@ # 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 VPATH = @srcdir@ am__is_gnu_make = { \ @@ -775,7 +777,7 @@ glib_gen_basename = gstsrtp BUILT_SOURCES = gstsrtp-enumtypes.c gstsrtp-enumtypes.h nodist_libgstsrtp_la_SOURCES = $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES) -enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") +enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am diff --git ext/webrtc/Makefile.in ext/webrtc/Makefile.in index da8fd9a..68b31e0 100644 --- ext/webrtc/Makefile.in +++ ext/webrtc/Makefile.in @@ -17,12 +17,14 @@ # 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 VPATH = @srcdir@ @@ -805,7 +807,7 @@ libgstwebrtc_la_LIBADD = \ libgstwebrtc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstwebrtc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS) -enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") +enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") all: all-am .SUFFIXES: diff --git gst-libs/gst/interfaces/Makefile.am gst-libs/gst/interfaces/Makefile.am index 660853a..622477e 100644 --- gst-libs/gst/interfaces/Makefile.am +++ gst-libs/gst/interfaces/Makefile.am @@ -5,13 +5,15 @@ libgstphotographyincludedir = \ headers_photography = \ photography.h +H := \# + # variables used for enum/marshal generation glib_enum_headers=$(headers_photography) glib_enum_define=GST_PHOTOGRAPHY glib_gen_prefix=gst_photography glib_gen_basename=photography glib_gen_decl_banner=GST_PHOTOGRAPHY_API -glib_gen_decl_include=\#include +glib_gen_decl_include=$(H)include built_sources = \ photography-enumtypes.c diff --git gst-libs/gst/interfaces/Makefile.in gst-libs/gst/interfaces/Makefile.in index ca1bde5..03cff41 100644 --- gst-libs/gst/interfaces/Makefile.in +++ gst-libs/gst/interfaces/Makefile.in @@ -17,12 +17,14 @@ # 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 VPATH = @srcdir@ @@ -773,7 +775,7 @@ glib_enum_define = GST_PHOTOGRAPHY glib_gen_prefix = gst_photography glib_gen_basename = photography glib_gen_decl_banner = GST_PHOTOGRAPHY_API -glib_gen_decl_include = \#include +glib_gen_decl_include = $(H)include built_sources = \ photography-enumtypes.c @@ -806,7 +808,7 @@ BUILT_SOURCES = \ $(built_headers) CLEANFILES = $(BUILT_SOURCES) -enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") +enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am diff --git gst-libs/gst/mpegts/Makefile.am gst-libs/gst/mpegts/Makefile.am index 59a3ddd..f59ae38 100644 --- gst-libs/gst/mpegts/Makefile.am +++ gst-libs/gst/mpegts/Makefile.am @@ -40,6 +40,8 @@ libgstmpegts_@GST_API_VERSION@_la_LDFLAGS = \ $(GST_ALL_LDFLAGS) \ $(GST_LT_LDFLAGS) +H := \# + glib_enum_headers=gstmpegtssection.h \ gstmpegtsdescriptor.h \ gst-atsc-section.h \ @@ -51,7 +53,7 @@ glib_enum_define=GST_MPEGTS glib_gen_prefix=gst_mpegts glib_gen_basename=gstmpegts glib_gen_decl_banner=GST_MPEGTS_API -glib_gen_decl_include=\#include +glib_gen_decl_include=$(H)include BUILT_SOURCES = gstmpegts-enumtypes.c gstmpegts-enumtypes.h nodist_libgstmpegts_@GST_API_VERSION@_la_SOURCES = gstmpegts-enumtypes.c diff --git gst-libs/gst/mpegts/Makefile.in gst-libs/gst/mpegts/Makefile.in index 7a145cb..241e1a2 100644 --- gst-libs/gst/mpegts/Makefile.in +++ gst-libs/gst/mpegts/Makefile.in @@ -17,12 +17,14 @@ # 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 @@ -822,7 +824,7 @@ glib_enum_define = GST_MPEGTS glib_gen_prefix = gst_mpegts glib_gen_basename = gstmpegts glib_gen_decl_banner = GST_MPEGTS_API -glib_gen_decl_include = \#include +glib_gen_decl_include = $(H)include BUILT_SOURCES = gstmpegts-enumtypes.c gstmpegts-enumtypes.h nodist_libgstmpegts_@GST_API_VERSION@_la_SOURCES = gstmpegts-enumtypes.c CLEANFILES = $(BUILT_SOURCES) $(am__append_1) @@ -842,7 +844,7 @@ CLEANFILES = $(BUILT_SOURCES) $(am__append_1) @HAVE_INTROSPECTION_TRUE@gir_DATA = $(BUILT_GIRSOURCES) @HAVE_INTROSPECTION_TRUE@typelibsdir = $(libdir)/girepository-1.0/ @HAVE_INTROSPECTION_TRUE@typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) -enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") +enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am diff --git gst-libs/gst/webrtc/Makefile.am gst-libs/gst/webrtc/Makefile.am index edc9de0..aace593 100644 --- gst-libs/gst/webrtc/Makefile.am +++ gst-libs/gst/webrtc/Makefile.am @@ -1,11 +1,13 @@ lib_LTLIBRARIES = libgstwebrtc-@GST_API_VERSION@.la +H := \# + glib_enum_headers = dtlstransport.h icetransport.h rtptransceiver.h webrtc_fwd.h glib_enum_define = GST_WEBRTC glib_gen_prefix = gst_webrtc glib_gen_basename = webrtc glib_gen_decl_banner=GST_WEBRTC_API -glib_gen_decl_include=\#include +glib_gen_decl_include=$(H)include built_sources = webrtc-enumtypes.c built_headers = webrtc-enumtypes.h diff --git gst-libs/gst/webrtc/Makefile.in gst-libs/gst/webrtc/Makefile.in index 04146bc..89f4327 100644 --- gst-libs/gst/webrtc/Makefile.in +++ gst-libs/gst/webrtc/Makefile.in @@ -17,12 +17,14 @@ # 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 @@ -761,7 +763,7 @@ glib_enum_define = GST_WEBRTC glib_gen_prefix = gst_webrtc glib_gen_basename = webrtc glib_gen_decl_banner = GST_WEBRTC_API -glib_gen_decl_include = \#include +glib_gen_decl_include = $(H)include built_sources = webrtc-enumtypes.c built_headers = webrtc-enumtypes.h BUILT_SOURCES = $(built_sources) $(built_headers) @@ -807,7 +809,7 @@ libgstwebrtc_@GST_API_VERSION@_la_LDFLAGS = \ $(GST_ALL_LDFLAGS) \ $(GST_LT_LDFLAGS) -enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") +enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstWebRTC-@GST_API_VERSION@.gir @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, $(libgstwebrtc_@GST_API_VERSION@include_HEADERS)) @HAVE_INTROSPECTION_TRUE@gir_sources = $(patsubst %,$(srcdir)/%, $(libgstwebrtc_@GST_API_VERSION@_la_SOURCES)) $(BUILT_SOURCES)