From f27facbb16a3c8838c9721ffc3cfc5eebdaf32c5 Mon Sep 17 00:00:00 2001 From: Con Kolivas Date: Mon, 15 Feb 2021 22:45:37 +1100 Subject: [PATCH] Fix distdir to include ASM files. --- configure.ac | 1 + lzma/ASM/x86/Makefile.am | 8 ++++++++ lzma/C/Makefile.am | 3 +-- lzma/Makefile.am | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 lzma/ASM/x86/Makefile.am diff --git a/configure.ac b/configure.ac index e4c3de9..38a28b7 100644 --- a/configure.ac +++ b/configure.ac @@ -151,6 +151,7 @@ Makefile lrzip.pc lzma/Makefile lzma/C/Makefile +lzma/ASM/x86/Makefile doc/Makefile man/Makefile ]) diff --git a/lzma/ASM/x86/Makefile.am b/lzma/ASM/x86/Makefile.am new file mode 100644 index 0000000..0b17c6e --- /dev/null +++ b/lzma/ASM/x86/Makefile.am @@ -0,0 +1,8 @@ +MAINTAINERCLEANFILES = Makefile.in + +lzmaasm_DATA = \ + 7zAsm.asm \ + 7zCrcOpt_asm.asm + +EXTRA_DIST = $(lzmaasm_DATA) +lzmaasmdir = @abs_top_srcdir@/lzma/ASM/x86/ diff --git a/lzma/C/Makefile.am b/lzma/C/Makefile.am index d20660a..3d87335 100644 --- a/lzma/C/Makefile.am +++ b/lzma/C/Makefile.am @@ -44,8 +44,7 @@ liblzma_la_SOURCES = \ windows.h \ basetyps.h \ MyWindows.h \ - MyGuidDef.h \ - $(ASM_S) $(ASM_H) + MyGuidDef.h ## hack to force asm compilation and to trick libtool with .lo file if USE_ASM diff --git a/lzma/Makefile.am b/lzma/Makefile.am index 7489e1d..d4f97f0 100644 --- a/lzma/Makefile.am +++ b/lzma/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = C +SUBDIRS = C ASM/x86 MAINTAINERCLEANFILES = Makefile.in lzmadocdir = @docdir@/lzma