Skip to content

Commit 985330b

Browse files
committed
test1
1 parent 8f2d06d commit 985330b

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

Makefile.am

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,7 @@ lib_LTLIBRARIES = libcava.la
3232

3333
AM_LIBTOOL_VERSION = $(AM_LIBTOOL_CURRENT):$(AM_LIBTOOL_REVISION):$(AM_LIBTOOL_RELEASE)
3434

35-
LT_CURRENT = $(AM_LIBTOOL_CURRENT)
36-
LT_REVISION = $(AM_LIBTOOL_REVISION)
37-
LT_RELEASE = $(AM_LIBTOOL_RELEASE)
38-
#libcava_la_LDFLAGS = -version-info 0:10:6
39-
#AM_LIBTOOL_VERSION = $(AM_LIBTOOL_CURRENT):$(AM_LIBTOOL_REVISION):$(AM_LIBTOOL_RELEASE)
40-
#libcava_LV = $(AM_LIBTOOL_CURRENT):$(AM_LIBTOOL_REVISION):$(AM_LIBTOOL_RELEASE)
41-
#libcava_la_LDFLAGS = -version-info $(libcava_LV)
35+
libcava_la_LDFLAGS = -version-info $(AM_LIBTOOL_VERSION)
4236

4337
bin_PROGRAMS = cava
4438

configure.ac

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ AC_PROG_CC_STDC
88

99
AM_PROG_LIBTOOL
1010

11-
1211
AC_CANONICAL_HOST
1312

1413
build_linux=no
@@ -487,35 +486,35 @@ AC_SUBST([VERSION])
487486

488487
CURRENT_ABI=0 # Default for ABI current
489488
REVISION_ABI=0 # Default for ABI revision
489+
AGE_ABI=0 # Default for ABI age
490490

491491
# Extract the initial part that looks like MAJOR.MINOR.PATCH (e.g., "0.10.0")
492-
# This sed command grabs digits.digits.digits at the beginning,
493-
# or digits.digits if the patch is missing.
494492
BASE_VERSION_PREFIX=$(echo $VERSION | awk -F. '{print $1"."$2}')
495493

496494
if test -n "$BASE_VERSION_PREFIX" ; then
497495
# If we got a base prefix like "0.10.0" or "0.10"
498496
CURRENT_ABI=`echo $BASE_VERSION_PREFIX | cut -d. -f1`
499497
REVISION_ABI=`echo $BASE_VERSION_PREFIX | cut -d. -f2`
500-
498+
AGE_ABI = `echo $VERSION | cut -d '-' -f 2-`
501499
# Ensure defaults if parsing failed or results are empty
502500
if test -z "$CURRENT_ABI"; then CURRENT_ABI=0; fi
503501
if test -z "$REVISION_ABI"; then REVISION_ABI=0; fi
502+
if test -z "$AGE_ABI"; then AGE_ABI=0; fi
504503
else
505504
AC_MSG_WARN([Could not parse ABI versions from "$VERSION". Defaulting to 0:0])
506505
CURRENT_ABI=0
507506
REVISION_ABI=0
507+
AGE_ABI=0
508508
fi
509509

510510
# Set variables for libtool (CURRENT:REVISION:RELEASE)
511511
AM_LIBTOOL_CURRENT="$CURRENT_ABI"
512512
AM_LIBTOOL_REVISION="$REVISION_ABI"
513-
AM_LIBTOOL_RELEASE="$VERSION" # Use the full, descriptive version string for RELEASE
513+
AM_LIBTOOL_RELEASE="$AGE_ABI"
514514

515515
AC_SUBST([AM_LIBTOOL_CURRENT])
516516
AC_SUBST([AM_LIBTOOL_REVISION])
517517
AC_SUBST([AM_LIBTOOL_RELEASE]) # Substitute the full string
518518

519-
520519
AC_CONFIG_FILES([Makefile])
521520
AC_OUTPUT

0 commit comments

Comments
 (0)