diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2020-03-31 10:03:58 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2020-03-31 10:03:58 +0200 |
| commit | a1eb6cf861d3c1cbd4e6c016be3cbd2a1e3d797d (patch) | |
| tree | 2b4790eec8f47fb086e645717f07c53b30ace919 /Makefile.am | |
| parent | 2f84a54ec1d10b10293c7b1f4ab9fee31f3c6327 (diff) | |
| parent | c6a73c219dbfdfe639372d9922f4eb512f06fa2f (diff) | |
| download | ODR-AudioEnc-a1eb6cf861d3c1cbd4e6c016be3cbd2a1e3d797d.tar.gz ODR-AudioEnc-a1eb6cf861d3c1cbd4e6c016be3cbd2a1e3d797d.tar.bz2 ODR-AudioEnc-a1eb6cf861d3c1cbd4e6c016be3cbd2a1e3d797d.zip | |
Merge GStreamer into next
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 825e0f6..d05aa7f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,8 @@ ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = subdir-objects +SUBDIRS = fdk-aac + if IS_GIT_REPO GITVERSION_FLAGS = -DGITVERSION="\"`git describe --dirty`\"" else @@ -74,13 +76,12 @@ FEC_SOURCES = contrib/fec/char.h \ odr_audioenc_LDFLAGS = -no-install odr_audioenc_LDADD = libtoolame-dab.la \ + fdk-aac/libfdk-aac-dab.la \ -lzmq \ $(odr_audioenc_LDADD_JACK) \ $(odr_audioenc_LDADD_ALSA) \ - $(LIBVLC_LIBS) $(LIBFDKAAC_LIBS) \ - $(GST_LIBS) -odr_audioenc_CXXFLAGS = $(LIBFDKAAC_CFLAGS) $(GITVERSION_FLAGS) \ - $(GST_CFLAGS) \ + $(LIBVLC_LIBS) $(GST_LIBS) +odr_audioenc_CXXFLAGS = $(GST_CFLAGS) $(GITVERSION_FLAGS) \ -Wall -ggdb -O2 -Isrc -Icontrib odr_audioenc_SOURCES = src/odr-audioenc.cpp \ @@ -167,6 +168,7 @@ libtoolame_dab_la_SOURCES = \ EXTRA_DIST = $(top_srcdir)/bootstrap \ $(top_srcdir)/README.md \ + $(top_srcdir)/TODO.md \ $(top_srcdir)/ChangeLog \ $(top_srcdir)/libtoolame-dab.sym \ $(top_srcdir)/Doxyfile \ |