diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-31 00:34:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-31 00:34:47 +0200 |
| commit | 8400607267458371398b0d3f170b6c0d9c688453 (patch) | |
| tree | 9718930996019f0c92959c5a7cf90f649e615ed4 /subdir.mak | |
| parent | 3b5ddf07c0c4ab6a0d347d92ff8d9cfbac6b66ed (diff) | |
| parent | 8a54bfe83f3387072fb2044096d073c973739ed1 (diff) | |
| download | ffmpeg-8400607267458371398b0d3f170b6c0d9c688453.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: make examples build normally
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'subdir.mak')
| -rw-r--r-- | subdir.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/subdir.mak b/subdir.mak index c12ec392e6..9ac824fd0a 100644 --- a/subdir.mak +++ b/subdir.mak @@ -34,7 +34,7 @@ install-libs-$(CONFIG_STATIC): install-lib$(NAME)-static install-libs-$(CONFIG_SHARED): install-lib$(NAME)-shared define RULES -$(TESTPROGS) $(TOOLS): %$(EXESUF): %.o +$(EXAMPLES) $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o $$(LD) $(LDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS) $$(ELIBS) $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR) |