Merge commit 'f890677d05bc4e8b494a73373ab4cc19791bf884'

[ffmpeg] / common.mak

diff --git a/common.mak b/common.mak
index 7569d35bb139cc9208e39b8344c33d84947515e5..d611ef8cad62f8237def979d4085da8cac88daf9 100644 (file)
--- a/common.mak
+++ b/common.mak
@@ -81,7 +81,9 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC)
        $(Q)echo '#include "$*.h"' >$@
 
 %.ver: %.v
-       $(Q)sed 's/$$MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ > $@
+       $(Q)sed 's/$$MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ | sed -e 's/:/:\
+/' -e 's/; /;\
+/g' > $@
 
 %.c %.h: TAG = GEN
 
@@ -147,7 +149,7 @@ $(TOOLOBJS): | tools
 
 OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(SLIBOBJS) $(TESTOBJS))
 
-CLEANSUFFIXES     = *.d *.o *~ *.h.c *.map *.ver *.ho *.gcno *.gcda *$(DEFAULT_YASMD).asm
+CLEANSUFFIXES     = *.d *.o *~ *.h.c *.map *.ver *.ver-sol2 *.ho *.gcno *.gcda *$(DEFAULT_YASMD).asm
 DISTCLEANSUFFIXES = *.pc
 LIBSUFFIXES       = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a