summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-08-29 18:13:00 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-08-29 18:13:00 +0200
commit8579d4b2f0cc7d46dc75e0a0e42d556d653463fc (patch)
tree8ab65fc1ed0ff0371f552430a33f5ebf57bc5dea /Makefile
parent1c66807636ed8da5cf81d75cc8bb2726c6d6bc21 (diff)
parent7baa115a33ab516c85ac94f6c5cdaee73e65ddf8 (diff)
downloadffmpeg-streaming-8579d4b2f0cc7d46dc75e0a0e42d556d653463fc.zip
ffmpeg-streaming-8579d4b2f0cc7d46dc75e0a0e42d556d653463fc.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: build: export filtered -lz flag in config.mak build: add separate setting for host linker configure: probe_cc: use separate variable for linker output flag x86: Always compile files with functions that are called unconditionally x86: mpegvideoenc: fix linking with --disable-mmx x86: mpegvideoenc: Do not abuse HAVE_ variables for template instantiation Conflicts: Makefile configure libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 70d2190..ba7ce91 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,7 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF)
$(TOOLS): %$(EXESUF): %.o
$(LD) $(LDFLAGS) $(LD_O) $< $(ELIBS)
-tools/cws2fws$(EXESUF): ELIBS = -lz
+tools/cws2fws$(EXESUF): ELIBS = $(ZLIB)
config.h: .config
.config: $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c))
OpenPOWER on IntegriCloud