diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-13 21:36:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-13 22:40:32 +0200 |
| commit | 3d7218d932923e2b964fef37e8993fd0a6df7c1d (patch) | |
| tree | 8d84104fd947b896e3879276a85c0f98f80fa191 /common.mak | |
| parent | d90ba411aba28ebaced788f0810e082d9525bc13 (diff) | |
| parent | 449511740f06a4675b0066730fa45cdb764ffafc (diff) | |
| download | ffmpeg-3d7218d932923e2b964fef37e8993fd0a6df7c1d.tar.gz | |
Merge commit '449511740f06a4675b0066730fa45cdb764ffafc'
* commit '449511740f06a4675b0066730fa45cdb764ffafc':
build: handle library dependencies in configure
Conflicts:
common.mak
configure
libavdevice/Makefile
libavfilter/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'common.mak')
| -rw-r--r-- | common.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common.mak b/common.mak index cdad4f37b5..eaa6b47117 100644 --- a/common.mak +++ b/common.mak @@ -93,7 +93,7 @@ include $(SRC_PATH)/arch.mak OBJS += $(OBJS-yes) SLIBOBJS += $(SLIBOBJS-yes) -FFLIBS := $(FFLIBS-yes) $(FFLIBS) +FFLIBS := $(FFLIBS-$(NAME)) $(FFLIBS-yes) $(FFLIBS) TESTPROGS += $(TESTPROGS-yes) LDLIBS = $(FFLIBS:%=%$(BUILDSUF)) |