RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-12 02:19:35 +00:00
Code Issues Projects Releases Wiki Activity

build: Drop duplicate asm recipe

Browse Source 
And move the asm recipe to the top-level Makefile next to the other
local pattern rules for .o files.
This commit is contained in:
Diego Biurrun 2016-10-08 16:48:29 +02:00
parent c91d6a33f8
commit 93d5b022a9
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -56,6 +56,11 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC)
%_host.o: %.c %_host.o: %.c
$(COMPILE_HOSTC) $(COMPILE_HOSTC)
%.o: %.asm
$(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d)
$(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $<
-$(STRIP) $(STRIPFLAGS) $@
%.i: %.c %.i: %.c
$(CC) $(CCFLAGS) $(CC_E) $< $(CC) $(CCFLAGS) $(CC_E) $<

5
library.mak
View File

@ -10,11 +10,6 @@ INSTHEADERS := $(INSTHEADERS) $(HEADERS:%=$(SUBDIR)%)
all-$(CONFIG_STATIC): $(SUBDIR)$(LIBNAME) all-$(CONFIG_STATIC): $(SUBDIR)$(LIBNAME)
all-$(CONFIG_SHARED): $(SUBDIR)$(SLIBNAME) all-$(CONFIG_SHARED): $(SUBDIR)$(SLIBNAME)
$(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm
$(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d)
$(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $<
-$(STRIP) $(STRIPFLAGS) $@
LIBOBJS := $(OBJS) $(SUBDIR)%.h.o $(TESTOBJS) LIBOBJS := $(OBJS) $(SUBDIR)%.h.o $(TESTOBJS)
$(LIBOBJS) $(LIBOBJS:.o=.i): CPPFLAGS += -DHAVE_AV_CONFIG_H $(LIBOBJS) $(LIBOBJS:.o=.i): CPPFLAGS += -DHAVE_AV_CONFIG_H

5
tests/checkasm/x86/Makefile
View File

@ -1,6 +1 @@
CHECKASMOBJS-$(HAVE_YASM) += x86/checkasm.o CHECKASMOBJS-$(HAVE_YASM) += x86/checkasm.o
tests/checkasm/x86/%.o: tests/checkasm/x86/%.asm
$(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d)
$(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $<
-$(STRIP) $(STRIPFLAGS) $@