[SCM] libav/experimental: LDFLAGS_$@ contains libs, not LDFLAGS, rename it accordingly.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:50:36 UTC 2013


The following commit has been merged in the experimental branch:
commit 3c573748946cfbd68334f071069f6b23d5cffe69
Author: Diego Biurrun <diego at biurrun.de>
Date:   Thu Sep 7 23:06:14 2006 +0000

    LDFLAGS_$@ contains libs, not LDFLAGS, rename it accordingly.
    
    Originally committed as revision 6193 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/vhook/Makefile b/vhook/Makefile
index 60ff0be..3bb5561 100644
--- a/vhook/Makefile
+++ b/vhook/Makefile
@@ -10,13 +10,13 @@ ALLHOOKS=$(HOOKS) imlib2$(SLIBSUF) drawtext$(SLIBSUF)
 
 ifeq ($(HAVE_IMLIB2),yes)
     HOOKS += imlib2$(SLIBSUF)
-    LDFLAGS_imlib2$(SLIBSUF) = -lImlib2
+    LIBS_imlib2$(SLIBSUF) = -lImlib2
 endif
 
 ifeq ($(HAVE_FREETYPE2),yes)
     HOOKS += drawtext$(SLIBSUF)
     CFLAGS += `freetype-config --cflags`
-    LDFLAGS_drawtext$(SLIBSUF) = `freetype-config --libs`
+    LIBS_drawtext$(SLIBSUF) = `freetype-config --libs`
 endif
 
 SRCS := $(HOOKS:$(SLIBSUF)=.c)
@@ -35,7 +35,7 @@ uninstall:
 	-rmdir "$(shlibdir)/vhook/"
 
 %$(SLIBSUF): %.o
-	$(CC) $(LDFLAGS) -g -o $@ $(VHOOKSHFLAGS) $< $(LDFLAGS_$@)
+	$(CC) $(LDFLAGS) -g -o $@ $(VHOOKSHFLAGS) $< $(LIBS_$@)
 
 clean:
 	rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list