X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=Makefile.am;h=a18c572fbf002e8f86d8672d2c3693b5e65d4dc3;hb=248161cbf47af9f7fc8c00b5efa79a1ff8e65848;hp=579d3a7ae2c5f3d5449c6ff930f6ab7d0b5c03e3;hpb=5be455a710c57bbbbd49c2d671b42098db7be5dc;p=openocd.git

diff --git a/Makefile.am b/Makefile.am
index 579d3a7ae2..a18c572fbf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,15 +2,20 @@
 # 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: SUBDIRS :=
+
 nobase_dist_pkgdata_DATA = \
 	contrib/libdcc/dcc_stdio.c \
 	contrib/libdcc/dcc_stdio.h \
 	contrib/libdcc/example.c \
 	contrib/libdcc/README \
-	contrib/99-openocd.rules
+	contrib/60-openocd.rules
 
 SUBDIRS =
 DIST_SUBDIRS =
@@ -31,7 +36,6 @@ AM_CFLAGS = $(GCC_WARNINGS)
 AM_CPPFLAGS = $(HOST_CPPFLAGS)\
 			  -I$(top_srcdir)/src \
 			  -I$(top_builddir)/src \
-			  -I$(top_srcdir)/src/helper \
 			  -DPKGDATADIR=\"$(pkgdatadir)\" \
 			  -DBINDIR=\"$(bindir)\"
 
@@ -44,9 +48,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 \