diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-20 03:33:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-20 03:33:30 +0200 |
| commit | 9e6769d2dc7bb33a2317b85fb55239958119e78c (patch) | |
| tree | 82baedf2c8b3d7a6ef6bd1d930e03afef2428ba9 /common.mak | |
| parent | 447b988b53191238c3de402dd8729540f639d5ad (diff) | |
| parent | afe176265480880e1f702c96a8ba434b0d88728b (diff) | |
| download | ffmpeg-9e6769d2dc7bb33a2317b85fb55239958119e78c.tar.gz | |
Merge commit 'afe176265480880e1f702c96a8ba434b0d88728b'
* commit 'afe176265480880e1f702c96a8ba434b0d88728b':
build: export library dependencies in ${name}_FFLIBS
Conflicts:
common.mak
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 18b5463d5b..a493792657 100644 --- a/common.mak +++ b/common.mak @@ -93,7 +93,7 @@ include $(SRC_PATH)/arch.mak OBJS += $(OBJS-yes) SLIBOBJS += $(SLIBOBJS-yes) -FFLIBS := $(FFLIBS-$(if $(NAME),$(NAME),no)) $(FFLIBS-yes) $(FFLIBS) +FFLIBS := $($(NAME)_FFLIBS) $(FFLIBS-yes) $(FFLIBS) TESTPROGS += $(TESTPROGS-yes) LDLIBS = $(FFLIBS:%=%$(BUILDSUF)) |