projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "When calling openocd from a shell like this:"
[fw/openocd]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index fab470466631b80ee1748d74a8b5a794f45e1939..8de1dbdb8de5d3718b1c748352d876c23b926ff7 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-2,6
+2,9
@@
# have all needed files, that a GNU package needs
AUTOMAKE_OPTIONS = gnu 1.6
# 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 = --disable-install-jim
+
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 \
@@
-9,11
+12,22
@@
nobase_dist_pkgdata_DATA = \
contrib/libdcc/README \
contrib/openocd.udev
contrib/libdcc/README \
contrib/openocd.udev
-SUBDIRS = src doc
+if INTERNAL_JIMTCL
+SUBDIRS = jimtcl
+else
+SUBDIRS =
+endif
+
+SUBDIRS += src doc
EXTRA_DIST = \
EXTRA_DIST = \
+ BUGS \
+ HACKING \
+ NEWTAPS \
+ README.Win32 \
Doxyfile.in \
Doxyfile.in \
- tools/logger.pl
+ tools/logger.pl \
+ contrib/loaders
libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status --recheck
libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status --recheck
@@
-26,6
+40,7
@@
Doxyfile: $(srcdir)/Doxyfile.in
echo "### @@@ -= DO NOT EDIT THIS FILE =- @@@ ###" && \
echo "### @@@ Make changes to Doxyfile.in @@@ ###" && \
sed -e 's,@srcdir\@,$(srcdir),' \
echo "### @@@ -= DO NOT EDIT THIS FILE =- @@@ ###" && \
echo "### @@@ Make changes to Doxyfile.in @@@ ###" && \
sed -e 's,@srcdir\@,$(srcdir),' \
+ -e 's,@builddir\@,$(builddir),' \
-e 's,@doxygen_as_html\@,$(doxygen_as_html),' \
-e 's,@doxygen_as_pdf\@,$(doxygen_as_pdf),' $< \
) > $@
-e 's,@doxygen_as_html\@,$(doxygen_as_html),' \
-e 's,@doxygen_as_pdf\@,$(doxygen_as_pdf),' $< \
) > $@
@@
-52,6
+67,9
@@
TCL_FILES = find $(srcdir)/$(TCL_PATH) -name '*.cfg' -o -name '*.tcl' | \
sed -e 's,^$(srcdir)/$(TCL_PATH),,'
dist-hook:
sed -e 's,^$(srcdir)/$(TCL_PATH),,'
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 ; \
+ fi
for i in $$($(TCL_FILES)); do \
j="$(distdir)/$(TCL_PATH)/$$i" && \
mkdir -p "$$(dirname $$j)" && \
for i in $$($(TCL_FILES)); do \
j="$(distdir)/$(TCL_PATH)/$$i" && \
mkdir -p "$$(dirname $$j)" && \
@@
-68,10
+86,10
@@
install-data-hook:
uninstall-hook:
rm -rf $(DESTDIR)$(pkgdatadir)/scripts
uninstall-hook:
rm -rf $(DESTDIR)$(pkgdatadir)/scripts
-
distclean-local:
rm -rf Doxyfile doxygen
distclean-local:
rm -rf Doxyfile doxygen
-
+ rm -f $(srcdir)/jimtcl/configure.gnu
+
DISTCLEANFILES = doxygen.log
MAINTAINERCLEANFILES = \
DISTCLEANFILES = doxygen.log
MAINTAINERCLEANFILES = \