diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-23 17:48:28 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-23 17:57:35 -0300 |
| commit | 3ddae9eee9a8bc4c667a66a9b1db36b84edca436 (patch) | |
| tree | 02c5b3dfa2b9b786c43f566a82ee8c508c67d57a | |
| parent | 67b639b496268d1d2b0ec64978f754ab692c44d1 (diff) | |
| parent | 93d5b022a9fd3a1a1f9c521a1eac7f0410e05b81 (diff) | |
| download | ffmpeg-3ddae9eee9a8bc4c667a66a9b1db36b84edca436.tar.gz | |
Merge commit '93d5b022a9fd3a1a1f9c521a1eac7f0410e05b81'
* commit '93d5b022a9fd3a1a1f9c521a1eac7f0410e05b81':
build: Drop duplicate asm recipe
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | common.mak | 9 | ||||
| -rw-r--r-- | library.mak | 9 | ||||
| -rw-r--r-- | tests/checkasm/x86/Makefile | 5 |
3 files changed, 9 insertions, 14 deletions
diff --git a/common.mak b/common.mak index 7815c3f359..3c645adbfa 100644 --- a/common.mak +++ b/common.mak @@ -74,6 +74,15 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC) %_host.o: %.c $(COMPILE_HOSTC) +%$(DEFAULT_YASMD).asm: %.asm + $(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.asm=.d) + $(YASM) $(YASMFLAGS) -I $(<D)/ -e $< | sed '/^%/d;/^$$/d;' > $@ + +%.o: %.asm + $(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d) + $(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) + -$(if $(ASMSTRIPFLAGS), $(STRIP) $(ASMSTRIPFLAGS) $@) + %.o: %.rc $(WINDRES) $(IFLAGS) --preprocessor "$(DEPWINDRES) -E -xc-header -DRC_INVOKED $(CC_DEPFLAGS)" -o $@ $< diff --git a/library.mak b/library.mak index d8c2b63234..837b3600a9 100644 --- a/library.mak +++ b/library.mak @@ -10,15 +10,6 @@ INSTHEADERS := $(INSTHEADERS) $(HEADERS:%=$(SUBDIR)%) all-$(CONFIG_STATIC): $(SUBDIR)$(LIBNAME) all-$(CONFIG_SHARED): $(SUBDIR)$(SLIBNAME) -$(SUBDIR)x86/%$(DEFAULT_YASMD).asm: $(SUBDIR)x86/%.asm - $(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.asm=.d) - $(YASM) $(YASMFLAGS) -I $(<D)/ -e $< | sed '/^%/d;/^$$/d;' > $@ - -$(SUBDIR)x86/%.o: $(SUBDIR)x86/%$(YASMD).asm - $(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d) - $(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) - -$(if $(ASMSTRIPFLAGS), $(STRIP) $(ASMSTRIPFLAGS) $@) - LIBOBJS := $(OBJS) $(SUBDIR)%.h.o $(TESTOBJS) $(LIBOBJS) $(LIBOBJS:.o=.s) $(LIBOBJS:.o=.i): CPPFLAGS += -DHAVE_AV_CONFIG_H $(TESTOBJS) $(TESTOBJS:.o=.i): CFLAGS += -Umain diff --git a/tests/checkasm/x86/Makefile b/tests/checkasm/x86/Makefile index befe088dcf..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) $(ASMSTRIPFLAGS) $@ |