configure: Remove conflicting CMSIS_DAP conditional

[openocd] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7bc25af26db0c0d479c1945a98671ad0635d11a9..2ddc96d3d39895032abbc6a3f4eb4083b7280ae0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,14 +3,14 @@
 AUTOMAKE_OPTIONS = gnu 1.6
 
 # make sure we pass the correct jimtcl flags to distcheck
-DISTCHECK_CONFIGURE_FLAGS = --with-jim-ext=nvp --disable-lineedit --disable-install-jim
+DISTCHECK_CONFIGURE_FLAGS = --disable-install-jim
 
 nobase_dist_pkgdata_DATA = \
        contrib/libdcc/dcc_stdio.c \
        contrib/libdcc/dcc_stdio.h \
        contrib/libdcc/example.c \
        contrib/libdcc/README \
-       contrib/openocd.udev
+       contrib/99-openocd.rules
 
 if INTERNAL_JIMTCL
 SUBDIRS = jimtcl
@@ -24,11 +24,14 @@ EXTRA_DIST = \
        BUGS \
        HACKING \
        NEWTAPS \
-       PATCHES.txt \
-       README.Win32 \
+       README.Windows \
+       README.OSX \
+       $(wildcard $(srcdir)/NEWS*) \
        Doxyfile.in \
        tools/logger.pl \
-       contrib/loaders
+       tools/rlink_make_speed_table \
+       tools/st7_dtc_as \
+       contrib
 
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
@@ -64,7 +67,7 @@ $(THE_MANUAL): %.pdf: %.tex
 
 TCL_PATH = tcl
 # command to find paths of script files, relative to TCL_PATH
-TCL_FILES = find $(srcdir)/$(TCL_PATH) -name '*.cfg' -o -name '*.tcl' | \
+TCL_FILES = find $(srcdir)/$(TCL_PATH) -name '*.cfg' -o -name '*.tcl' -o -name '*.txt' | \
                sed -e 's,^$(srcdir)/$(TCL_PATH),,'
 
 dist-hook:
@@ -90,7 +93,7 @@ uninstall-hook:
 distclean-local:
        rm -rf Doxyfile doxygen
        rm -f $(srcdir)/jimtcl/configure.gnu
-       
+
 DISTCLEANFILES = doxygen.log
 
 MAINTAINERCLEANFILES = \