From fa6144545f2ba281b3492838f9525ce0fe157503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= Date: Wed, 9 Dec 2015 19:52:33 +0100 Subject: libs: remove versioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since we don't install libraries anymore, it makes no sense to keep versioning them according to the gstreamer's version. Signed-off-by: Víctor Manuel Jáquez Leal --- docs/reference/libs/Makefile.am | 6 ++-- docs/reference/plugins/Makefile.am | 4 +-- gst-libs/gst/vaapi/Makefile.am | 60 +++++++++++++++++++------------------- gst/vaapi/Makefile.am | 17 ++++------- tests/Makefile.am | 12 ++++---- 5 files changed, 47 insertions(+), 52 deletions(-) diff --git a/docs/reference/libs/Makefile.am b/docs/reference/libs/Makefile.am index 036bd7dc..6298a5c1 100644 --- a/docs/reference/libs/Makefile.am +++ b/docs/reference/libs/Makefile.am @@ -104,14 +104,14 @@ INCLUDES = \ GTKDOC_LIBS = \ $(GLIB_LIBS) \ $(GST_LIBS) \ - $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_API_VERSION).la + $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi.la GTKDOC_LIBS += \ - $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-$(GST_API_VERSION).la + $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11.la if USE_GLX GTKDOC_LIBS += \ - $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx-$(GST_API_VERSION).la + $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx.la endif # This includes the standard gtk-doc make rules, copied by gtkdocize. diff --git a/docs/reference/plugins/Makefile.am b/docs/reference/plugins/Makefile.am index d9335084..87addf94 100644 --- a/docs/reference/plugins/Makefile.am +++ b/docs/reference/plugins/Makefile.am @@ -88,12 +88,12 @@ INCLUDES = \ $(NULL) gtkdoc_vaapi_libs = \ - $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_API_VERSION).la \ + $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi.la \ $(NULL) if USE_X11 gtkdoc_vaapi_libs += \ - $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-$(GST_API_VERSION).la \ + $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11.la \ $(NULL) endif diff --git a/gst-libs/gst/vaapi/Makefile.am b/gst-libs/gst/vaapi/Makefile.am index ee10733b..ab4e968f 100644 --- a/gst-libs/gst/vaapi/Makefile.am +++ b/gst-libs/gst/vaapi/Makefile.am @@ -1,23 +1,23 @@ -noinst_LTLIBRARIES = libgstvaapi-@GST_API_VERSION@.la +noinst_LTLIBRARIES = libgstvaapi.la if USE_DRM -noinst_LTLIBRARIES += libgstvaapi-drm-@GST_API_VERSION@.la +noinst_LTLIBRARIES += libgstvaapi-drm.la endif if USE_X11 -noinst_LTLIBRARIES += libgstvaapi-x11-@GST_API_VERSION@.la +noinst_LTLIBRARIES += libgstvaapi-x11.la endif if USE_GLX -noinst_LTLIBRARIES += libgstvaapi-glx-@GST_API_VERSION@.la +noinst_LTLIBRARIES += libgstvaapi-glx.la endif if USE_EGL -noinst_LTLIBRARIES += libgstvaapi-egl-@GST_API_VERSION@.la +noinst_LTLIBRARIES += libgstvaapi-egl.la endif if USE_WAYLAND -noinst_LTLIBRARIES += libgstvaapi-wayland-@GST_API_VERSION@.la +noinst_LTLIBRARIES += libgstvaapi-wayland.la endif libgstvaapi_cflags = \ @@ -327,31 +327,31 @@ libgstvaapi_wayland_source_priv_h = \ gstvaapidisplay_wayland_priv.h \ $(NULL) -libgstvaapi_@GST_API_VERSION@_la_SOURCES = \ +libgstvaapi_la_SOURCES = \ $(libgstvaapi_source_c) \ $(libgstvaapi_source_priv_h) \ $(libgstvaapi_source_h) \ $(NULL) -libgstvaapi_@GST_API_VERSION@_la_CFLAGS = \ +libgstvaapi_la_CFLAGS = \ $(libgstvaapi_cflags) \ $(NULL) -libgstvaapi_@GST_API_VERSION@_la_LIBADD = \ +libgstvaapi_la_LIBADD = \ $(libgstvaapi_libs) \ $(NULL) -libgstvaapi_@GST_API_VERSION@_la_LDFLAGS = \ +libgstvaapi_la_LDFLAGS = \ $(GST_ALL_LDFLAGS) \ $(NULL) -libgstvaapi_drm_@GST_API_VERSION@_la_SOURCES = \ +libgstvaapi_drm_la_SOURCES = \ $(libgstvaapi_drm_source_c) \ $(libgstvaapi_drm_source_priv_h) \ $(libgstvaapi_drm_source_h) \ $(NULL) -libgstvaapi_drm_@GST_API_VERSION@_la_CFLAGS = \ +libgstvaapi_drm_la_CFLAGS = \ -DIN_LIBGSTVAAPI \ -DGST_USE_UNSTABLE_API \ -I$(top_srcdir)/gst-libs \ @@ -363,7 +363,7 @@ libgstvaapi_drm_@GST_API_VERSION@_la_CFLAGS = \ $(LIBVA_DRM_CFLAGS) \ $(NULL) -libgstvaapi_drm_@GST_API_VERSION@_la_LIBADD = \ +libgstvaapi_drm_la_LIBADD = \ $(GLIB_LIBS) \ $(GST_LIBS) \ $(UDEV_LIBS) \ @@ -371,17 +371,17 @@ libgstvaapi_drm_@GST_API_VERSION@_la_LIBADD = \ $(LIBVA_DRM_LIBS) \ $(NULL) -libgstvaapi_drm_@GST_API_VERSION@_la_LDFLAGS = \ +libgstvaapi_drm_la_LDFLAGS = \ $(GST_ALL_LDFLAGS) \ $(NULL) -libgstvaapi_x11_@GST_API_VERSION@_la_SOURCES = \ +libgstvaapi_x11_la_SOURCES = \ $(libgstvaapi_x11_source_c) \ $(libgstvaapi_x11_source_priv_h) \ $(libgstvaapi_x11_source_h) \ $(NULL) -libgstvaapi_x11_@GST_API_VERSION@_la_CFLAGS = \ +libgstvaapi_x11_la_CFLAGS = \ -DIN_LIBGSTVAAPI \ -DGST_USE_UNSTABLE_API \ -I$(top_srcdir)/gst-libs \ @@ -394,7 +394,7 @@ libgstvaapi_x11_@GST_API_VERSION@_la_CFLAGS = \ $(LIBVA_X11_CFLAGS) \ $(NULL) -libgstvaapi_x11_@GST_API_VERSION@_la_LIBADD = \ +libgstvaapi_x11_la_LIBADD = \ $(GLIB_LIBS) \ $(GST_LIBS) \ $(X11_LIBS) \ @@ -403,17 +403,17 @@ libgstvaapi_x11_@GST_API_VERSION@_la_LIBADD = \ $(LIBVA_X11_LIBS) \ $(NULL) -libgstvaapi_x11_@GST_API_VERSION@_la_LDFLAGS = \ +libgstvaapi_x11_la_LDFLAGS = \ $(GST_ALL_LDFLAGS) \ $(NULL) -libgstvaapi_glx_@GST_API_VERSION@_la_SOURCES = \ +libgstvaapi_glx_la_SOURCES = \ $(libgstvaapi_glx_source_c) \ $(libgstvaapi_glx_source_priv_h) \ $(libgstvaapi_glx_source_h) \ $(NULL) -libgstvaapi_glx_@GST_API_VERSION@_la_CFLAGS = \ +libgstvaapi_glx_la_CFLAGS = \ -DIN_LIBGSTVAAPI \ -DGST_USE_UNSTABLE_API \ -I$(top_srcdir)/gst-libs \ @@ -424,7 +424,7 @@ libgstvaapi_glx_@GST_API_VERSION@_la_CFLAGS = \ $(LIBVA_X11_CFLAGS) \ $(NULL) -libgstvaapi_glx_@GST_API_VERSION@_la_LIBADD = \ +libgstvaapi_glx_la_LIBADD = \ $(GLIB_LIBS) \ $(GST_LIBS) \ $(GST_BASE_LIBS) \ @@ -435,17 +435,17 @@ libgstvaapi_glx_@GST_API_VERSION@_la_LIBADD = \ $(DLOPEN_LIBS) \ $(NULL) -libgstvaapi_glx_@GST_API_VERSION@_la_LDFLAGS = \ +libgstvaapi_glx_la_LDFLAGS = \ $(GST_ALL_LDFLAGS) \ $(NULL) -libgstvaapi_egl_@GST_API_VERSION@_la_SOURCES = \ +libgstvaapi_egl_la_SOURCES = \ $(libgstvaapi_egl_source_c) \ $(libgstvaapi_egl_source_priv_h) \ $(libgstvaapi_egl_source_h) \ $(NULL) -libgstvaapi_egl_@GST_API_VERSION@_la_CFLAGS = \ +libgstvaapi_egl_la_CFLAGS = \ -DIN_LIBGSTVAAPI \ -DGST_USE_UNSTABLE_API \ -I$(top_srcdir)/gst-libs \ @@ -457,7 +457,7 @@ libgstvaapi_egl_@GST_API_VERSION@_la_CFLAGS = \ $(EGL_CFLAGS) \ $(NULL) -libgstvaapi_egl_@GST_API_VERSION@_la_LIBADD = \ +libgstvaapi_egl_la_LIBADD = \ $(GLIB_LIBS) \ $(GMODULE_LIBS) \ $(GST_LIBS) \ @@ -467,17 +467,17 @@ libgstvaapi_egl_@GST_API_VERSION@_la_LIBADD = \ $(DLOPEN_LIBS) \ $(NULL) -libgstvaapi_egl_@GST_API_VERSION@_la_LDFLAGS = \ +libgstvaapi_egl_la_LDFLAGS = \ $(GST_ALL_LDFLAGS) \ $(NULL) -libgstvaapi_wayland_@GST_API_VERSION@_la_SOURCES = \ +libgstvaapi_wayland_la_SOURCES = \ $(libgstvaapi_wayland_source_c) \ $(libgstvaapi_wayland_source_priv_h) \ $(libgstvaapi_wayland_source_h) \ $(NULL) -libgstvaapi_wayland_@GST_API_VERSION@_la_CFLAGS = \ +libgstvaapi_wayland_la_CFLAGS = \ -DIN_LIBGSTVAAPI \ -DGST_USE_UNSTABLE_API \ -I$(top_srcdir)/gst-libs \ @@ -488,7 +488,7 @@ libgstvaapi_wayland_@GST_API_VERSION@_la_CFLAGS = \ $(LIBVA_WAYLAND_CFLAGS) \ $(NULL) -libgstvaapi_wayland_@GST_API_VERSION@_la_LIBADD = \ +libgstvaapi_wayland_la_LIBADD = \ $(GLIB_LIBS) \ $(GST_LIBS) \ $(GST_VIDEO_LIBS) \ @@ -496,7 +496,7 @@ libgstvaapi_wayland_@GST_API_VERSION@_la_LIBADD = \ $(LIBVA_WAYLAND_LIBS) \ $(NULL) -libgstvaapi_wayland_@GST_API_VERSION@_la_LDFLAGS = \ +libgstvaapi_wayland_la_LDFLAGS = \ $(GST_ALL_LDFLAGS) \ $(NULL) diff --git a/gst/vaapi/Makefile.am b/gst/vaapi/Makefile.am index 0fb9ad3c..b25d2dfd 100644 --- a/gst/vaapi/Makefile.am +++ b/gst/vaapi/Makefile.am @@ -7,28 +7,24 @@ libgstvaapi_CFLAGS = \ -I$(top_builddir)/gst-libs \ $(NULL) -libgstvaapi_LIBS = \ - $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_API_VERSION).la +libgstvaapi_LIBS = $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi.la if USE_DRM -libgstvaapi_LIBS += \ - $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-drm-$(GST_API_VERSION).la +libgstvaapi_LIBS +=$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-drm.la endif if USE_X11 libgstvaapi_LIBS += \ $(X11_LIBS) \ - $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-$(GST_API_VERSION).la + $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11.la endif if USE_GLX -libgstvaapi_LIBS += \ - $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx-$(GST_API_VERSION).la +libgstvaapi_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx.la endif if USE_EGL -libgstvaapi_LIBS += \ - $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-egl-$(GST_API_VERSION).la +libgstvaapi_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-egl.la endif if USE_WAYLAND @@ -36,8 +32,7 @@ libgstvaapi_CFLAGS += \ $(WAYLAND_CFLAGS) \ $(NULL) -libgstvaapi_LIBS += \ - $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-wayland-$(GST_API_VERSION).la +libgstvaapi_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-wayland.la endif if USE_GST_GL_HELPERS diff --git a/tests/Makefile.am b/tests/Makefile.am index 831a9d91..578b6053 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -29,20 +29,20 @@ TEST_CFLAGS = \ $(GST_VIDEO_CFLAGS) \ $(NULL) -GST_VAAPI_LIBS = $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_API_VERSION).la +GST_VAAPI_LIBS = $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi.la TEST_LIBS = \ $(LIBVA_LIBS) \ $(GST_LIBS) \ $(NULL) if USE_DRM -GST_VAAPI_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-drm-$(GST_API_VERSION).la +GST_VAAPI_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-drm.la TEST_CFLAGS += $(LIBVA_DRM_CFLAGS) TEST_LIBS += $(LIBVA_DRM_LIBS) endif if USE_X11 -GST_VAAPI_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-$(GST_API_VERSION).la +GST_VAAPI_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11.la TEST_CFLAGS += $(X11_CFLAGS) TEST_LIBS += \ $(LIBVA_X11_LIBS) \ @@ -51,7 +51,7 @@ TEST_LIBS += \ endif if USE_GLX -GST_VAAPI_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx-$(GST_API_VERSION).la +GST_VAAPI_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx.la TEST_CFLAGS += $(X11_CFLAGS) $(GL_CFLAGS) TEST_LIBS += \ $(LIBVA_GLX_LIBS) \ @@ -61,7 +61,7 @@ TEST_LIBS += \ endif if USE_EGL -GST_VAAPI_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-egl-$(GST_API_VERSION).la +GST_VAAPI_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-egl.la TEST_CFLAGS += $(EGL_CFLAGS) TEST_LIBS += \ $(LIBVA_EGL_LIBS) \ @@ -70,7 +70,7 @@ TEST_LIBS += \ endif if USE_WAYLAND -GST_VAAPI_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-wayland-$(GST_API_VERSION).la +GST_VAAPI_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-wayland.la TEST_CFLAGS += $(WAYLAND_CFLAGS) TEST_LIBS += \ $(LIBVA_WAYLAND_LIBS) \ -- cgit v1.2.1