mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 07:16:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs: remove versioning

Browse source 
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 <victorx.jaquez@intel.com>
This commit is contained in:
Víctor Manuel Jáquez Leal 2015-12-09 19:52:33 +01:00
parent f8bb674028
commit fa6144545f
5 changed files with 47 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/reference/libs/Makefile.am
View file

@ -104,14 +104,14 @@ INCLUDES = \
GTKDOC_LIBS = \ GTKDOC_LIBS = \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
$(GST_LIBS) \ $(GST_LIBS) \
$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_API_VERSION).la $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi.la
GTKDOC_LIBS += \ 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 if USE_GLX
GTKDOC_LIBS += \ GTKDOC_LIBS += \
$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx-$(GST_API_VERSION).la $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx.la
endif endif
# This includes the standard gtk-doc make rules, copied by gtkdocize. # This includes the standard gtk-doc make rules, copied by gtkdocize.

4
docs/reference/plugins/Makefile.am
View file

@ -88,12 +88,12 @@ INCLUDES = \
$(NULL) $(NULL)
gtkdoc_vaapi_libs = \ gtkdoc_vaapi_libs = \
$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_API_VERSION).la \ $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi.la \
$(NULL) $(NULL)
if USE_X11 if USE_X11
gtkdoc_vaapi_libs += \ 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) $(NULL)
endif endif

60
gst-libs/gst/vaapi/Makefile.am
View file

