From 33afad545100315e86ca22a27067373379df3aa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Wed, 1 Apr 2009 00:53:34 +0000 Subject: [PATCH] Add $(ELIBS) to example/test app link command Originally committed as revision 18298 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/Makefile | 2 ++ subdir.mak | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 $$@ $$^