diff options
| author | Diego Biurrun <diego@biurrun.de> | 2016-10-08 16:48:29 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2016-10-17 16:25:35 +0200 |
| commit | 93d5b022a9fd3a1a1f9c521a1eac7f0410e05b81 (patch) | |
| tree | 71908309521a4a6267ab3408f2c52881590f68f9 | |
| parent | c91d6a33f872574c95c8784277cf60ffcf6bff4f (diff) | |
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.
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | library.mak | 5 | ||||
| -rw-r--r-- | tests/checkasm/x86/Makefile | 5 |
3 files changed, 5 insertions, 10 deletions
@@ -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 44087aae1c..b456d80cd1 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 0254c61935..e1bef76017 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) $@ |