@ -1,23 +1,23 @@
noinst_LTLIBRARIES = libgstvaapi-@GST_API_VERSION@.la noinst_LTLIBRARIES = libgstvaapi.la
if USE_DRM if USE_DRM
noinst_LTLIBRARIES += libgstvaapi-drm-@GST_API_VERSION@.la noinst_LTLIBRARIES += libgstvaapi-drm.la
endif endif
if USE_X11 if USE_X11
noinst_LTLIBRARIES += libgstvaapi-x11-@GST_API_VERSION@.la noinst_LTLIBRARIES += libgstvaapi-x11.la
endif endif
if USE_GLX if USE_GLX
noinst_LTLIBRARIES += libgstvaapi-glx-@GST_API_VERSION@.la noinst_LTLIBRARIES += libgstvaapi-glx.la
endif endif
if USE_EGL if USE_EGL
noinst_LTLIBRARIES += libgstvaapi-egl-@GST_API_VERSION@.la noinst_LTLIBRARIES += libgstvaapi-egl.la
endif endif
if USE_WAYLAND if USE_WAYLAND
noinst_LTLIBRARIES += libgstvaapi-wayland-@GST_API_VERSION@.la noinst_LTLIBRARIES += libgstvaapi-wayland.la
endif endif
libgstvaapi_cflags = \ libgstvaapi_cflags = \
@ -327,31 +327,31 @@ libgstvaapi_wayland_source_priv_h = \
gstvaapidisplay_wayland_priv.h \ gstvaapidisplay_wayland_priv.h \
$(NULL) $(NULL)
libgstvaapi_@GST_API_VERSION@_la_SOURCES = \ libgstvaapi_la_SOURCES = \
$(libgstvaapi_source_c) \ $(libgstvaapi_source_c) \
$(libgstvaapi_source_priv_h) \ $(libgstvaapi_source_priv_h) \
$(libgstvaapi_source_h) \ $(libgstvaapi_source_h) \
$(NULL) $(NULL)
libgstvaapi_@GST_API_VERSION@_la_CFLAGS = \ libgstvaapi_la_CFLAGS = \
$(libgstvaapi_cflags) \ $(libgstvaapi_cflags) \
$(NULL) $(NULL)
libgstvaapi_@GST_API_VERSION@_la_LIBADD = \ libgstvaapi_la_LIBADD = \
$(libgstvaapi_libs) \ $(libgstvaapi_libs) \
$(NULL) $(NULL)
libgstvaapi_@GST_API_VERSION@_la_LDFLAGS = \ libgstvaapi_la_LDFLAGS = \
$(GST_ALL_LDFLAGS) \ $(GST_ALL_LDFLAGS) \
$(NULL) $(NULL)
libgstvaapi_drm_@GST_API_VERSION@_la_SOURCES = \ libgstvaapi_drm_la_SOURCES = \
$(libgstvaapi_drm_source_c) \ $(libgstvaapi_drm_source_c) \
$(libgstvaapi_drm_source_priv_h) \ $(libgstvaapi_drm_source_priv_h) \
$(libgstvaapi_drm_source_h) \ $(libgstvaapi_drm_source_h) \
$(NULL) $(NULL)
libgstvaapi_drm_@GST_API_VERSION@_la_CFLAGS = \ libgstvaapi_drm_la_CFLAGS = \
-DIN_LIBGSTVAAPI \ -DIN_LIBGSTVAAPI \
-DGST_USE_UNSTABLE_API \ -DGST_USE_UNSTABLE_API \
-I$(top_srcdir)/gst-libs \ -I$(top_srcdir)/gst-libs \
@ -363,7 +363,7 @@ libgstvaapi_drm_@GST_API_VERSION@_la_CFLAGS = \
$(LIBVA_DRM_CFLAGS) \ $(LIBVA_DRM_CFLAGS) \
$(NULL) $(NULL)
libgstvaapi_drm_@GST_API_VERSION@_la_LIBADD = \ libgstvaapi_drm_la_LIBADD = \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
$(GST_LIBS) \ $(GST_LIBS) \
$(UDEV_LIBS) \ $(UDEV_LIBS) \
@ -371,17 +371,17 @@ libgstvaapi_drm_@GST_API_VERSION@_la_LIBADD = \
$(LIBVA_DRM_LIBS) \ $(LIBVA_DRM_LIBS) \
$(NULL) $(NULL)
libgstvaapi_drm_@GST_API_VERSION@_la_LDFLAGS = \ libgstvaapi_drm_la_LDFLAGS = \
$(GST_ALL_LDFLAGS) \ $(GST_ALL_LDFLAGS) \
$(NULL) $(NULL)
libgstvaapi_x11_@GST_API_VERSION@_la_SOURCES = \ libgstvaapi_x11_la_SOURCES = \
$(libgstvaapi_x11_source_c) \ $(libgstvaapi_x11_source_c) \
$(libgstvaapi_x11_source_priv_h) \ $(libgstvaapi_x11_source_priv_h) \
$(libgstvaapi_x11_source_h) \ $(libgstvaapi_x11_source_h) \
$(NULL) $(NULL)
libgstvaapi_x11_@GST_API_VERSION@_la_CFLAGS = \ libgstvaapi_x11_la_CFLAGS = \
-DIN_LIBGSTVAAPI \ -DIN_LIBGSTVAAPI \
-DGST_USE_UNSTABLE_API \ -DGST_USE_UNSTABLE_API \
-I$(top_srcdir)/gst-libs \ -I$(top_srcdir)/gst-libs \
@ -394,7 +394,7 @@ libgstvaapi_x11_@GST_API_VERSION@_la_CFLAGS = \
$(LIBVA_X11_CFLAGS) \ $(LIBVA_X11_CFLAGS) \
$(NULL) $(NULL)
libgstvaapi_x11_@GST_API_VERSION@_la_LIBADD = \ libgstvaapi_x11_la_LIBADD = \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
$(GST_LIBS) \ $(GST_LIBS) \
$(X11_LIBS) \ $(X11_LIBS) \
@ -403,17 +403,17 @@ libgstvaapi_x11_@GST_API_VERSION@_la_LIBADD = \
$(LIBVA_X11_LIBS) \ $(LIBVA_X11_LIBS) \
$(NULL) $(NULL)
libgstvaapi_x11_@GST_API_VERSION@_la_LDFLAGS = \ libgstvaapi_x11_la_LDFLAGS = \
$(GST_ALL_LDFLAGS) \ $(GST_ALL_LDFLAGS) \
$(NULL) $(NULL)
libgstvaapi_glx_@GST_API_VERSION@_la_SOURCES = \ libgstvaapi_glx_la_SOURCES = \
$(libgstvaapi_glx_source_c) \ $(libgstvaapi_glx_source_c) \
$(libgstvaapi_glx_source_priv_h) \ $(libgstvaapi_glx_source_priv_h) \
$(libgstvaapi_glx_source_h) \ $(libgstvaapi_glx_source_h) \
$(NULL) $(NULL)
libgstvaapi_glx_@GST_API_VERSION@_la_CFLAGS = \ libgstvaapi_glx_la_CFLAGS = \
-DIN_LIBGSTVAAPI \ -DIN_LIBGSTVAAPI \
-DGST_USE_UNSTABLE_API \ -DGST_USE_UNSTABLE_API \
-I$(top_srcdir)/gst-libs \ -I$(top_srcdir)/gst-libs \
@ -424,7 +424,7 @@ libgstvaapi_glx_@GST_API_VERSION@_la_CFLAGS = \
$(LIBVA_X11_CFLAGS) \ $(LIBVA_X11_CFLAGS) \
$(NULL) $(NULL)
libgstvaapi_glx_@GST_API_VERSION@_la_LIBADD = \ libgstvaapi_glx_la_LIBADD = \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
$(GST_LIBS) \ $(GST_LIBS) \
$(GST_BASE_LIBS) \ $(GST_BASE_LIBS) \
@ -435,17 +435,17 @@ libgstvaapi_glx_@GST_API_VERSION@_la_LIBADD = \
$(DLOPEN_LIBS) \ $(DLOPEN_LIBS) \
$(NULL) $(NULL)
libgstvaapi_glx_@GST_API_VERSION@_la_LDFLAGS = \ libgstvaapi_glx_la_LDFLAGS = \
$(GST_ALL_LDFLAGS) \ $(GST_ALL_LDFLAGS) \
$(NULL) $(NULL)
libgstvaapi_egl_@GST_API_VERSION@_la_SOURCES = \ libgstvaapi_egl_la_SOURCES = \
$(libgstvaapi_egl_source_c) \ $(libgstvaapi_egl_source_c) \
$(libgstvaapi_egl_source_priv_h) \ $(libgstvaapi_egl_source_priv_h) \
$(libgstvaapi_egl_source_h) \ $(libgstvaapi_egl_source_h) \
$(NULL) $(NULL)
libgstvaapi_egl_@GST_API_VERSION@_la_CFLAGS = \ libgstvaapi_egl_la_CFLAGS = \
-DIN_LIBGSTVAAPI \ -DIN_LIBGSTVAAPI \
-DGST_USE_UNSTABLE_API \ -DGST_USE_UNSTABLE_API \
-I$(top_srcdir)/gst-libs \ -I$(top_srcdir)/gst-libs \
@ -457,7 +457,7 @@ libgstvaapi_egl_@GST_API_VERSION@_la_CFLAGS = \
$(EGL_CFLAGS) \ $(EGL_CFLAGS) \
$(NULL) $(NULL)
libgstvaapi_egl_@GST_API_VERSION@_la_LIBADD = \ libgstvaapi_egl_la_LIBADD = \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
$(GMODULE_LIBS) \ $(GMODULE_LIBS) \
$(GST_LIBS) \ $(GST_LIBS) \
@ -467,17 +467,17 @@ libgstvaapi_egl_@GST_API_VERSION@_la_LIBADD = \
$(DLOPEN_LIBS) \ $(DLOPEN_LIBS) \
$(NULL) $(NULL)
libgstvaapi_egl_@GST_API_VERSION@_la_LDFLAGS = \ libgstvaapi_egl_la_LDFLAGS = \
$(GST_ALL_LDFLAGS) \ $(GST_ALL_LDFLAGS) \
$(NULL) $(NULL)
libgstvaapi_wayland_@GST_API_VERSION@_la_SOURCES = \ libgstvaapi_wayland_la_SOURCES = \
$(libgstvaapi_wayland_source_c) \ $(libgstvaapi_wayland_source_c) \
$(libgstvaapi_wayland_source_priv_h) \ $(libgstvaapi_wayland_source_priv_h) \
$(libgstvaapi_wayland_source_h) \ $(libgstvaapi_wayland_source_h) \
$(NULL) $(NULL)
libgstvaapi_wayland_@GST_API_VERSION@_la_CFLAGS = \ libgstvaapi_wayland_la_CFLAGS = \
-DIN_LIBGSTVAAPI \ -DIN_LIBGSTVAAPI \
-DGST_USE_UNSTABLE_API \ -DGST_USE_UNSTABLE_API \
-I$(top_srcdir)/gst-libs \ -I$(top_srcdir)/gst-libs \
@ -488,7 +488,7 @@ libgstvaapi_wayland_@GST_API_VERSION@_la_CFLAGS = \
$(LIBVA_WAYLAND_CFLAGS) \ $(LIBVA_WAYLAND_CFLAGS) \
$(NULL) $(NULL)
libgstvaapi_wayland_@GST_API_VERSION@_la_LIBADD = \ libgstvaapi_wayland_la_LIBADD = \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
$(GST_LIBS) \ $(GST_LIBS) \
$(GST_VIDEO_LIBS) \ $(GST_VIDEO_LIBS) \
@ -496,7 +496,7 @@ libgstvaapi_wayland_@GST_API_VERSION@_la_LIBADD = \
$(LIBVA_WAYLAND_LIBS) \ $(LIBVA_WAYLAND_LIBS) \
$(NULL) $(NULL)
libgstvaapi_wayland_@GST_API_VERSION@_la_LDFLAGS = \ libgstvaapi_wayland_la_LDFLAGS = \
$(GST_ALL_LDFLAGS) \ $(GST_ALL_LDFLAGS) \
$(NULL) $(NULL)

