aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2014-03-07 11:07:25 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2014-03-07 11:07:25 +0100
commit5cb6703b20d269608eef98fbc107cb0b1136018e (patch)
tree7ae8f83319108da0400d9cd38560471693ad8482 /Makefile.am
parent6f7bcc52a06a255c6cbd8d683ec13a36be4608ab (diff)
parentb7ac85a604c8756aad0a5cc9be3b61e943e5c220 (diff)
downloadfdk-aac-dabplus-5cb6703b20d269608eef98fbc107cb0b1136018e.tar.gz
fdk-aac-dabplus-5cb6703b20d269608eef98fbc107cb0b1136018e.tar.bz2
fdk-aac-dabplus-5cb6703b20d269608eef98fbc107cb0b1136018e.zip
Merge branch 'master' into alsa
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index e6ec457..5e2e8b2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,7 @@ aac_enc_dabplus_zmq_LDADD = libfdk-aac.la -lfec -lzmq
aac_enc_dabplus_zmq_SOURCES = aac-enc-dabplus-zmq.c wavreader.c \
contrib/lib_crc.c
-mot_encoder_CFLAGS = @MAGICKWAND_CPPFLAGS@ -Icontrib
+mot_encoder_CFLAGS = @MAGICKWAND_CFLAGS@ -Icontrib
mot_encoder_LDADD = @MAGICKWAND_LDADD@
mot_encoder_SOURCES = mot-encoder.c contrib/lib_crc.c