[FFmpeg-cvslog] r12776 - in trunk: Makefile subdir.mak

mru subversion
Wed Apr 9 23:11:35 CEST 2008


Author: mru
Date: Wed Apr  9 23:11:35 2008
New Revision: 12776

Log:
fix build with --build-suffix


Modified:
   trunk/Makefile
   trunk/subdir.mak

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Wed Apr  9 23:11:35 2008
@@ -34,7 +34,7 @@ FF_LDFLAGS   := $(FFLDFLAGS)
 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

Modified: trunk/subdir.mak
==============================================================================
--- trunk/subdir.mak	(original)
+++ trunk/subdir.mak	Wed Apr  9 23:11:35 2008
@@ -34,7 +34,7 @@ $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS)
 
 ifdef SUBDIR
 $(SUBDIR)$(SLIBNAME_WITH_MAJOR): \
-    $(foreach L,$(FFLIBS),lib$(L)/$(SLIBPREF)$(L)$(SLIBSUF))
+    $(foreach NAME,$(FFLIBS),lib$(NAME)/$(SLIBNAME))
 endif
 endif
 




More information about the ffmpeg-cvslog mailing list