17
gst/vaapi/Makefile.am
View file

@ -7,28 +7,24 @@ libgstvaapi_CFLAGS = \
-I$(top_builddir)/gst-libs \ -I$(top_builddir)/gst-libs \
$(NULL) $(NULL)
libgstvaapi_LIBS = \ libgstvaapi_LIBS = $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi.la
$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_API_VERSION).la
if USE_DRM if USE_DRM
libgstvaapi_LIBS += \ libgstvaapi_LIBS +=$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-drm.la
$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-drm-$(GST_API_VERSION).la
endif endif
if USE_X11 if USE_X11
libgstvaapi_LIBS += \ libgstvaapi_LIBS += \
$(X11_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 endif
if USE_GLX if USE_GLX
libgstvaapi_LIBS += \ libgstvaapi_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx.la
$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx-$(GST_API_VERSION).la
endif endif
if USE_EGL if USE_EGL
libgstvaapi_LIBS += \ libgstvaapi_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-egl.la
$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-egl-$(GST_API_VERSION).la
endif endif
if USE_WAYLAND if USE_WAYLAND
@ -36,8 +32,7 @@ libgstvaapi_CFLAGS += \
$(WAYLAND_CFLAGS) \ $(WAYLAND_CFLAGS) \
$(NULL) $(NULL)
libgstvaapi_LIBS += \ libgstvaapi_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-wayland.la
$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-wayland-$(GST_API_VERSION).la
endif endif
if USE_GST_GL_HELPERS if USE_GST_GL_HELPERS

12
tests/Makefile.am
View file

@ -29,20 +29,20 @@ TEST_CFLAGS = \
$(GST_VIDEO_CFLAGS) \ $(GST_VIDEO_CFLAGS) \
$(NULL) $(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 = \ TEST_LIBS = \
$(LIBVA_LIBS) \ $(LIBVA_LIBS) \
$(GST_LIBS) \ $(GST_LIBS) \
$(NULL) $(NULL)
if USE_DRM 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_CFLAGS += $(LIBVA_DRM_CFLAGS)
TEST_LIBS += $(LIBVA_DRM_LIBS) TEST_LIBS += $(LIBVA_DRM_LIBS)
endif endif
if USE_X11 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_CFLAGS += $(X11_CFLAGS)
TEST_LIBS += \ TEST_LIBS += \
$(LIBVA_X11_LIBS) \ $(LIBVA_X11_LIBS) \
@ -51,7 +51,7 @@ TEST_LIBS += \
endif endif
if USE_GLX 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_CFLAGS += $(X11_CFLAGS) $(GL_CFLAGS)
TEST_LIBS += \ TEST_LIBS += \
$(LIBVA_GLX_LIBS) \ $(LIBVA_GLX_LIBS) \
@ -61,7 +61,7 @@ TEST_LIBS += \
endif endif
if USE_EGL 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_CFLAGS += $(EGL_CFLAGS)
TEST_LIBS += \ TEST_LIBS += \
$(LIBVA_EGL_LIBS) \ $(LIBVA_EGL_LIBS) \
@ -70,7 +70,7 @@ TEST_LIBS += \
endif endif
if USE_WAYLAND 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_CFLAGS += $(WAYLAND_CFLAGS)
TEST_LIBS += \ TEST_LIBS += \
$(LIBVA_WAYLAND_LIBS) \ $(LIBVA_WAYLAND_LIBS) \