diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-08-31 18:40:44 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-09-01 17:08:58 +0100 |
| commit | f9204d5d70d126557cce0175e8ce9ce382d7fbc5 (patch) | |
| tree | 1999ed48b98c617c874fbdb64f13f1ee69e9f6e2 | |
| parent | 70617be38e9767c4209c7e877f31402ca492b776 (diff) | |
build: use new AG_GST_PKG_CONFIG_PATH m4 macro from common
Sets up a GST_PKG_CONFIG_PATH variable for use in Makefile.am
(avoids trailing ':' in PKG_CONFIG_PATH used). A useful side
effect of this is also that the PKG_CONFIG_PATH environment
is now logged in the configure output.
| m--------- | common | 0 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libs/gst/base/Makefile.am | 2 | ||||
| -rw-r--r-- | libs/gst/check/Makefile.am | 2 | ||||
| -rw-r--r-- | libs/gst/controller/Makefile.am | 2 | ||||
| -rw-r--r-- | libs/gst/dataprotocol/Makefile.am | 2 | ||||
| -rw-r--r-- | libs/gst/net/Makefile.am | 2 |
7 files changed, 7 insertions, 5 deletions
diff --git a/common b/common -Subproject ec60217bf93d537b324c3682c1bd7d49ad9ad9b +Subproject ca1c867ac96a3bdb83f2bc4cb2081e2a0deb1a1 diff --git a/configure.ac b/configure.ac index c4a8a8533..a73479832 100644 --- a/configure.ac +++ b/configure.ac @@ -130,6 +130,8 @@ AG_GST_ARG_WITH_PKG_CONFIG_PATH AG_GST_ARG_WITH_PACKAGE_NAME AG_GST_ARG_WITH_PACKAGE_ORIGIN +AG_GST_PKG_CONFIG_PATH + AG_GST_SET_PACKAGE_RELEASE_DATETIME_WITH_NANO([$PACKAGE_VERSION_NANO], ["${srcdir}/gstreamer.doap"], [$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_MICRO]) diff --git a/libs/gst/base/Makefile.am b/libs/gst/base/Makefile.am index eade3fa05..8beb7cbd6 100644 --- a/libs/gst/base/Makefile.am +++ b/libs/gst/base/Makefile.am @@ -53,7 +53,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstbase_@GST_MAJORMINOR@_la_SOURCES)) gir_cincludes=$(patsubst %,--c-include='gst/base/%',$(libgstbase_@GST_MAJORMINOR@include_HEADERS)) GstBase-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstbase-@GST_MAJORMINOR@.la - $(AM_V_GEN)PKG_CONFIG_PATH="$(top_builddir)/pkgconfig:$(PKG_CONFIG_PATH)" \ + $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ $(INTROSPECTION_SCANNER) -v --namespace GstBase \ --nsversion=@GST_MAJORMINOR@ \ --strip-prefix=Gst \ diff --git a/libs/gst/check/Makefile.am b/libs/gst/check/Makefile.am index 4d986a187..ccc6ea6cb 100644 --- a/libs/gst/check/Makefile.am +++ b/libs/gst/check/Makefile.am @@ -115,7 +115,7 @@ gir_cincludes=$(patsubst %,--c-include='gst/check/%',$(libgstcheck_@GST_MAJORMIN $(patsubst %,--c-include='gst/check/%',$(nodist_libgstcheck_@GST_MAJORMINOR@include_HEADERS)) GstCheck-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcheck-@GST_MAJORMINOR@.la - $(AM_V_GEN)PKG_CONFIG_PATH="$(top_builddir)/pkgconfig:$(PKG_CONFIG_PATH)" \ + $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ $(INTROSPECTION_SCANNER) -v --namespace GstCheck \ --nsversion=@GST_MAJORMINOR@ \ --strip-prefix=Gst \ diff --git a/libs/gst/controller/Makefile.am b/libs/gst/controller/Makefile.am index 03417cba8..61da226ec 100644 --- a/libs/gst/controller/Makefile.am +++ b/libs/gst/controller/Makefile.am @@ -40,7 +40,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstcontroller_@GST_MAJORMINOR@_la_SOU gir_cincludes=$(patsubst %,--c-include='gst/controller/%',$(libgstcontroller_@GST_MAJORMINOR@_include_HEADERS)) GstController-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcontroller-@GST_MAJORMINOR@.la - $(AM_V_GEN)PKG_CONFIG_PATH="$(top_builddir)/pkgconfig:$(PKG_CONFIG_PATH)" \ + $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ $(INTROSPECTION_SCANNER) -v --namespace GstController \ --nsversion=@GST_MAJORMINOR@ \ --strip-prefix=Gst \ diff --git a/libs/gst/dataprotocol/Makefile.am b/libs/gst/dataprotocol/Makefile.am index b02bc0993..db06fb838 100644 --- a/libs/gst/dataprotocol/Makefile.am +++ b/libs/gst/dataprotocol/Makefile.am @@ -30,7 +30,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstdataprotocol_@GST_MAJORMINOR@_la_S gir_cincludes=$(patsubst %,--c-include='gst/dataprotocol/%',$(libgstdataprotocol_@GST_MAJORMINOR@_include_HEADERS)) GstDataprotocol-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstdataprotocol-@GST_MAJORMINOR@.la - $(AM_V_GEN)PKG_CONFIG_PATH="$(top_builddir)/pkgconfig:$(PKG_CONFIG_PATH)" \ + $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ $(INTROSPECTION_SCANNER) -v --namespace GstDataprotocol \ --strip-prefix=Gst \ --nsversion=@GST_MAJORMINOR@ \ diff --git a/libs/gst/net/Makefile.am b/libs/gst/net/Makefile.am index 3d44cf28f..17ebaf21c 100644 --- a/libs/gst/net/Makefile.am +++ b/libs/gst/net/Makefile.am @@ -31,7 +31,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstnet_@GST_MAJORMINOR@_la_SOURCES)) gir_cincludes=$(patsubst %,--c-include='gst/net/%',$(libgstbase_@GST_MAJORMINOR@_include_HEADERS)) GstNet-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstnet-@GST_MAJORMINOR@.la - $(AM_V_GEN)PKG_CONFIG_PATH="$(top_builddir)/pkgconfig:$(PKG_CONFIG_PATH)" \ + $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ $(INTROSPECTION_SCANNER) -v --namespace GstNet \ --strip-prefix=Gst \ --nsversion=@GST_MAJORMINOR@ \ |