mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-31 11:32:38 +00:00
gst-libs: more gobject-introspection fixes
Use right .pc file variable for compiler includes this time: g-ir-compiler wants the girdirs not the typelibdirs as includes.
This commit is contained in:
parent
fcd32fa399
commit
b37c993e4e
13 changed files with 20 additions and 20 deletions
|
@ -72,8 +72,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
|
|||
$(AM_V_GEN)$(INTROSPECTION_COMPILER) \
|
||||
--includedir=$(srcdir) \
|
||||
--includedir=$(builddir) \
|
||||
--includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-base-0.10` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
|
||||
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
|
||||
|
||||
CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
|
||||
|
|
|
@ -104,8 +104,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
|
|||
--includedir=$(srcdir) \
|
||||
--includedir=$(builddir) \
|
||||
--includedir=$(builddir)/../interfaces \
|
||||
--includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-base-0.10` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
|
||||
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
|
||||
|
||||
CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
|
||||
|
|
|
@ -57,8 +57,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
|
|||
--includedir=$(srcdir) \
|
||||
--includedir=$(builddir) \
|
||||
--includedir=$(builddir)/../tag \
|
||||
--includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-base-0.10` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
|
||||
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
|
||||
|
||||
CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
|
||||
|
|
|
@ -79,7 +79,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
|
|||
$(AM_V_GEN)$(INTROSPECTION_COMPILER) \
|
||||
--includedir=$(srcdir) \
|
||||
--includedir=$(builddir) \
|
||||
--includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
|
||||
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
|
||||
|
||||
CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
|
||||
|
|
|
@ -110,7 +110,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
|
|||
$(AM_V_GEN)$(INTROSPECTION_COMPILER) \
|
||||
--includedir=$(srcdir) \
|
||||
--includedir=$(builddir) \
|
||||
--includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
|
||||
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
|
||||
|
||||
CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
|
||||
|
|
|
@ -44,7 +44,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
|
|||
$(AM_V_GEN)$(INTROSPECTION_COMPILER) \
|
||||
--includedir=$(srcdir) \
|
||||
--includedir=$(builddir) \
|
||||
--includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
|
||||
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
|
||||
|
||||
CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
|
||||
|
|
|
@ -86,7 +86,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
|
|||
$(AM_V_GEN)$(INTROSPECTION_COMPILER) \
|
||||
--includedir=$(srcdir) \
|
||||
--includedir=$(builddir) \
|
||||
--includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
|
||||
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
|
||||
|
||||
CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
|
||||
|
|
|
@ -66,8 +66,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
|
|||
--includedir=$(builddir)/../tag \
|
||||
--includedir=$(builddir)/../audio \
|
||||
--includedir=$(builddir)/../interfaces \
|
||||
--includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-base-0.10` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
|
||||
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
|
||||
|
||||
CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
|
||||
|
|
|
@ -59,8 +59,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
|
|||
$(AM_V_GEN)$(INTROSPECTION_COMPILER) \
|
||||
--includedir=$(srcdir) \
|
||||
--includedir=$(builddir) \
|
||||
--includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-base-0.10` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
|
||||
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
|
||||
|
||||
CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
|
||||
|
|
|
@ -93,7 +93,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
|
|||
--includedir=$(srcdir) \
|
||||
--includedir=$(builddir) \
|
||||
--includedir=$(builddir)/../sdp \
|
||||
--includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
|
||||
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
|
||||
|
||||
CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
|
||||
|
|
|
@ -47,7 +47,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
|
|||
$(AM_V_GEN)$(INTROSPECTION_COMPILER) \
|
||||
--includedir=$(srcdir) \
|
||||
--includedir=$(builddir) \
|
||||
--includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
|
||||
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
|
||||
|
||||
CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
|
||||
|
|
|
@ -56,8 +56,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
|
|||
$(AM_V_GEN)$(INTROSPECTION_COMPILER) \
|
||||
--includedir=$(srcdir) \
|
||||
--includedir=$(builddir) \
|
||||
--includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-base-0.10` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
|
||||
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
|
||||
|
||||
CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
|
||||
|
|
|
@ -70,8 +70,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
|
|||
$(AM_V_GEN)$(INTROSPECTION_COMPILER) \
|
||||
--includedir=$(srcdir) \
|
||||
--includedir=$(builddir) \
|
||||
--includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-base-0.10` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
|
||||
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
|
||||
|
||||
CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
|
||||
|
|
Loading…
Reference in a new issue