From 29752b6b635b007d0a81ff630b437ff3347ecb51 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Thu, 28 Apr 2016 14:07:18 +0200 Subject: [PATCH] cogl/clutter: Drop soname versions of private libraries --- clutter/configure.ac | 2 +- cogl/cogl-gles2/Makefile.am | 2 +- cogl/cogl-pango/Makefile.am | 2 +- cogl/cogl-path/Makefile.am | 2 +- cogl/cogl/Makefile.am | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/clutter/configure.ac b/clutter/configure.ac index 3fb791a87..a9af0ea90 100644 --- a/clutter/configure.ac +++ b/clutter/configure.ac @@ -76,7 +76,7 @@ CLUTTER_LT_CURRENT=lt_current CLUTTER_LT_REV=lt_revision CLUTTER_LT_AGE=lt_age CLUTTER_LT_VERSION="$CLUTTER_LT_CURRENT:$CLUTTER_LT_REV:$CLUTTER_LT_AGE" -CLUTTER_LT_LDFLAGS="-version-info $CLUTTER_LT_VERSION" +CLUTTER_LT_LDFLAGS="-avoid-version" AC_SUBST([CLUTTER_LT_CURRENT], [lt_current]) AC_SUBST([CLUTTER_LT_REVISION], [lt_revision]) AC_SUBST([CLUTTER_LT_VERSION], [$CLUTTER_LT_VERSION]) diff --git a/cogl/cogl-gles2/Makefile.am b/cogl/cogl-gles2/Makefile.am index 47baafcc0..d8650e558 100644 --- a/cogl/cogl-gles2/Makefile.am +++ b/cogl/cogl-gles2/Makefile.am @@ -15,7 +15,7 @@ libmutter_cogl_gles2_la_SOURCES = cogl-gles2-api.c libmutter_cogl_gles2_la_LDFLAGS = \ -no-undefined \ -rpath $(mutterlibdir) \ - -version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@ \ + -avoid-version \ -export-dynamic \ -export-symbols-regex "^gl*" diff --git a/cogl/cogl-pango/Makefile.am b/cogl/cogl-pango/Makefile.am index 562d81030..3fd4bdc43 100644 --- a/cogl/cogl-pango/Makefile.am +++ b/cogl/cogl-pango/Makefile.am @@ -34,7 +34,7 @@ libmutter_cogl_pango_la_LDFLAGS = \ -rpath $(mutterlibdir) \ -export-symbols-regex "^cogl_pango_.*" \ -no-undefined \ - -version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@ + -avoid-version AM_CPPFLAGS = \ -DCOGL_COMPILATION \ diff --git a/cogl/cogl-path/Makefile.am b/cogl/cogl-path/Makefile.am index 3408c7b88..c283fb489 100644 --- a/cogl/cogl-path/Makefile.am +++ b/cogl/cogl-path/Makefile.am @@ -78,7 +78,7 @@ libmutter_cogl_path_la_LDFLAGS = \ -export-dynamic \ -export-symbols-regex "^(cogl|cogl2)_(framebuffer|path|is|clip|[sg]et)_.*" \ -no-undefined \ - -version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@ \ + -avoid-version \ -rpath $(mutterlibdir) AM_CPPFLAGS = \ diff --git a/cogl/cogl/Makefile.am b/cogl/cogl/Makefile.am index cc8e7a47c..38c938d35 100644 --- a/cogl/cogl/Makefile.am +++ b/cogl/cogl/Makefile.am @@ -471,7 +471,7 @@ endif # for cogl-pango. libmutter_cogl_la_LDFLAGS = \ -no-undefined \ - -version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@ \ + -avoid-version \ -export-dynamic \ -rpath $(mutterlibdir) \ -export-symbols-regex "^(cogl|_cogl_debug_flags|_cogl_atlas_new|_cogl_atlas_add_reorganize_callback|_cogl_atlas_reserve_space|_cogl_callback|_cogl_util_get_eye_planes_for_screen_poly|_cogl_atlas_texture_remove_reorganize_callback|_cogl_atlas_texture_add_reorganize_callback|_cogl_texture_get_format|_cogl_texture_foreach_sub_texture_in_region|_cogl_profile_trace_message|_cogl_context_get_default|_cogl_framebuffer_get_stencil_bits|_cogl_clip_stack_push_rectangle|_cogl_framebuffer_get_modelview_stack|_cogl_object_default_unref|_cogl_pipeline_foreach_layer_internal|_cogl_clip_stack_push_primitive|_cogl_buffer_unmap_for_fill_or_fallback|_cogl_framebuffer_draw_primitive|_cogl_debug_instances|_cogl_framebuffer_get_projection_stack|_cogl_pipeline_layer_get_texture|_cogl_buffer_map_for_fill_or_fallback|_cogl_texture_can_hardware_repeat|_cogl_pipeline_prune_to_n_layers|_cogl_primitive_draw|test_|unit_test_).*"