mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-21 01:04:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add missing entries, remove m4 reference

Browse Source
This commit is contained in:
Allen Byrne 2020-11-12 09:35:17 -06:00
parent 04e50c876c
commit 142a1d76bb
5 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -365,6 +365,7 @@ m4/ax_check_rqrd_class.m4 -text
m4/ax_java_check_class.m4 -text
m4/ax_java_options.m4 -text
m4/ax_jni_include_dir.m4 -text
m4/ax_prog_doxygen.m4 -text
m4/ax_prog_jar.m4 -text
m4/ax_prog_java.m4 -text
m4/ax_prog_java_cc.m4 -text

1
MANIFEST
View File

@ -50,6 +50,7 @@
./m4/ax_java_check_class.m4
./m4/ax_java_options.m4
./m4/ax_jni_include_dir.m4
./m4/ax_prog_doxygen.m4
./m4/ax_prog_jar.m4
./m4/ax_prog_java_cc.m4
./m4/ax_prog_java_works.m4

19
configure.ac
View File

@ -1024,7 +1024,10 @@ AC_ARG_ENABLE([tests],
[HDF5_TESTS=$enableval])
if test "X$HDF5_TESTS" = "Xno"; then
AC_MSG_RESULT([yes])
echo "Building HDF5 tests is disabled"
else
AC_MSG_RESULT([no])
fi
## ----------------------------------------------------------------------
@ -1045,7 +1048,10 @@ AC_ARG_ENABLE([tools],
[HDF5_TOOLS=$enableval])
if test "X$HDF5_TOOLS" = "Xno"; then
AC_MSG_RESULT([yes])
echo "Building HDF5 tools is disabled"
else
AC_MSG_RESULT([no])
fi
## ----------------------------------------------------------------------
@ -1066,15 +1072,16 @@ AC_ARG_ENABLE([doxygen],
[HDF5_DOXYGEN=$enableval])
if test "X$HDF5_DOXYGEN" = "Xyes"; then
AC_MSG_RESULT([yes])
DX_DOXYGEN_FEATURE(ON)
DX_DOT_FEATURE(OFF)
DX_HTML_FEATURE(ON)
DX_CHM_FEATURE(OFF)
DX_CHI_FEATURE(OFF)
DX_MAN_FEATURE(OFF)
DX_MAN_FEATURE(ON)
DX_RTF_FEATURE(OFF)
DX_XML_FEATURE(OFF)
DX_PDF_FEATURE(ON)
DX_PDF_FEATURE(OFF)
DX_PS_FEATURE(OFF)
AC_SUBST([DOXYGEN_PACKAGE])
@ -1085,7 +1092,7 @@ if test "X$HDF5_DOXYGEN" = "Xyes"; then
AC_SUBST([DOXYGEN_INPUT_DIRECTORY])
AC_SUBST([DOXYGEN_OPTIMIZE_OUTPUT_FOR_C])
AC_SUBST([DOXYGEN_MACRO_EXPANSION])
AC_SUBST([DOXYGEN_OUTPUT_DIR])
AC_SUBST([DOXYGEN_OUTPUT_DIRECTORY])
DOXYGEN_PACKAGE=${PACKAGE_NAME}
DOXYGEN_VERSION_STRING=${PACKAGE_VERSION}
@ -1095,13 +1102,12 @@ if test "X$HDF5_DOXYGEN" = "Xyes"; then
DOXYGEN_INPUT_DIRECTORY='$(SRCDIR) $(SRCDIR)/doxygen/dox'
DOXYGEN_OPTIMIZE_OUTPUT_FOR_C=YES
DOXYGEN_MACRO_EXPANSION=YES
DOXYGEN_OUTPUT_DIR=hdf5lib_docs
DOXYGEN_OUTPUT_DIRECTORY=hdf5lib_docs
DX_INIT_DOXYGEN([HDF5], [doxygen/Doxyfile], [hdf5lib_docs])
#AC_SUBST([DOXYGEN_OUTPUT_DIR], [hdf5lib_docs])
else
AC_MSG_RESULT([no])
echo "Doxygen support is disabled"
fi
@ -3819,6 +3825,7 @@ AM_CONDITIONAL([BUILD_HDF5_HL_CONDITIONAL], [test "X$HDF5_HL" = "Xyes"])
AM_CONDITIONAL([BUILD_TESTS_CONDITIONAL], [test "X$HDF5_TESTS" = "Xyes"])
AM_CONDITIONAL([BUILD_TESTS_PARALLEL_CONDITIONAL], [test -n "$TESTPARALLEL"])
AM_CONDITIONAL([BUILD_TOOLS_CONDITIONAL], [test "X$HDF5_TOOLS" = "Xyes"])
AM_CONDITIONAL([BUILD_DOXYGEN_CONDITIONAL], [test "X$HDF5_DOXYGEN" = "Xyes"])
## ----------------------------------------------------------------------
## Build the Makefiles.

4
m4/ax_prog_doxygen.m4
View File

@ -546,9 +546,9 @@ doxygen-doc: doxygen-run \$(DX_PS_GOAL) \$(DX_PDF_GOAL)
]m4_foreach([DX_i], [DX_loop],
[[\$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag: \$(DX_CONFIG]DX_i[) \$(pkginclude_HEADERS)
\$(A""M_V_at)rm -rf \$(DX_DOCDIR]DX_i[)
rm -rf \$(DX_DOCDIR]DX_i[)
\$(DX_V_DXGEN)\$(DX_ENV) DOCDIR=\$(DX_DOCDIR]DX_i[) \$(DX_DOXYGEN) \$(DX_CONFIG]DX_i[)
\$(A""M_V_at)echo Timestamp >\$][@
echo Timestamp >\$][@
]])dnl
[DX_CLEANFILES = \\]

10
src/Makefile.am
View File

@ -204,13 +204,9 @@ $(top_srcdir)/src/H5overflow.h: $(top_srcdir)/src/H5overflow.txt
perl $(top_srcdir)/bin/make_overflow $?
# doxygen support
doxygen:
rm -fr $(top_builddir)/hdf5lib_docs
env $(DX_ENV) \
PROJECT_NAME="HDF5" \
SRCDIR=$(top_srcdir) \
OUTPUTDIR=$(top_builddir)/hdf5lib_docs \
$(DX_DOXYGEN) $(top_builddir)/$(DX_CONFIG)
if BUILD_DOXYGEN_CONDITIONAL
doxygen: doxygen-doc
endif
# Add TRACE macros to library source files. This is done via the trace script
# in the hdf5/bin directory. If the file contains HDF5 API macros, a "clean"