Replace FS_MAJORMINOR with FS_APIVERSION

2 files changed, 25 insertions, 25 deletions

diff --git a/farstream/Makefile.am b/farstream/Makefile.am
index 06fa1f84..8be9167d 100644
--- a/farstream/Makefile.am
+++ b/farstream/Makefile.am
@@ -1,4 +1,4 @@
-libfarstreamincludedir = $(includedir)/farstream-@FS_MAJORMINOR@/farstream
+libfarstreamincludedir = $(includedir)/farstream-@FS_APIVERSION@/farstream
 
 libfarstreaminclude_HEADERS = \
 		fs-candidate.h \
@@ -18,15 +18,15 @@ nodist_libfarstreaminclude_HEADERS = \
 		fs-enumtypes.h
 
 
-lib_LTLIBRARIES = libfarstream-@FS_MAJORMINOR@.la
+lib_LTLIBRARIES = libfarstream-@FS_APIVERSION@.la
 
 BUILT_SOURCES = \
-	$(nodist_libfarstream_@FS_MAJORMINOR@_la_SOURCES) \
+	$(nodist_libfarstream_@FS_APIVERSION@_la_SOURCES) \
 	$(nodist_libfarstreaminclude_HEADERS)
 
 CLEANFILES = $(BUILT_SOURCES) fs-marshal.list
 
-libfarstream_@FS_MAJORMINOR@_la_SOURCES = \
+libfarstream_@FS_APIVERSION@_la_SOURCES = \
 		fs-candidate.c \
 		fs-codec.c \
 		fs-participant.c \
@@ -41,16 +41,16 @@ libfarstream_@FS_MAJORMINOR@_la_SOURCES = \
 		fs-rtp.c \
 		fs-private.h
 
-nodist_libfarstream_@FS_MAJORMINOR@_la_SOURCES = \
+nodist_libfarstream_@FS_APIVERSION@_la_SOURCES = \
 		fs-marshal.c \
 		fs-marshal.h \
 		fs-enumtypes.c
 
 
-fs-marshal.list: $(libfarstream_@FS_MAJORMINOR@_la_SOURCES) Makefile.am
+fs-marshal.list: $(libfarstream_@FS_APIVERSION@_la_SOURCES) Makefile.am
 	$(AM_V_GEN) ( cd $(srcdir) && \
 	sed -n -e 's/.*_fs_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
-	$(libfarstream_@FS_MAJORMINOR@_la_SOURCES) ) \
+	$(libfarstream_@FS_APIVERSION@_la_SOURCES) ) \
 	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
 	@if cmp -s $@.tmp $@; then \
 		rm $@.tmp; \
@@ -59,15 +59,15 @@ fs-marshal.list: $(libfarstream_@FS_MAJORMINOR@_la_SOURCES) Makefile.am
 		mv $@.tmp $@; \
 	fi
 
-libfarstream_@FS_MAJORMINOR@_la_CFLAGS = \
+libfarstream_@FS_APIVERSION@_la_CFLAGS = \
 	$(FS_INTERNAL_CFLAGS) $(FS_CFLAGS) \
 	$(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS) \
 	$(GST_CFLAGS)
-libfarstream_@FS_MAJORMINOR@_la_LIBADD = \
+libfarstream_@FS_APIVERSION@_la_LIBADD = \
 	$(GST_BASE_LIBS) \
 	$(GST_LIBS)
-libfarstream_@FS_MAJORMINOR@_la_LDFLAGS = \
+libfarstream_@FS_APIVERSION@_la_LDFLAGS = \
 	$(FS_LIB_LDFLAGS) \
 	$(FS_ALL_LDFLAGS) \
 	$(FS_LT_LDFLAGS) 
@@ -91,23 +91,23 @@ include $(top_srcdir)/common-modified/gst-glib-gen.mak
 if HAVE_INTROSPECTION
 include $(INTROSPECTION_MAKEFILE)
 introspection_sources = \
-	$(libfarstream_@FS_MAJORMINOR@_la_SOURCES) \
+	$(libfarstream_@FS_APIVERSION@_la_SOURCES) \
 	$(nodist_libfarstreaminclude_HEADERS) \
 	$(libfarstreaminclude_HEADERS)
 
