Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 705974 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-15 / +20 lines)
Line  Link Here
0
-- a/common/glib-gen.mak
0
++ b/common/glib-gen.mak
Lines 1-11 Link Here
1
# these are the variables your Makefile.am should set
1
# these are the variables your Makefile.am should set
2
# the example is based on the colorbalance interface
2
# the example is based on the colorbalance interface
3
3
4
H := \#
5
4
#glib_enum_headers=$(colorbalance_headers)
6
#glib_enum_headers=$(colorbalance_headers)
5
#glib_enum_define=GST_COLOR_BALANCE
7
#glib_enum_define=GST_COLOR_BALANCE
6
#glib_enum_prefix=gst_color_balance
8
#glib_enum_prefix=gst_color_balance
7
9
8
enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
10
enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
9
11
10
# these are all the rules generating the relevant files
12
# these are all the rules generating the relevant files
11
%-marshal.h: %-marshal.list
13
%-marshal.h: %-marshal.list
12
-- a/common/gst-glib-gen.mak
14
++ b/common/gst-glib-gen.mak
Lines 1-14 Link Here
1
# these are the variables your Makefile.am should set
1
# these are the variables your Makefile.am should set
2
# the example is based on the colorbalance interface
2
# the example is based on the colorbalance interface
3
3
4
H := \#
5
4
#glib_enum_headers=$(colorbalance_headers)
6
#glib_enum_headers=$(colorbalance_headers)
5
#glib_enum_define=GST_COLOR_BALANCE
7
#glib_enum_define=GST_COLOR_BALANCE
6
#glib_gen_prefix=gst_color_balance
8
#glib_gen_prefix=gst_color_balance
7
#glib_gen_basename=colorbalance
9
#glib_gen_basename=colorbalance
8
#glib_gen_decl_banner=GST_EXPORT
10
#glib_gen_decl_banner=GST_EXPORT
9
#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
11
#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
10
12
11
enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
13
enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
12
14
13
# these are all the rules generating the relevant files
15
# these are all the rules generating the relevant files
14
$(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
16
$(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
15
-- a/libs/gst/controller/Makefile.in
17
++ b/libs/gst/controller/Makefile.in
Lines 17-29 Link Here
17
# these are the variables your Makefile.am should set
17
# these are the variables your Makefile.am should set
18
# the example is based on the colorbalance interface
18
# the example is based on the colorbalance interface
19
19
20
#glib_enum_headers=$(colorbalance_headers)
21
#glib_enum_define=GST_COLOR_BALANCE
22
#glib_gen_prefix=gst_color_balance
23
#glib_gen_basename=colorbalance
24
#glib_gen_decl_banner=GST_EXPORT
25
#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
26
27
20
28
21
29
VPATH = @srcdir@
22
VPATH = @srcdir@
Lines 550-560 Link Here
550
	gstinterpolationcontrolsource.h \
543
	gstinterpolationcontrolsource.h \
551
	gstlfocontrolsource.h
544
	gstlfocontrolsource.h
552
545
546
H := \#
553
glib_enum_define = GST_CONTROLLER
547
glib_enum_define = GST_CONTROLLER
554
glib_gen_prefix = gst
548
glib_gen_prefix = gst
555
glib_gen_basename = controller
549
glib_gen_basename = controller
556
glib_gen_decl_banner = GST_CONTROLLER_API
550
glib_gen_decl_banner = GST_CONTROLLER_API
557
glib_gen_decl_include = \#include <gst/controller/controller-prelude.h>
551
glib_gen_decl_include = $(H)include <gst/controller/controller-prelude.h>
558
built_sources = controller-enumtypes.c
552
built_sources = controller-enumtypes.c
559
built_headers = controller-enumtypes.h
553
built_headers = controller-enumtypes.h
560
BUILT_SOURCES = $(built_sources) $(built_headers)
554
BUILT_SOURCES = $(built_sources) $(built_headers)
Lines 587-593 Link Here
587
libgstcontroller_@GST_API_VERSION@_la_LIBADD = $(GST_OBJ_LIBS) $(LIBM)
581
libgstcontroller_@GST_API_VERSION@_la_LIBADD = $(GST_OBJ_LIBS) $(LIBM)
588
libgstcontroller_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
582
libgstcontroller_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
589
CLEANFILES = *.gcno *.gcda *.gcov $(BUILT_SOURCES) $(am__append_1)
583
CLEANFILES = *.gcno *.gcda *.gcov $(BUILT_SOURCES) $(am__append_1)
590
enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
584
585
#glib_enum_headers=$(colorbalance_headers)
586
#glib_enum_define=GST_COLOR_BALANCE
587
#glib_gen_prefix=gst_color_balance
588
#glib_gen_basename=colorbalance
589
#glib_gen_decl_banner=GST_EXPORT
590
#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
591
enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
591
@HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstController-@GST_API_VERSION@.gir
592
@HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstController-@GST_API_VERSION@.gir
592
@HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
593
@HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
593
@HAVE_INTROSPECTION_TRUE@	$(libgstcontroller_@GST_API_VERSION@_include_HEADERS)) \
594
@HAVE_INTROSPECTION_TRUE@	$(libgstcontroller_@GST_API_VERSION@_include_HEADERS)) \

Return to bug 705974