diff options
| author | Harald Welte <laforge@osmocom.org> | 2020-08-13 12:14:36 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@osmocom.org> | 2020-08-13 12:14:36 +0200 |
| commit | 072ec6f13325f9b4fa084a482bb28e05439d898f (patch) | |
| tree | 656d511fec23a7b711e4542bf05c3c432d70f455 /src/Makefile.am | |
| parent | 8d150019102bd73295fe29beb8de137299d9a827 (diff) | |
| parent | 2a8a34cd01f398003e3a2cccac555384ff5266cd (diff) | |
Merge branch '1.0.0' into master
We tagged 1.0.0 off a non-master version in the commit history in order
to keep the new TRAU frame handling out of the 1.0.0 release, but to
have all of the other fixes in a tagged release. This merge brings
master in sync with those changes.
Change-Id: If8fc996f385f4127204ad773b991c49d853dfc5b
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index f5dd865..24a7c26 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,8 +1,8 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -ABIS_LIBVERSION=8:0:2 -TRAU_LIBVERSION=4:0:2 +ABIS_LIBVERSION=9:0:0 +TRAU_LIBVERSION=5:0:3 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOE1D_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(COVERAGE_CFLAGS) |