diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-03-07 10:52:22 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-03-07 10:52:22 +0100 |
| commit | 6f7bcc52a06a255c6cbd8d683ec13a36be4608ab (patch) | |
| tree | 8ea2206f67014874ee7e7786ea5ccc338d371f76 /Makefile.am | |
| parent | 7284422f3a907724af91de827b2d32220d0d4ba1 (diff) | |
| parent | 58d7fcd0db89cdc62e9362aa6d63c88843f2837d (diff) | |
| download | fdk-aac-6f7bcc52a06a255c6cbd8d683ec13a36be4608ab.tar.gz fdk-aac-6f7bcc52a06a255c6cbd8d683ec13a36be4608ab.tar.bz2 fdk-aac-6f7bcc52a06a255c6cbd8d683ec13a36be4608ab.zip | |
Merge branch 'master' into alsa
Conflicts:
Makefile.am
configure.ac
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 1691a47..e6ec457 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,17 +33,19 @@ libfdk_aac_la_CXXFLAGS = -fno-exceptions -fno-rtti libfdk_aac_la_LDFLAGS = -version-info @FDK_AAC_VERSION@ -no-undefined \ -export-symbols $(top_srcdir)/fdk-aac.sym -if EXAMPLE - aac_enc_LDADD = libfdk-aac.la aac_enc_SOURCES = aac-enc.c wavreader.c aac_enc_dabplus_LDADD = libfdk-aac.la -lfec aac_enc_dabplus_SOURCES = aac-enc-dabplus.c wavreader.c -if HAVE_ZEROMQ_TEST aac_enc_dabplus_zmq_LDADD = libfdk-aac.la -lfec -lzmq -aac_enc_dabplus_zmq_SOURCES = aac-enc-dabplus-zmq.c wavreader.c +aac_enc_dabplus_zmq_SOURCES = aac-enc-dabplus-zmq.c wavreader.c \ + contrib/lib_crc.c + +mot_encoder_CFLAGS = @MAGICKWAND_CPPFLAGS@ -Icontrib +mot_encoder_LDADD = @MAGICKWAND_LDADD@ +mot_encoder_SOURCES = mot-encoder.c contrib/lib_crc.c alsa_dabplus_zmq_LDADD = libfdk-aac.la -lfec -lzmq -lasound alsa_dabplus_zmq_SOURCES = alsa-dabplus-zmq.c @@ -61,14 +63,10 @@ bin_PROGRAMS = aac-enc$(EXEEXT) \ aac-enc-dabplus$(EXEEXT) \ aac-enc-dabplus-zmq$(EXEEXT) \ alsa-dabplus-zmq$(EXEEXT) \ - dabplus-zmq$(EXEEXT) - -else -bin_PROGRAMS = aac-enc$(EXEEXT) aac-enc-dabplus$(EXEEXT) -endif + dabplus-zmq$(EXEEXT) \ + mot-encoder$(EXEEXT) noinst_HEADERS = wavreader.h -endif AACDEC_SRC = \ libAACdec/src/aacdec_drc.cpp \ |