diff options
author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-09-05 13:46:58 +0200 |
---|---|---|
committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-09-05 13:46:58 +0200 |
commit | 40aba9e0dc79bb75c883274a68cac5c4acdacb47 (patch) | |
tree | 1473394d550187e703738eeabc0435d01f63bf35 | |
parent | ab17f5d3fadc1fb6c0de773c9bf6d9d0d090d0b8 (diff) |
introduction: Fix out-of-tree build
-rw-r--r-- | gst-libs/gst/app/Makefile.am | 4 | ||||
-rw-r--r-- | gst-libs/gst/audio/Makefile.am | 6 | ||||
-rw-r--r-- | gst-libs/gst/interfaces/Makefile.am | 5 | ||||
-rw-r--r-- | gst-libs/gst/pbutils/Makefile.am | 5 | ||||
-rw-r--r-- | gst-libs/gst/rtsp/Makefile.am | 6 | ||||
-rw-r--r-- | gst-libs/gst/video/Makefile.am | 5 |
6 files changed, 20 insertions, 11 deletions
diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am index 79e7be18f..c77be40e8 100644 --- a/gst-libs/gst/app/Makefile.am +++ b/gst-libs/gst/app/Makefile.am @@ -35,7 +35,7 @@ BUILT_GIRSOURCES = GstApp-@GST_MAJORMINOR@.gir gir_headers=$(patsubst %,$(srcdir)/%, $(libgstapp_@GST_MAJORMINOR@include_HEADERS)) gir_sources=$(patsubst %,$(srcdir)/%, $(libgstapp_@GST_MAJORMINOR@_la_SOURCES)) -gir_sources+=$(patsubst %,$(srcdir)/%, $(nodist_libgstapp_@GST_MAJORMINOR@_la_SOURCES)) +gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_libgstapp_@GST_MAJORMINOR@_la_SOURCES)) gir_cincludes=$(patsubst %,--c-include='gst/app/%',$(libgstapp_@GST_MAJORMINOR@include_HEADERS)) GstApp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_MAJORMINOR@.la @@ -43,6 +43,8 @@ GstApp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_MAJORMINOR@ --nsversion=@GST_MAJORMINOR@ \ --strip-prefix=Gst \ $(gir_cincludes) \ + -I$(top_srcdir)/gst-libs \ + -I$(top_builddir)/gst-libs \ --add-include-path=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst \ --add-include-path=`$(PKG_CONFIG) --variable=libdir gstreamer-base-0.10` \ --library=gstapp-0.10 \ diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am index d6efe280a..6a79cdef4 100644 --- a/gst-libs/gst/audio/Makefile.am +++ b/gst-libs/gst/audio/Makefile.am @@ -60,9 +60,9 @@ if HAVE_INTROSPECTION BUILT_GIRSOURCES = GstAudio-@GST_MAJORMINOR@.gir gir_headers=$(patsubst %,$(srcdir)/%, $(libgstaudio_@GST_MAJORMINOR@include_HEADERS)) -gir_headers+=$(patsubst %,$(srcdir)/%, $(nodist_libgstaudio_@GST_MAJORMINOR@include_HEADERS)) +gir_headers+=$(patsubst %,$(builddir)/%, $(nodist_libgstaudio_@GST_MAJORMINOR@include_HEADERS)) gir_sources=$(patsubst %,$(srcdir)/%, $(libgstaudio_@GST_MAJORMINOR@_la_SOURCES)) -gir_sources+=$(patsubst %,$(srcdir)/%, $(nodist_libgstaudio_@GST_MAJORMINOR@_la_SOURCES)) +gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_libgstaudio_@GST_MAJORMINOR@_la_SOURCES)) gir_cincludes=$(patsubst %,--c-include='gst/audio/%',$(libgstaudio_@GST_MAJORMINOR@include_HEADERS)) gir_cincludes+=$(patsubst %,--c-include='gst/audio/%',$(nodist_libgstaudio_@GST_MAJORMINOR@include_HEADERS)) @@ -70,6 +70,8 @@ GstAudio-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_MAJORMI $(INTROSPECTION_SCANNER) -v --namespace GstAudio \ --nsversion=@GST_MAJORMINOR@ \ --strip-prefix=Gst \ + -I$(top_srcdir)/gst-libs \ + -I$(top_builddir)/gst-libs \ $(gir_cincludes) \ --add-include-path=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst \ --add-include-path=`$(PKG_CONFIG) --variable=libdir gstreamer-base-0.10` \ diff --git a/gst-libs/gst/interfaces/Makefile.am b/gst-libs/gst/interfaces/Makefile.am index 29054cffa..762d28ba4 100644 --- a/gst-libs/gst/interfaces/Makefile.am +++ b/gst-libs/gst/interfaces/Makefile.am @@ -71,9 +71,9 @@ if HAVE_INTROSPECTION BUILT_GIRSOURCES = GstInterfaces-@GST_MAJORMINOR@.gir gir_headers=$(patsubst %,$(srcdir)/%, $(libgstinterfacesinclude_HEADERS)) -gir_headers+=$(patsubst %,$(srcdir)/%, $(nodist_libgstinterfacesinclude_HEADERS)) +gir_headers+=$(patsubst %,$(builddir)/%, $(nodist_libgstinterfacesinclude_HEADERS)) gir_sources=$(patsubst %,$(srcdir)/%, $(libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES)) -gir_sources+=$(patsubst %,$(srcdir)/%, $(nodist_libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES)) +gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES)) gir_cincludes=$(patsubst %,--c-include='gst/interfaces/%',$(libgstinterfacesinclude_HEADERS)) gir_cincludes+=$(patsubst %,--c-include='gst/interfaces/%',$(nodist_libgstinterfacesinclude_HEADERS)) @@ -83,6 +83,7 @@ GstInterfaces-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstinterfaces-@G --strip-prefix=Gst \ $(gir_cincludes) \ -I$(top_srcdir)/gst-libs \ + -I$(top_builddir)/gst-libs \ --add-include-path=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst \ --library=gstinterfaces-0.10 \ --include=Gst-0.10 \ diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am index 771721b9a..432ebcb3e 100644 --- a/gst-libs/gst/pbutils/Makefile.am +++ b/gst-libs/gst/pbutils/Makefile.am @@ -49,9 +49,9 @@ if HAVE_INTROSPECTION BUILT_GIRSOURCES = GstPbutils-@GST_MAJORMINOR@.gir gir_headers=$(patsubst %,$(srcdir)/%, $(libgstpbutils_@GST_MAJORMINOR@include_HEADERS)) -gir_headers+=$(patsubst %,$(srcdir)/%, $(nodist_libgstpbutils_@GST_MAJORMINOR@include_HEADERS)) +gir_headers+=$(patsubst %,$(builddir)/%, $(nodist_libgstpbutils_@GST_MAJORMINOR@include_HEADERS)) gir_sources=$(patsubst %,$(srcdir)/%, $(libgstpbutils_@GST_MAJORMINOR@_la_SOURCES)) -gir_sources+=$(patsubst %,$(srcdir)/%, $(nodist_libgstpbutils_@GST_MAJORMINOR@_la_SOURCES)) +gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_libgstpbutils_@GST_MAJORMINOR@_la_SOURCES)) gir_cincludes=$(patsubst %,--c-include='gst/pbutils/%',$(libgstpbutils_@GST_MAJORMINOR@include_HEADERS)) gir_cincludes+=$(patsubst %,--c-include='gst/pbutils/%',$(nodist_libgstpbutils_@GST_MAJORMINOR@include_HEADERS)) @@ -60,6 +60,7 @@ GstPbutils-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_MAJ --nsversion=@GST_MAJORMINOR@ \ --strip-prefix=Gst \ $(gir_cincludes) \ + -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ --add-include-path=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst \ --library=gstpbutils-0.10 \ diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am index e52ea8f4b..4a6e670ab 100644 --- a/gst-libs/gst/rtsp/Makefile.am +++ b/gst-libs/gst/rtsp/Makefile.am @@ -52,9 +52,9 @@ if HAVE_INTROSPECTION BUILT_GIRSOURCES = GstRtsp-@GST_MAJORMINOR@.gir gir_headers=$(patsubst %,$(srcdir)/%, $(libgstrtspinclude_HEADERS)) -gir_headers+=$(patsubst %,$(srcdir)/%, $(nodist_libgstrtspinclude_HEADERS)) +gir_headers+=$(patsubst %,$(builddir)/%, $(nodist_libgstrtspinclude_HEADERS)) gir_sources=$(patsubst %,$(srcdir)/%, $(libgstrtsp_@GST_MAJORMINOR@_la_SOURCES)) -gir_sources+=$(patsubst %,$(srcdir)/%, $(nodist_libgstrtsp_@GST_MAJORMINOR@_la_SOURCES)) +gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_libgstrtsp_@GST_MAJORMINOR@_la_SOURCES)) gir_cincludes=$(patsubst %,--c-include='gst/audio/%',$(libgstrtspinclude_HEADERS)) gir_cincludes+=$(patsubst %,--c-include='gst/audio/%',$(nodist_libgstrtspinclude_HEADERS)) @@ -63,6 +63,8 @@ GstRtsp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_MAJORMINO --nsversion=@GST_MAJORMINOR@ \ --strip-prefix=Gst \ $(gir_cincludes) \ + -I$(top_builddir)/gst-libs \ + -I$(top_srcdir)/gst-libs \ --add-include-path=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst \ --add-include-path=$(builddir)/../sdp \ --library=gstrtsp-0.10 \ diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am index 171f14325..93ff06f1d 100644 --- a/gst-libs/gst/video/Makefile.am +++ b/gst-libs/gst/video/Makefile.am @@ -31,9 +31,9 @@ if HAVE_INTROSPECTION BUILT_GIRSOURCES = GstVideo-@GST_MAJORMINOR@.gir gir_headers=$(patsubst %,$(srcdir)/%, $(libgstvideo_@GST_MAJORMINOR@include_HEADERS)) -gir_headers+=$(patsubst %,$(srcdir)/%, $(nodist_libgstvideo_@GST_MAJORMINOR@include_HEADERS)) +gir_headers+=$(patsubst %,$(builddir)/%, $(nodist_libgstvideo_@GST_MAJORMINOR@include_HEADERS)) gir_sources=$(patsubst %,$(srcdir)/%, $(libgstvideo_@GST_MAJORMINOR@_la_SOURCES)) -gir_sources+=$(patsubst %,$(srcdir)/%, $(nodist_libgstvideo_@GST_MAJORMINOR@_la_SOURCES)) +gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_libgstvideo_@GST_MAJORMINOR@_la_SOURCES)) gir_cincludes=$(patsubst %,--c-include='gst/audio/%',$(libgstvideo_@GST_MAJORMINOR@include_HEADERS)) gir_cincludes+=$(patsubst %,--c-include='gst/audio/%',$(nodist_libgstvideo_@GST_MAJORMINOR@include_HEADERS)) @@ -43,6 +43,7 @@ GstVideo-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_MAJORMI --strip-prefix=Gst \ $(gir_cincludes) \ -I$(top_srcdir)/gst-libs \ + -I$(top_builddir)/gst-libs \ --add-include-path=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst \ --add-include-path=`$(PKG_CONFIG) --variable=libdir gstreamer-base-0.10` \ --library=gstvideo-0.10 \ |