diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-02-22 14:11:59 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-02-22 14:11:59 +0100 |
| commit | 238b9a57cc022aec7ebd52d908ac5e24d76c3183 (patch) | |
| tree | 9563e2353a2c427a40fae0e7de0ed73c2348c402 /libs/gst/net/Makefile.am | |
| parent | 90fff577f0661c1ec7a0f2c324d5b69d1d1d040e (diff) | |
| parent | cc5edeefcd7772ac645fa0b8b91cfe7be201d78a (diff) | |
Merge branch 'master' into 0.11
Conflicts:
configure.ac
gst/gstelement.c
gst/gstelement.h
gst/gstpad.c
gst/gstutils.c
libs/gst/base/Makefile.am
libs/gst/check/Makefile.am
libs/gst/controller/Makefile.am
libs/gst/dataprotocol/Makefile.am
libs/gst/net/Makefile.am
win32/common/libgstreamer.def
Diffstat (limited to 'libs/gst/net/Makefile.am')
| -rw-r--r-- | libs/gst/net/Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libs/gst/net/Makefile.am b/libs/gst/net/Makefile.am index 87dfcef35..c20344965 100644 --- a/libs/gst/net/Makefile.am +++ b/libs/gst/net/Makefile.am @@ -28,7 +28,7 @@ BUILT_GIRSOURCES = GstNet-@GST_MAJORMINOR@.gir gir_headers=$(patsubst %,$(srcdir)/%, $(libgstnet_@GST_MAJORMINOR@_include_HEADERS)) gir_sources=$(patsubst %,$(srcdir)/%, $(libgstnet_@GST_MAJORMINOR@_la_SOURCES)) -gir_cincludes=$(patsubst %,--c-include='gst/net/%',$(libgstbase_@GST_MAJORMINOR@_include_HEADERS)) +gir_cincludes=--c-include="gst/net/gstnet.h" GstNet-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstnet-@GST_MAJORMINOR@.la $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ @@ -37,8 +37,12 @@ GstNet-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstnet-@GST_MAJORMINOR@ --nsversion=@GST_MAJORMINOR@ \ -I$(top_srcdir) \ -I$(top_srcdir)/libs \ + -I$(top_builddir) \ + -I$(top_builddir)/libs \ $(gir_cincludes) \ --add-include-path=$(top_builddir)/gst \ + --library-path=$(top_builddir)/gst \ + --library=$(top_builddir)/gst/libgstreamer-@GST_MAJORMINOR@.la \ --library=libgstnet-@GST_MAJORMINOR@.la \ --include=Gst-@GST_MAJORMINOR@ \ --libtool="$(top_builddir)/libtool" \ |