build: build libosmotrau.la in the src directory.
This spares us another recursion, and allows a much higher
parallelisation, since trau is only one source unit and one standalone
library.
Incidentally, also make sure that the version specification for
libosmoabis is applied.
Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
diff --git a/configure.ac b/configure.ac
index 2c04240..b85718b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,6 +45,5 @@
libosmotrau.pc
include/Makefile
src/Makefile
- src/trau/Makefile
tests/Makefile
Makefile)
diff --git a/src/Makefile.am b/src/Makefile.am
index a13223e..cf58aaa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,15 +1,17 @@
-SUBDIRS=trau
-
# This is _NOT_ the library release version, it's an API version.
# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification
-LIBVERSION=1:0:0
+ABIS_LIBVERSION=1:0:0
+TRAU_LIBVERSION=0:0:0
INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
-AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS)
+AM_LDFLAGS = $(COVERAGE_LDFLAGS)
+COMMONLIBS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS)
-lib_LTLIBRARIES = libosmoabis.la
+lib_LTLIBRARIES = libosmoabis.la libosmotrau.la
+libosmoabis_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ABIS_LIBVERSION)
+libosmoabis_la_LIBADD = $(COMMONLIBS)
libosmoabis_la_SOURCES = init.c \
e1_input.c \
e1_input_vty.c \
@@ -23,3 +25,8 @@
input/lapd.c \
input/misdn.c \
input/rs232.c
+
+libosmotrau_la_CFLAGS = $(AM_CFLAGS) $(ORTP_CFLAGS)
+libosmotrau_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(TRAU_LIBVERSION)
+libosmotrau_la_LIBADD = $(COMMONLIBS) $(ORTP_LIBS)
+libosmotrau_la_SOURCES = trau/osmo_ortp.c
diff --git a/src/trau/Makefile.am b/src/trau/Makefile.am
deleted file mode 100644
index 71a219c..0000000
--- a/src/trau/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-# This is _NOT_ the library release version, it's an API version.
-# Please read Chapter 6 "Library interface versions" of the libtool
-# documentation before making any modification
-LIBVERSION=0:0:0
-
-INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS= -Wall \
- $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) \
- $(ORTP_CFLAGS) $(COVERAGE_CFLAGS)
-AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) \
- $(ORTP_LIBS) $(COVERAGE_LDFLAGS)
-
-lib_LTLIBRARIES = libosmotrau.la
-
-libosmotrau_la_SOURCES = osmo_ortp.c