Add $(ELIBS) to example/test app link command

Originally committed as revision 18298 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 00e1ae5..aad67cc 100644 (file)
--- 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 7343f54..7148ce6 100644 (file)
--- 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 $$@ $$^