Update for GST_MAJORMINOR -> GST_API_VERSION change

diff --git a/check.mak b/check.mak
index bc44620..0aec843 100644 (file)
--- a/check.mak
+++ b/check.mak
@@ -146,7 +146,7 @@ valgrind.gen-suppressions: $(TESTS)
        fi
 
 # inspect every plugin feature
-GST_INSPECT = $(GST_TOOLS_DIR)/gst-inspect-$(GST_MAJORMINOR)
+GST_INSPECT = $(GST_TOOLS_DIR)/gst-inspect-$(GST_API_VERSION)
 inspect:
        @echo "Inspecting features ..."
        @for e in `$(TESTS_ENVIRONMENT) $(GST_INSPECT) | head -n -2     \

diff --git a/gtk-doc-plugins.mak b/gtk-doc-plugins.mak
index 084f9ae..f7c05ed 100644 (file)
--- a/gtk-doc-plugins.mak
+++ b/gtk-doc-plugins.mak
@@ -24,7 +24,7 @@ update: scanobj-update
 GPATH = $(srcdir)
 
 # thomas: make docs parallel installable
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@
+TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)-@GST_API_VERSION@
 
 MAINTAINER_DOC_STAMPS =                        \
        scanobj-build.stamp
@@ -224,7 +224,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
        fi; \
        cd html && gtkdoc-mkhtml $$mkhtml_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE)
        @mv html/index.sgml html/index.sgml.bak
-       @$(SED) "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_MAJORMINOR@\//g" html/index.sgml.bak >html/index.sgml
+       @$(SED) "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_API_VERSION@\//g" html/index.sgml.bak >html/index.sgml
        @rm -f html/index.sgml.bak
        @rm -f html/$(DOC_MAIN_SGML_FILE)
        @rm -rf html/xml
@@ -292,7 +292,7 @@ install-data-local:
          echo '-- Installing $(builddir)/html/$(DOC_MODULE).devhelp2' ; \
          if test -e $(builddir)/html/$(DOC_MODULE).devhelp2; then \
                    $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE).devhelp2 \
-                   $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \
+                   $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_API_VERSION@.devhelp2; \
          fi; \
          (which gtkdoc-rebase >/dev/null && \
            gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR)) || true ; \

diff --git a/gtk-doc.mak b/gtk-doc.mak
index dd2b5a5..31b56f9 100644 (file)
--- a/gtk-doc.mak
+++ b/gtk-doc.mak
@@ -12,7 +12,7 @@
 GPATH = $(srcdir)
 
 # thomas: make docs parallel installable
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@
+TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)-@GST_API_VERSION@
 
 EXTRA_DIST =                           \
        $(content_files)                \
@@ -132,7 +132,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
        fi; \
        cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
        @mv html/index.sgml html/index.sgml.bak
-       @$(SED) "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_MAJORMINOR@\//g" html/index.sgml.bak >html/index.sgml
+       @$(SED) "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_API_VERSION@\//g" html/index.sgml.bak >html/index.sgml
        @rm -f html/index.sgml.bak
        @rm -rf html/xml
        @rm -f version.entities
@@ -192,7 +192,7 @@ install-data-local:
          echo '-- Installing $(builddir)/html/$(DOC_MODULE).devhelp2' ; \
          if test -e $(builddir)/html/$(DOC_MODULE).devhelp2; then \
                    $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE).devhelp2 \
-                   $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \
+                   $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_API_VERSION@.devhelp2; \
          fi; \
          (which gtkdoc-rebase >/dev/null && \
            gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR)) || true ; \

diff --git a/m4/gst-check.m4 b/m4/gst-check.m4
index eb2f8b8..cba7e96 100644 (file)
--- a/m4/gst-check.m4
+++ b/m4/gst-check.m4
@@ -149,7 +149,7 @@ AC_DEFUN([AG_GST_CHECK_UNINSTALLED_SETUP],
 ])
 
 dnl ===========================================================================
-dnl AG_GST_CHECK_GST_PLUGINS_BASE([GST-MAJORMINOR], [MIN-VERSION], [REQUIRED])
+dnl AG_GST_CHECK_GST_PLUGINS_BASE([GST-API_VERSION], [MIN-VERSION], [REQUIRED])
 dnl
 dnl Sets GST_PLUGINS_BASE_CFLAGS and GST_PLUGINS_BASE_LIBS.
 dnl
@@ -182,7 +182,7 @@ AC_DEFUN([AG_GST_CHECK_GST_PLUGINS_BASE],
 ])
 
 dnl ===========================================================================
-dnl AG_GST_CHECK_GST_PLUGINS_GOOD([GST-MAJORMINOR], [MIN-VERSION])
+dnl AG_GST_CHECK_GST_PLUGINS_GOOD([GST-API_VERSION], [MIN-VERSION])
 dnl
 dnl Will set GST_PLUGINS_GOOD_DIR for use in Makefile.am. Note that this will
 dnl only be set in an uninstalled setup, since -good ships no .pc file and in
@@ -210,7 +210,7 @@ AC_DEFUN([AG_GST_CHECK_GST_PLUGINS_GOOD],
 ])
 
 dnl ===========================================================================
-dnl AG_GST_CHECK_GST_PLUGINS_UGLY([GST-MAJORMINOR], [MIN-VERSION])
+dnl AG_GST_CHECK_GST_PLUGINS_UGLY([GST-API_VERSION], [MIN-VERSION])
 dnl
 dnl Will set GST_PLUGINS_UGLY_DIR for use in Makefile.am. Note that this will
 dnl only be set in an uninstalled setup, since -bad ships no .pc file and in
@@ -238,7 +238,7 @@ AC_DEFUN([AG_GST_CHECK_GST_PLUGINS_UGLY],
 ])
 
 dnl ===========================================================================
-dnl AG_GST_CHECK_GST_PLUGINS_BAD([GST-MAJORMINOR], [MIN-VERSION])
+dnl AG_GST_CHECK_GST_PLUGINS_BAD([GST-API_VERSION], [MIN-VERSION])
 dnl
 dnl Will set GST_PLUGINS_BAD_DIR for use in Makefile.am. Note that this will
 dnl only be set in an uninstalled setup, since -ugly ships no .pc file and in
@@ -266,7 +266,7 @@ AC_DEFUN([AG_GST_CHECK_GST_PLUGINS_BAD],
 ])
 
 dnl ===========================================================================
-dnl AG_GST_CHECK_GST_PLUGINS_FFMPEG([GST-MAJORMINOR], [MIN-VERSION])
+dnl AG_GST_CHECK_GST_PLUGINS_FFMPEG([GST-API_VERSION], [MIN-VERSION])
 dnl
 dnl Will set GST_PLUGINS_FFMPEG_DIR for use in Makefile.am. Note that this will
 dnl only be set in an uninstalled setup, since -ffmpeg ships no .pc file and in

diff --git a/m4/gst-doc.m4 b/m4/gst-doc.m4
index 6521097..871c346 100644 (file)
--- a/m4/gst-doc.m4
+++ b/m4/gst-doc.m4
@@ -5,7 +5,7 @@ AC_DEFUN([AG_GST_DOCBOOK_CHECK],
   then
     AC_MSG_ERROR([Internal error - PACKAGE_TARNAME not set])
   fi
-  docdir="\$(datadir)/doc/$PACKAGE_TARNAME-$GST_MAJORMINOR"
+  docdir="\$(datadir)/doc/$PACKAGE_TARNAME-$GST_API_VERSION"
 
   dnl enable/disable docbook documentation building
   AC_ARG_ENABLE(docbook,

diff --git a/m4/gst-plugindir.m4 b/m4/gst-plugindir.m4
index 09989d0..c9e1301 100644 (file)
--- a/m4/gst-plugindir.m4
+++ b/m4/gst-plugindir.m4
@@ -6,12 +6,12 @@ dnl AC_SUBST plugindir, to be used in Makefile.am's
 AC_DEFUN([AG_GST_SET_PLUGINDIR],
 [
   dnl define location of plugin directory
-  AS_AC_EXPAND(PLUGINDIR, ${libdir}/gstreamer-$GST_MAJORMINOR)
+  AS_AC_EXPAND(PLUGINDIR, ${libdir}/gstreamer-$GST_API_VERSION)
   AC_DEFINE_UNQUOTED(PLUGINDIR, "$PLUGINDIR",
     [directory where plugins are located])
   AC_MSG_NOTICE([Using $PLUGINDIR as the plugin install location])
 
   dnl plugin directory configure-time variable for use in Makefile.am
-  plugindir="\$(libdir)/gstreamer-$GST_MAJORMINOR"
+  plugindir="\$(libdir)/gstreamer-$GST_API_VERSION"
   AC_SUBST(plugindir)
 ])

diff --git a/win32.mak b/win32.mak
index 94afaec..c343a04 100644 (file)
--- a/win32.mak
+++ b/win32.mak
@@ -39,7 +39,7 @@ check-exports:
        @fail=0 ; \
        for l in $(win32defs); do \
          libbase=`basename "$$l" ".def"`; \
-         libso=`find "$(top_builddir)" -name "$$libbase-@GST_MAJORMINOR@.so" | grep -v /_build/ | head -n1`; \
+         libso=`find "$(top_builddir)" -name "$$libbase-@GST_API_VERSION@.so" | grep -v /_build/ | head -n1`; \
          libdef="$(top_srcdir)/win32/common/$$libbase.def"; \
          if test "x$$libso" != "x"; then \
            echo Checking symbols in $$libso; \