We currently use a mix of full path and -I assembler command line flags.
---
This is a simplification related to the pending assembly language
build refactoring work.
Makefile | 4 ++--
libavresample/x86/audio_convert.asm | 2 +-
libavresample/x86/audio_mix.asm | 2 +-
libavutil/x86/cpuid.asm | 2 +-
libavutil/x86/emms.asm | 2 +-
libavutil/x86/float_dsp.asm | 2 +-
libavutil/x86/lls.asm | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index e860f2c..4237b31 100644
--- a/Makefile
+++ b/Makefile
@@ -57,8 +57,8 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC)
$(COMPILE_HOSTC)
%.o: %.asm
- $(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d)
- $(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $<
+ $(DEPYASM) $(YASMFLAGS) -M -o $@ $< > $(@:.o=.d)
+ $(YASM) $(YASMFLAGS) -o $@ $<
-$(STRIP) $(STRIPFLAGS) $@
%.i: %.c
diff --git a/libavresample/x86/audio_convert.asm
b/libavresample/x86/audio_convert.asm
index 28f05a2..addfce0 100644
--- a/libavresample/x86/audio_convert.asm
+++ b/libavresample/x86/audio_convert.asm
@@ -21,7 +21,7 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
-%include "util.asm"
+%include "libavresample/x86/util.asm"
SECTION_RODATA 32
diff --git a/libavresample/x86/audio_mix.asm b/libavresample/x86/audio_mix.asm
index 13a04c6..ac22595 100644
--- a/libavresample/x86/audio_mix.asm
+++ b/libavresample/x86/audio_mix.asm
@@ -20,7 +20,7 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
-%include "util.asm"
+%include "libavresample/x86/util.asm"
SECTION .text
diff --git a/libavutil/x86/cpuid.asm b/libavutil/x86/cpuid.asm
index 1cb8e94..9430da0 100644
--- a/libavutil/x86/cpuid.asm
+++ b/libavutil/x86/cpuid.asm
@@ -21,7 +21,7 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
-%include "x86util.asm"
+%include "libavutil/x86/x86util.asm"
SECTION .text
diff --git a/libavutil/x86/emms.asm b/libavutil/x86/emms.asm
index 05557de..b0faec2 100644
--- a/libavutil/x86/emms.asm
+++ b/libavutil/x86/emms.asm
@@ -18,7 +18,7 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
-%include "x86util.asm"
+%include "libavutil/x86/x86util.asm"
SECTION .text
diff --git a/libavutil/x86/float_dsp.asm b/libavutil/x86/float_dsp.asm
index d962499..f81a8f0 100644
--- a/libavutil/x86/float_dsp.asm
+++ b/libavutil/x86/float_dsp.asm
@@ -18,7 +18,7 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
-%include "x86util.asm"
+%include "libavutil/x86/x86util.asm"
SECTION .text
diff --git a/libavutil/x86/lls.asm b/libavutil/x86/lls.asm
index eab85ed..5e54f12 100644
--- a/libavutil/x86/lls.asm
+++ b/libavutil/x86/lls.asm
@@ -20,7 +20,7 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
-%include "x86util.asm"
+%include "libavutil/x86/x86util.asm"
SECTION .text
--
2.1.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
