git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
3b5ddf0
)
Merge remote-tracking branch 'qatar/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 30 Jul 2011 22:34:34 +0000
(
00:34
+0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 30 Jul 2011 22:34:47 +0000
(
00:34
+0200)
* qatar/master:
build: make examples build normally
Merged-by: Michael Niedermayer <michaelni@gmx.at>
subdir.mak
patch
|
blob
|
history
diff --git
a/subdir.mak
b/subdir.mak
index
c12ec39
..
9ac824f
100644
(file)
--- 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)