Convert GST_MAJORMINOR to GST_API_VERSION

9 files changed, 27 insertions, 27 deletions

diff --git a/configure.ac b/configure.ac
index 8cc19e9..dda204d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,8 +7,8 @@ AS_NANO([GSS_UNRELEASED=no],[GSS_UNRELEASED=yes])
 AC_CANONICAL_HOST([])
 AM_INIT_AUTOMAKE(1.6)
 
-GST_MAJORMINOR=0.10
-AC_SUBST(GST_MAJORMINOR)
+GST_API_VERSION=1.0
+AC_SUBST(GST_API_VERSION)
 
 AC_CONFIG_HEADERS(config.h)
 
@@ -84,7 +84,7 @@ if test "$HAVE_GLIB" != yes ; then
   exit 1
 fi
 
-PKG_CHECK_MODULES(GST, gstreamer-$GST_MAJORMINOR gstreamer-base-$GST_MAJORMINOR gstreamer-video-$GST_MAJORMINOR gstreamer-audio-$GST_MAJORMINOR,
+PKG_CHECK_MODULES(GST, gstreamer-$GST_API_VERSION gstreamer-base-$GST_API_VERSION gstreamer-video-$GST_API_VERSION gstreamer-audio-$GST_API_VERSION,
     HAVE_GST=yes, HAVE_GST=no)
 if test "$HAVE_GST" != yes ; then
   echo GStreamer and gst-plugns-base are needed to build
@@ -93,7 +93,7 @@ fi
 AC_SUBST(GST_CFLAGS)
 AC_SUBST(GST_LIBS)
 
-PKG_CHECK_MODULES(GST_RTSP_SERVER, gst-rtsp-server-$GST_MAJORMINOR >= 0.10.1,
+PKG_CHECK_MODULES(GST_RTSP_SERVER, gst-rtsp-server-$GST_API_VERSION >= 0.10.1,
     HAVE_GST_RTSP_SERVER=yes, HAVE_GST_RTSP_SERVER=no)
 if test "$HAVE_GST_RTSP_SERVER" = yes ; then
   AC_DEFINE(ENABLE_RTSP, 1, [Enable RTSP])
@@ -134,7 +134,7 @@ AM_CONDITIONAL(HAVE_FALSE, false)
 GSS_CFLAGS="$GSS_CFLAGS -I\$(top_srcdir)"
 AC_SUBST(GSS_CFLAGS)
 
-GSS_LIBS="\$(top_builddir)/gst-streaming-server/libgss-$GST_MAJORMINOR.la"
+GSS_LIBS="\$(top_builddir)/gst-streaming-server/libgss-$GST_API_VERSION.la"
 AC_SUBST(GSS_LIBS)
 
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2c2cfd3..cdd865d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -79,7 +79,7 @@ expand_content_files=
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS=$(GSS_CFLAGS) $(GST_CFLAGS) $(SOUP_CFLAGS) $(GST_RTSP_SERVER_CFLAGS)
-GTKDOC_LIBS=$(top_builddir)/gst-streaming-server/libgss-@GST_MAJORMINOR@.la $(GST_LIBS) $(SOUP_LIBS) $(GST_RTSP_SERVER_LIBS) $(JSON_GLIB_LIBS)
+GTKDOC_LIBS=$(top_builddir)/gst-streaming-server/libgss-@GST_API_VERSION@.la $(GST_LIBS) $(SOUP_LIBS) $(GST_RTSP_SERVER_LIBS) $(JSON_GLIB_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/doc/version.entities.in b/doc/version.entities.in
index 3cc3aa7..10c23da 100644
--- a/doc/version.entities.in
+++ b/doc/version.entities.in
@@ -1,3 +1,3 @@
-<!ENTITY GST_MAJORMINOR "@GST_MAJORMINOR@">
+<!ENTITY GST_API_VERSION "@GST_API_VERSION@">
 <!ENTITY GSS_VERSION "@PACKAGE_VERSION@">
 
diff --git a/gst-streaming-server/Makefile.am b/gst-streaming-server/Makefile.am
index 2956fd6..3c06abb 100644
--- a/gst-streaming-server/Makefile.am
+++ b/gst-streaming-server/Makefile.am
@@ -1,5 +1,5 @@
 
-lib_LTLIBRARIES = libgss-@GST_MAJORMINOR@.la
+lib_LTLIBRARIES = libgss-@GST_API_VERSION@.la
 if ENABLE_STATIC_LIB
 noinst_LTLIBRARIES = libgss.la
 endif
@@ -7,23 +7,23 @@ endif
 BUILT_SOURCES = gss-content.c gss-content.h
 CLEANFILES = gss-content.c gss-content.h
 
-gss_includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gss
+gss_includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gss
 
-libgss_@GST_MAJORMINOR@_la_CFLAGS = \
+libgss_@GST_API_VERSION@_la_CFLAGS = \
 	$(GSS_CFLAGS) \
 	$(GST_CFLAGS) \
 	$(SOUP_CFLAGS) \
 	$(GST_RTSP_SERVER_CFLAGS) \
 	$(JSON_GLIB_CFLAGS)
-libgss_@GST_MAJORMINOR@_la_LIBADD = \
+libgss_@GST_API_VERSION@_la_LIBADD = \
 	$(GST_RTSP_SERVER_LIBS) \
 	$(GST_LIBS) \
 	$(SOUP_LIBS) \
 	$(JSON_GLIB_LIBS)
-libgss_@GST_MAJORMINOR@_la_LDFLAGS = \
+libgss_@GST_API_VERSION@_la_LDFLAGS = \
 	-version-info $(GSS_LIBVERSION) \
 	-no-undefined -export-symbols-regex 'gss_'
-libgss_@GST_MAJORMINOR@_la_SOURCES = \
+libgss_@GST_API_VERSION@_la_SOURCES = \
 	$(sources)
 
 sources = \
diff --git a/gtk-doc.mak b/gtk-doc.mak
index dd2b5a5..31b56f9 100644
--- 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-plugindir.m4 b/m4/gst-plugindir.m4
index 88e4a11..9632e55 100644
--- 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([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/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index d8b3b21..0868c20 100644
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -1,15 +1,15 @@
 pcfiles = \
-	gst-streaming-server-@GST_MAJORMINOR@.pc
+	gst-streaming-server-@GST_API_VERSION@.pc
 
 pcfiles_uninstalled = \
-	gst-streaming-server-@GST_MAJORMINOR@-uninstalled.pc
+	gst-streaming-server-@GST_API_VERSION@-uninstalled.pc
 
 all-local: $(pcfiles) $(pcfiles_uninstalled)
 
 ### how to generate pc files
-%-@GST_MAJORMINOR@.pc: %.pc
+%-@GST_API_VERSION@.pc: %.pc
 	cp $< $@
-%-@GST_MAJORMINOR@-uninstalled.pc: %-uninstalled.pc
+%-@GST_API_VERSION@-uninstalled.pc: %-uninstalled.pc
 	cp $< $@
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/pkgconfig/gst-streaming-server-uninstalled.pc.in b/pkgconfig/gst-streaming-server-uninstalled.pc.in
index b819b83..0e36302 100644
--- a/pkgconfig/gst-streaming-server-uninstalled.pc.in
+++ b/pkgconfig/gst-streaming-server-uninstalled.pc.in
@@ -4,9 +4,9 @@ libdir=${pcfiledir}/gst-stream-server/
 includedir=${pcfiledir}/
 
 
-Name: gst-stream-server-@GST_MAJORMINOR@ uninstalled
+Name: gst-stream-server-@GST_API_VERSION@ uninstalled
 Description: GStreamer Streaming Server Library (uninstalled)
 Version: @VERSION@
 Requires: gstreamer-0.10 gstreamer-base-0.10 gstreamer-controller-0.10 gstreamer-pbutils-0.10
-Libs: -L${libdir} -lgss-@ORC_MAJORMINOR@
+Libs: -L${libdir} -lgss-@ORC_API_VERSION@
 Cflags: -I${includedir}
diff --git a/pkgconfig/gst-streaming-server.pc.in b/pkgconfig/gst-streaming-server.pc.in
index 2d2d185..ebc31ef 100644
--- a/pkgconfig/gst-streaming-server.pc.in
+++ b/pkgconfig/gst-streaming-server.pc.in
@@ -1,13 +1,13 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@/gst-@GST_MAJORMINOR@
+includedir=@includedir@/gst-@GST_API_VERSION@
 toolsdir=${exec_prefix}/bin
 
 
-Name: gst-stream-server-@GST_MAJORMINOR@
+Name: gst-stream-server-@GST_API_VERSION@
 Description: GStreamer Streaming Server Library
 Version: @VERSION@
 Requires: gstreamer-0.10 gstreamer-base-0.10 gstreamer-controller-0.10 gstreamer-pbutils-0.10
-Libs: -L${libdir} -lgss-@ORC_MAJORMINOR@
+Libs: -L${libdir} -lgss-@ORC_API_VERSION@
 Cflags: -I${includedir}