[FFmpeg-cvslog] r18298 - in trunk: libavformat/Makefile subdir.mak

[mru]

Author: mru
Date: Wed Apr  1 02:53:34 2009
New Revision: 18298

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

Modified:
   trunk/libavformat/Makefile
   trunk/subdir.mak

Modified: trunk/libavformat/Makefile
==============================================================================
--- trunk/libavformat/Makefile	Wed Apr  1 02:53:31 2009	(r18297)
+++ trunk/libavformat/Makefile	Wed Apr  1 02:53:34 2009	(r18298)
@@ -247,3 +247,5 @@ EXAMPLES  = output
 TESTPROGS = timefilter
 
 include $(SUBDIR)../subdir.mak
+
+$(SUBDIR)output-example$(EXESUF): ELIBS = -lswscale

Modified: trunk/subdir.mak
==============================================================================
--- trunk/subdir.mak	Wed Apr  1 02:53:31 2009	(r18297)
+++ trunk/subdir.mak	Wed Apr  1 02:53:34 2009	(r18298)
@@ -22,7 +22,7 @@ THIS_LIB := $(SUBDIR)$($(BUILD_SHARED:ye
 
 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 $$@ $$^