projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ioutil: make the file compile on MacOS
[fw/openocd]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 2d07552844751f35bd7ea59f19538da79655e0db..722c3732349889edce9749b4004e980943353ec1 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-3,7
+3,7
@@
AUTOMAKE_OPTIONS = gnu 1.6
# make sure we pass the correct jimtcl flags to distcheck
AUTOMAKE_OPTIONS = gnu 1.6
# make sure we pass the correct jimtcl flags to distcheck
-DISTCHECK_CONFIGURE_FLAGS = --
with-jim-ext=nvp --disable-lineedit
+DISTCHECK_CONFIGURE_FLAGS = --
disable-install-jim
nobase_dist_pkgdata_DATA = \
contrib/libdcc/dcc_stdio.c \
nobase_dist_pkgdata_DATA = \
contrib/libdcc/dcc_stdio.c \
@@
-21,8
+21,13
@@
endif
SUBDIRS += src doc
EXTRA_DIST = \
SUBDIRS += src doc
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
@@
-58,10
+63,13
@@
$(THE_MANUAL): %.pdf: %.tex
TCL_PATH = tcl
# command to find paths of script files, relative to TCL_PATH
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:
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)" && \
@@
-78,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 = \