fix build with --build-suffix
authorMåns Rullgård <mans@mansr.com>
Wed, 9 Apr 2008 21:11:35 +0000 (21:11 +0000)
committerMåns Rullgård <mans@mansr.com>
Wed, 9 Apr 2008 21:11:35 +0000 (21:11 +0000)
Originally committed as revision 12776 to svn://svn.ffmpeg.org/ffmpeg/trunk

Makefile
subdir.mak

index cce125c..228e845 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ FF_LDFLAGS   := $(FFLDFLAGS)
 FF_EXTRALIBS := $(FFEXTRALIBS)
 
 S := $(BUILD_SHARED:yes=S)
 FF_EXTRALIBS := $(FFEXTRALIBS)
 
 S := $(BUILD_SHARED:yes=S)
-DEP_LIBS := $(foreach L,$(FFLIBS),lib$(L)/$($(S)LIBPREF)$(L)$($(S)LIBSUF))
+DEP_LIBS := $(foreach NAME,$(FFLIBS),lib$(NAME)/$($(S)LIBNAME))
 
 ALL_TARGETS-$(CONFIG_VHOOK) += videohook
 ALL_TARGETS-$(BUILD_DOC)    += documentation
 
 ALL_TARGETS-$(CONFIG_VHOOK) += videohook
 ALL_TARGETS-$(BUILD_DOC)    += documentation
index 5b92f78..f78d3cb 100644 (file)
@@ -34,7 +34,7 @@ $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS)
 
 ifdef SUBDIR
 $(SUBDIR)$(SLIBNAME_WITH_MAJOR): \
 
 ifdef SUBDIR
 $(SUBDIR)$(SLIBNAME_WITH_MAJOR): \
-    $(foreach L,$(FFLIBS),lib$(L)/$(SLIBPREF)$(L)$(SLIBSUF))
+    $(foreach NAME,$(FFLIBS),lib$(NAME)/$(SLIBNAME))
 endif
 endif
 
 endif
 endif