-INTROSPECTION_GIRS = Farstream-@FS_MAJORMINOR@.gir
-Farstream-@FS_MAJORMINOR@.gir: libfarstream-@FS_MAJORMINOR@.la
-Farstream_@FS_MAJOR_MINOR@_gir_NAMESPACE = Farstream
-Farstream_@FS_MAJOR_MINOR@_gir_VERSION = @FS_MAJORMINOR@
-Farstream_@FS_MAJOR_MINOR@_gir_LIBS = libfarstream-@FS_MAJORMINOR@.la
-Farstream_@FS_MAJOR_MINOR@_gir_FILES = $(introspection_sources)
-Farstream_@FS_MAJOR_MINOR@_gir_INCLUDES = GObject-2.0 Gst-@GST_API_VERSION@
-Farstream_@FS_MAJOR_MINOR@_gir_CFLAGS = $(FS_INTERNAL_CFLAGS)
-Farstream_@FS_MAJOR_MINOR@_gir_SCANNERFLAGS = --identifier-prefix=fs_ --identifier-prefix=Fs
+INTROSPECTION_GIRS = Farstream-@FS_APIVERSION@.gir
+Farstream-@FS_APIVERSION@.gir: libfarstream-@FS_APIVERSION@.la
+Farstream_@FS_API_VERSION@_gir_NAMESPACE = Farstream
+Farstream_@FS_API_VERSION@_gir_VERSION = @FS_APIVERSION@
+Farstream_@FS_API_VERSION@_gir_LIBS = libfarstream-@FS_APIVERSION@.la
+Farstream_@FS_API_VERSION@_gir_FILES = $(introspection_sources)
+Farstream_@FS_API_VERSION@_gir_INCLUDES = GObject-2.0 Gst-@GST_API_VERSION@
+Farstream_@FS_API_VERSION@_gir_CFLAGS = $(FS_INTERNAL_CFLAGS)
+Farstream_@FS_API_VERSION@_gir_SCANNERFLAGS = --identifier-prefix=fs_ --identifier-prefix=Fs
 
 girdir = $(datadir)/gir-1.0
-dist_gir_DATA = Farstream-@FS_MAJORMINOR@.gir
+dist_gir_DATA = Farstream-@FS_APIVERSION@.gir
 typelibdir = $(libdir)/girepository-1.0
-typelib_DATA = Farstream-@FS_MAJORMINOR@.typelib
+typelib_DATA = Farstream-@FS_APIVERSION@.typelib
 CLEANFILES += $(dist_gir_DATA) $(typelib_DATA)
 endif
diff --git a/farstream/fs-utils.c b/farstream/fs-utils.c
index 8bc470d2..cd52868f 100644
--- a/farstream/fs-utils.c
+++ b/farstream/fs-utils.c
@@ -42,7 +42,7 @@ load_default_codec_preferences_from_path (const gchar *element_name,
   GList *codec_prefs = NULL;
   gchar *filename;
 
-  filename = g_build_filename (path, PACKAGE, FS_MAJORMINOR, element_name,
+  filename = g_build_filename (path, PACKAGE, FS_APIVERSION, element_name,
       "default-codec-preferences", NULL);
   codec_prefs = fs_codec_list_from_keyfile (filename, NULL);
   g_free (filename);
@@ -121,7 +121,7 @@ fs_utils_get_default_element_properties (GstElement *element)
   gchar *filename;
   const gchar *factory_name = factory_name_from_element (element);
 
-  filename = g_build_filename (PACKAGE, FS_MAJORMINOR, factory_name,
+  filename = g_build_filename (PACKAGE, FS_APIVERSION, factory_name,
       "default-element-properties", NULL);
   file_loaded = g_key_file_load_from_data_dirs (keyfile, filename, NULL,
       G_KEY_FILE_NONE, NULL);
@@ -219,7 +219,7 @@ load_default_rtp_hdrext_preferences_from_path (const gchar *element_name,
   GList *rtp_hdrext_prefs = NULL;
   gchar *filename;
 
-  filename = g_build_filename (path, PACKAGE, FS_MAJORMINOR, element_name,
+  filename = g_build_filename (path, PACKAGE, FS_APIVERSION, element_name,
       "default-codec-preferences", NULL);
   rtp_hdrext_prefs = fs_rtp_header_extension_list_from_keyfile (filename,
       media_type, NULL);