Module: libav
Branch: master
Commit: 93d5b022a9fd3a1a1f9c521a1eac7f0410e05b81
Author: Diego Biurrun <di...@biurrun.de>
Committer: Diego Biurrun <di...@biurrun.de>
Date: Sat Oct 8 16:48:29 2016 +0200
build: Drop duplicate asm recipe
And move the asm recipe to the top-level Makefile next to the other
local pattern rules for .o files.
---
Makefile | 5 +++++
library.mak | 5 -----
tests/checkasm/x86/Makefile | 5 -----
3 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/Makefile b/Makefile
index 4e026b0..52cb0bd 100644
--- a/Makefile
+++ b/Makefile
@@ -56,6 +56,11 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC)
%_host.o: %.c
$(COMPILE_HOSTC)
+%.o: %.asm
+ $(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d)
+ $(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $<
+ -$(STRIP) $(STRIPFLAGS) $@
+
%.i: %.c
$(CC) $(CCFLAGS) $(CC_E) $<
diff --git a/library.mak b/library.mak
index 44087aa..b456d80 100644
--- a/library.mak
+++ b/library.mak
@@ -10,11 +10,6 @@ INSTHEADERS := $(INSTHEADERS) $(HEADERS:%=$(SUBDIR)%)
all-$(CONFIG_STATIC): $(SUBDIR)$(LIBNAME)
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) $(LIBOBJS:.o=.i): CPPFLAGS += -DHAVE_AV_CONFIG_H
diff --git a/tests/checkasm/x86/Makefile b/tests/checkasm/x86/Makefile
index 0254c61..e1bef76 100644
--- a/tests/checkasm/x86/Makefile
+++ b/tests/checkasm/x86/Makefile
@@ -1,6 +1 @@
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) $@
_______________________________________________
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
