X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=Makefile.am;h=461bca4999b23f10f4f8a982d0a5841c516a0e2f;hb=c73342fbe77b0d0432ce189566e0e8383f2b7493;hp=7d42fd3f7e0d90a0ebeeafa85c196e8f9c749fb0;hpb=d746dee833ef4774adcee6a33c97f8039a5bd744;p=openocd.git

diff --git a/Makefile.am b/Makefile.am
index 7d42fd3f7e..461bca4999 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,9 @@
 # have all needed files, that a GNU package needs
 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
+
 nobase_dist_pkgdata_DATA = \
 	contrib/libdcc/dcc_stdio.c \
 	contrib/libdcc/dcc_stdio.h \
@@ -9,11 +12,23 @@ nobase_dist_pkgdata_DATA = \
 	contrib/libdcc/README \
 	contrib/openocd.udev
 
-SUBDIRS = src doc
+if INTERNAL_JIMTCL
+SUBDIRS = jimtcl
+else
+SUBDIRS =
+endif
+
+SUBDIRS += src doc
 
 EXTRA_DIST = \
+	BUGS \
+	HACKING \
+	NEWTAPS \
+	PATCHES.txt \
+	README.Win32 \
 	Doxyfile.in \
-	tools/logger.pl
+	tools/logger.pl \
+	contrib/loaders
 
 libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status --recheck
@@ -69,10 +84,10 @@ install-data-hook:
 uninstall-hook:
 	rm -rf $(DESTDIR)$(pkgdatadir)/scripts
 
-
 distclean-local:
 	rm -rf Doxyfile doxygen
-
+	rm -f $(srcdir)/jimtcl/configure.gnu
+	
 DISTCLEANFILES = doxygen.log
 
 MAINTAINERCLEANFILES = \