Michael Niedermayer | 9 Aug 2012 03:57
Favicon

common.mak: add forgotten hunk from last merge

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Thu Aug  9 03:46:43 2012 +0200|
[b41d481aa4ee6ec916f7bea35dcaf8d35c0a19c1] | committer: Michael Niedermayer

common.mak: add forgotten hunk from last merge

Found-by: jamal <jamrial <at> gmail.com>
Author of the hunk: Mans Rullgard <mans <at> mansr.com>
Signed-off-by: Michael Niedermayer <michaelni <at> gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b41d481aa4ee6ec916f7bea35dcaf8d35c0a19c1
---

 common.mak |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common.mak b/common.mak
index ab937e7..43935e7 100644
--- a/common.mak
+++ b/common.mak
 <at>  <at>  -56,8 +56,8  <at>  <at>  COMPILE_S = $(call COMPILE,AS)
 %.o: %.S
 	$(COMPILE_S)

-%.ho: %.h
-	$(CC) $(CCFLAGS) -c $(CC_O) -x c $<
+%.h.c:
+	$(Q)echo '#include "$*.h"' >$ <at> 

 %.ver: %.v
 	$(Q)sed 's/$$MAJOR/$($(basename $( <at> F))_VERSION_MAJOR)/' $^ > $ <at> 
(Continue reading)


Gmane