X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=Makefile.am;h=3858093b66f43009e3432ddf6d88f271fcdfd5ed;hp=930a3073388033a4fe2ee31362b2965d3cab86c6;hb=4a5045b143cad3b0bdba7c5590504bfc19e9a627;hpb=56d163ce79510c7756567df00ae54155757eaa0f

diff --git a/Makefile.am b/Makefile.am
index 930a307338..3858093b66 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,12 +2,13 @@
 # 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
 
 # do not run Jim Tcl tests (esp. during distcheck)
-check-recursive:
-	@true
+check-recursive: SUBDIRS :=
 
 nobase_dist_pkgdata_DATA = \
 	contrib/libdcc/dcc_stdio.c \
@@ -48,9 +49,18 @@ EXTRA_DIST += \
 	HACKING \
 	NEWTAPS \
 	README.Windows \
-	README.OSX \
-	$(wildcard $(srcdir)/NEWS*) \
+	README.macOS \
+	$(EXTRA_DIST_NEWS) \
 	Doxyfile.in \
+	LICENSES/license-rules.txt \
+	LICENSES/preferred/BSD-1-Clause \
+	LICENSES/preferred/BSD-2-Clause \
+	LICENSES/preferred/BSD-3-Clause \
+	LICENSES/preferred/GFDL-1.2 \
+	LICENSES/preferred/gfdl-1.2.texi.readme \
+	LICENSES/preferred/GPL-2.0 \
+	LICENSES/preferred/MIT \
+	LICENSES/stand-alone/GPL-3.0 \
 	tools/logger.pl \
 	tools/rlink_make_speed_table \
 	tools/st7_dtc_as \
@@ -116,6 +126,8 @@ uninstall-hook:
 distclean-local:
 	rm -rf Doxyfile doxygen
 	rm -f $(srcdir)/jimtcl/configure.gnu
+# FIXME: workaround for jimtcl 0.80 only. Remove from jimtcl 0.81
+	rm -f jimtcl/examples.api/Makefile
 
 DISTCLEANFILES = doxygen.log