update sources to v12.1.1

[ceph.git] / ceph / src / isa-l / Makefile.am

diff --git a/ceph/src/isa-l/Makefile.am b/ceph/src/isa-l/Makefile.am
index 995259ed0cf0b299c083f4354b8fa8ec1ea3a345..e0edfa3f605c5b033ac25d5a3b62f5514c764790 100644 (file)
--- a/ceph/src/isa-l/Makefile.am
+++ b/ceph/src/isa-l/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = autogen.sh Makefile.unx make.inc Makefile.nmake isa-l.def LICENSE README.md
+EXTRA_DIST = autogen.sh Makefile.unx make.inc Makefile.nmake isa-l.def LICENSE README.md Doxyfile CONTRIBUTING.md
 CLEANFILES =
 LDADD =
 AM_MAKEFLAGS = --no-print-directory
@@ -6,9 +6,9 @@ noinst_HEADERS =
 pkginclude_HEADERS = include/test.h
 noinst_LTLIBRARIES =
 INCLUDE = -I $(srcdir)/include/
-AM_CFLAGS = ${my_CFLAGS} ${INCLUDE} ${D}
 
 lsrc=
+src_include=
 extern_hdrs=
 other_src=
 check_tests=
@@ -18,6 +18,9 @@ unit_tests_extra=
 perf_tests_extra=
 examples=
 other_tests=
+lsrc_x86_64=
+lsrc_x86_32=
+lsrc_base_aliases=
 lsrc32=
 unit_tests32=
 perf_tests32=
@@ -31,12 +34,25 @@ include igzip/Makefile.am
 
 # LIB version info not necessarily the same as package version
 LIBISAL_CURRENT=2
-LIBISAL_REVISION=16
+LIBISAL_REVISION=18
 LIBISAL_AGE=0
 
 lib_LTLIBRARIES = libisal.la
 pkginclude_HEADERS += $(sort ${extern_hdrs})
 libisal_la_SOURCES = ${lsrc}
+
+if CPU_X86_64
+libisal_la_SOURCES += ${lsrc_x86_64}
+endif
+
+if CPU_X86_32
+libisal_la_SOURCES += ${lsrc_x86_32}
+endif
+
+if CPU_UNDEFINED
+libisal_la_SOURCES += ${lsrc_base_aliases}
+endif
+
 nobase_include_HEADERS = isa-l.h
 libisal_la_LDFLAGS = $(AM_LDFLAGS) \
        -version-info $(LIBISAL_CURRENT):$(LIBISAL_REVISION):$(LIBISAL_AGE)
@@ -59,6 +75,7 @@ CLEANFILES += ${EXTRA_PROGRAMS}
 
 perfs: ${perf_tests}
 tests: ${unit_tests}
+checks: ${check_tests}
 other: ${other_tests}
 perf: $(addsuffix .run,$(perf_tests))
 ex: ${examples}
@@ -75,12 +92,13 @@ if USE_YASM
 endif
 if USE_NASM
   as_filter = ${srcdir}/tools/nasm-filter.sh
-  as_include = $(addprefix -I ${srcdir}/,$(sort $(dir $(lsrc))))
 endif
 
 CCAS = $(as_filter)
 EXTRA_DIST += tools/yasm-filter.sh tools/nasm-filter.sh
-AM_CCASFLAGS = ${yasm_args} ${INCLUDE} ${as_include} ${DEFS} ${D}
+
+AM_CFLAGS = ${my_CFLAGS} ${INCLUDE} $(src_include) ${D}
+AM_CCASFLAGS = ${yasm_args} ${INCLUDE} ${src_include} ${DEFS} ${D}
 
 .asm.s:
        @echo "  MKTMP   " $@;
@@ -104,9 +122,7 @@ isa-l.h:
        @for unit in $(sort $(extern_hdrs)); do echo "#include <isa-l/$$unit>" | sed -e 's;include/;;' >> $@; done
        @echo '#endif //_ISAL_H_'       >> $@
 
-
-license   = bsd
-licc      = $(srcdir)/doc/license_$(license)_c.txt
-lica      = $(srcdir)/doc/license_$(license)_asm.txt
-licm      = $(srcdir)/doc/license_$(license)_make.txt
-
+doc: isa-l.h
+       (cat Doxyfile; echo 'PROJECT_NUMBER=${VERSION}') | doxygen -
+       $(MAKE) -C generated_doc/latex &> generated_doc/latex_build_api.log
+       cp generated_doc/latex/refman.pdf isa-l_api_${VERSION}.pdf