diff options
| author | Måns Rullgård <mans@mansr.com> | 2009-04-01 00:53:34 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2009-04-01 00:53:34 +0000 |
| commit | 33afad545100315e86ca22a27067373379df3aa4 (patch) | |
| tree | d5ed4283d4fa8d0671784566bdf3e9a5528e388a | |
| parent | bbba084b4fcc36c0625368afe6e7586e4991de46 (diff) | |
| download | ffmpeg-33afad545100315e86ca22a27067373379df3aa4.tar.gz | |
Add $(ELIBS) to example/test app link command
Originally committed as revision 18298 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | subdir.mak | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 00e1ae5715..aad67cc056 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -247,3 +247,5 @@ EXAMPLES = output TESTPROGS = timefilter include $(SUBDIR)../subdir.mak + +$(SUBDIR)output-example$(EXESUF): ELIBS = -lswscale diff --git a/subdir.mak b/subdir.mak index 7343f548e0..7148ce6fcd 100644 --- a/subdir.mak +++ b/subdir.mak @@ -22,7 +22,7 @@ THIS_LIB := $(SUBDIR)$($(BUILD_SHARED:yes=S)LIBNAME) define RULES $(SUBDIR)%$(EXESUF): $(SUBDIR)%.o - $(CC) $(FFLDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS) + $(CC) $(FFLDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS) $$(ELIBS) $(SUBDIR)%-test.o: $(SUBDIR)%.c $(CC) $(CFLAGS) -DTEST -c -o $$@ $$^ |