From 808c7a7cd6004b0c039b00e0e9830027f424ab62 Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Tue, 12 May 2020 16:45:33 +0200 Subject: Statically link toolame-dab and fdk-aac-dab ODR-AudioEnc is the only tool using those two libraries, and statically linking makes deployment simpler. --- Makefile.am | 65 +++++++++++++++++++++++++++---------------------------------- 1 file changed, 29 insertions(+), 36 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 29ac878..44b2fab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,9 +9,6 @@ else GITVERSION_FLAGS = endif -libtoolame_dab_la_LINK = $(LINK) $(libtoolame_dab_la_LDFLAGS) -# Mention a dummy pure C file to trigger generation of the $(LINK) variable - toolame_dabincludedir = $(includedir)/libtoolame-dab toolame_dabinclude_HEADERS = \ $(top_srcdir)/libtoolame-dab/absthr.h \ @@ -45,14 +42,35 @@ toolame_dabinclude_HEADERS = \ $(top_srcdir)/libtoolame-dab/toolame.h \ $(top_srcdir)/libtoolame-dab/utils.h -pkgconfigdir = $(libdir)/pkgconfig +noinst_LIBRARIES = libtoolame-dab.a + +libtoolame_dab_a_SOURCES = \ + libtoolame-dab/common.c \ + libtoolame-dab/encode.c \ + libtoolame-dab/ieeefloat.c \ + libtoolame-dab/toolame.c \ + libtoolame-dab/portableio.c \ + libtoolame-dab/psycho_n1.c \ + libtoolame-dab/psycho_0.c \ + libtoolame-dab/psycho_1.c \ + libtoolame-dab/psycho_2.c \ + libtoolame-dab/psycho_3.c \ + libtoolame-dab/psycho_4.c \ + libtoolame-dab/fft.c \ + libtoolame-dab/subband.c \ + libtoolame-dab/bitstream.c \ + libtoolame-dab/mem.c \ + libtoolame-dab/crc.c \ + libtoolame-dab/tables.c \ + libtoolame-dab/availbits.c \ + libtoolame-dab/ath.c \ + libtoolame-dab/encode_new.c \ + libtoolame-dab/utils.c -lib_LTLIBRARIES = libtoolame-dab.la -libtoolame_dab_la_CFLAGS = -fomit-frame-pointer -DNEWENCODE -std=c99 -libtoolame_dab_la_LDFLAGS = -version-info @LIBTOOLAME_DAB_VERSION@ \ - -no-undefined \ - -export-symbols $(top_srcdir)/libtoolame-dab.sym +libtoolame_dab_a_CFLAGS = -fomit-frame-pointer -DNEWENCODE -std=c99 + +pkgconfigdir = $(libdir)/pkgconfig if HAVE_JACK odr_audioenc_LDADD_JACK = -ljack @@ -74,9 +92,8 @@ FEC_SOURCES = contrib/fec/char.h \ contrib/fec/rs-common.h -odr_audioenc_LDFLAGS = -no-install -odr_audioenc_LDADD = libtoolame-dab.la \ - fdk-aac/libfdk-aac-dab.la \ +odr_audioenc_LDADD = libtoolame-dab.a \ + fdk-aac/libfdk-aac-dab.a \ -lzmq \ $(odr_audioenc_LDADD_JACK) \ $(odr_audioenc_LDADD_ALSA) \ @@ -145,30 +162,6 @@ bin_PROGRAMS = odr-audioenc$(EXEEXT) noinst_HEADERS = src/wavfile.h -libtoolame_dab_la_SOURCES = \ - libtoolame-dab/common.c \ - libtoolame-dab/encode.c \ - libtoolame-dab/ieeefloat.c \ - libtoolame-dab/toolame.c \ - libtoolame-dab/portableio.c \ - libtoolame-dab/psycho_n1.c \ - libtoolame-dab/psycho_0.c \ - libtoolame-dab/psycho_1.c \ - libtoolame-dab/psycho_2.c \ - libtoolame-dab/psycho_3.c \ - libtoolame-dab/psycho_4.c \ - libtoolame-dab/fft.c \ - libtoolame-dab/subband.c \ - libtoolame-dab/bitstream.c \ - libtoolame-dab/mem.c \ - libtoolame-dab/crc.c \ - libtoolame-dab/tables.c \ - libtoolame-dab/availbits.c \ - libtoolame-dab/ath.c \ - libtoolame-dab/encode_new.c \ - libtoolame-dab/utils.c - - EXTRA_DIST = $(top_srcdir)/bootstrap \ $(top_srcdir)/README.md \ $(top_srcdir)/TODO.md \ -- cgit v1.2.3