Documentation: fix warning "unbalanced square brackets"

[openocd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 69077f80aeb6cfc6dbad1c78b67993ac64244503..647b571cfac9a8550cc50d17f38a1a3142825869 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,17 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+

 # not a GNU package. You can remove this line, if
 # have all needed files, that a GNU package needs
 AUTOMAKE_OPTIONS = gnu 1.6
 
 # not a GNU package. You can remove this line, if
 # have all needed files, that a GNU package needs
 AUTOMAKE_OPTIONS = gnu 1.6
 

+.DELETE_ON_ERROR:
+

 # make sure we pass the correct jimtcl flags to distcheck
 DISTCHECK_CONFIGURE_FLAGS = --disable-install-jim
 
 # make sure we pass the correct jimtcl flags to distcheck
 DISTCHECK_CONFIGURE_FLAGS = --disable-install-jim
 

+# do not run Jim Tcl tests (esp. during distcheck)
+check-recursive: SUBDIRS :=
+

 nobase_dist_pkgdata_DATA = \
        contrib/libdcc/dcc_stdio.c \
        contrib/libdcc/dcc_stdio.h \
 nobase_dist_pkgdata_DATA = \
        contrib/libdcc/dcc_stdio.c \
        contrib/libdcc/dcc_stdio.h \


@@ -19,10 +26,14 @@ noinst_LTLIBRARIES =
 info_TEXINFOS =
 dist_man_MANS =
 EXTRA_DIST =
 info_TEXINFOS =
 dist_man_MANS =
 EXTRA_DIST =

+DISTCLEANFILES =

 
 if INTERNAL_JIMTCL
 SUBDIRS += jimtcl
 DIST_SUBDIRS += jimtcl
 
 if INTERNAL_JIMTCL
 SUBDIRS += jimtcl
 DIST_SUBDIRS += jimtcl

+EXTRA_DIST += jimtcl/configure.gnu
+# jimtcl from 0.79 to 0.82 miss cleaning jsmn.o
+DISTCLEANFILES += jimtcl/jsmn/jsmn.o

 endif
 
 # common flags used in openocd build
 endif
 
 # common flags used in openocd build


@@ -31,7 +42,6 @@ AM_CFLAGS = $(GCC_WARNINGS)
 AM_CPPFLAGS = $(HOST_CPPFLAGS)\
                          -I$(top_srcdir)/src \
                          -I$(top_builddir)/src \
 AM_CPPFLAGS = $(HOST_CPPFLAGS)\
                          -I$(top_srcdir)/src \
                          -I$(top_builddir)/src \

-                         -I$(top_srcdir)/src/helper \

                          -DPKGDATADIR=\"$(pkgdatadir)\" \
                          -DBINDIR=\"$(bindir)\"
 
                          -DPKGDATADIR=\"$(pkgdatadir)\" \
                          -DBINDIR=\"$(bindir)\"
 


@@ -44,9 +54,24 @@ EXTRA_DIST += \
        HACKING \
        NEWTAPS \
        README.Windows \
        HACKING \
        NEWTAPS \
        README.Windows \

-       README.OSX \
-       $(wildcard $(srcdir)/NEWS*) \
+       README.macOS \
+       $(EXTRA_DIST_NEWS) \

        Doxyfile.in \
        Doxyfile.in \

+       LICENSES/license-rules.txt \
+       LICENSES/exceptions/eCos-exception-2.0 \
+       LICENSES/preferred/BSD-1-Clause \
+       LICENSES/preferred/BSD-2-Clause \
+       LICENSES/preferred/BSD-2-Clause-Views \
+       LICENSES/preferred/BSD-3-Clause \
+       LICENSES/preferred/BSD-Source-Code \
+       LICENSES/preferred/CC0-1.0 \
+       LICENSES/preferred/GFDL-1.2 \
+       LICENSES/preferred/gfdl-1.2.texi.readme \
+       LICENSES/preferred/GPL-2.0 \
+       LICENSES/preferred/LGPL-2.1 \
+       LICENSES/preferred/MIT \
+       LICENSES/stand-alone/Apache-2.0 \
+       LICENSES/stand-alone/GPL-3.0 \

        tools/logger.pl \
        tools/rlink_make_speed_table \
        tools/st7_dtc_as \
        tools/logger.pl \
        tools/rlink_make_speed_table \
        tools/st7_dtc_as \


@@ -89,9 +114,14 @@ TCL_PATH = tcl
 TCL_FILES = find $(srcdir)/$(TCL_PATH) -name '*.cfg' -o -name '*.tcl' -o -name '*.txt' | \
                sed -e 's,^$(srcdir)/$(TCL_PATH),,'
 
 TCL_FILES = find $(srcdir)/$(TCL_PATH) -name '*.cfg' -o -name '*.tcl' -o -name '*.txt' | \
                sed -e 's,^$(srcdir)/$(TCL_PATH),,'
 

+# Without the PERL_UNICODE="IO" workaround below when running git2cl, you get several
+# "Wide character" warnings and you also risk an invalid character encoding in
+# the generated ChangeLog file. For more information, see this bug report:
+#   Warning "Wide character in print"
+#   https://savannah.nongnu.org/bugs/?65689

 dist-hook:
        if test -d $(srcdir)/.git -a \( ! -e $(distdir)/ChangeLog -o -w $(distdir)/ChangeLog \) ; then \
 dist-hook:
        if test -d $(srcdir)/.git -a \( ! -e $(distdir)/ChangeLog -o -w $(distdir)/ChangeLog \) ; then \

-               git --git-dir $(srcdir)/.git log | $(srcdir)/tools/git2cl/git2cl > $(distdir)/ChangeLog ; \
+               git --git-dir $(srcdir)/.git log | PERL_UNICODE="IO" $(srcdir)/tools/git2cl/git2cl > $(distdir)/ChangeLog ; \

        fi
        for i in $$($(TCL_FILES)); do \
                j="$(distdir)/$(TCL_PATH)/$$i" && \
        fi
        for i in $$($(TCL_FILES)); do \
                j="$(distdir)/$(TCL_PATH)/$$i" && \


@@ -111,9 +141,9 @@ uninstall-hook:
 
 distclean-local:
        rm -rf Doxyfile doxygen
 
 distclean-local:
        rm -rf Doxyfile doxygen

-       rm -f $(srcdir)/jimtcl/configure.gnu
+       -rm -f $(srcdir)/jimtcl/configure.gnu

 
 

-DISTCLEANFILES = doxygen.log
+DISTCLEANFILES += doxygen.log

 
 METASOURCES = AUTO
 
 
 METASOURCES = AUTO