1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
| | diff --git a/Makefile.am b/Makefile.am
index fcfd554c2..55088fef8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -94,9 +94,7 @@ TCL_FILES = find $(srcdir)/$(TCL_PATH) -name '*.cfg' -o -name '*.tcl' -o -name '
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)" && \
@@ -122,7 +120,7 @@ distclean-local:
# instead we have a hook that enforces this in each workspace. To make sure
# that users actually use those hooks, we point git at them here.
all-local:
- cd $(srcdir) && git config core.hooksPath ./git-hooks
+ echo "no git"
DISTCLEANFILES = doxygen.log
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 67592038d..3a2e86049 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -4,8 +4,3 @@ info_TEXINFOS += %D%/openocd.texi
dist_man_MANS += %D%/openocd.1
EXTRA_DIST += %D%/manual
-
-MAINTAINERCLEANFILES += \
- %D%/mdate-sh \
- %D%/stamp-vti \
- %D%/version.texi
diff --git a/src/Makefile.am b/src/Makefile.am
index 07981aa67..98e0c98c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,14 +22,9 @@ endif
# banner output includes RELSTR appended to $VERSION from the configure script
# guess-rev.sh returns either a repository version ID or "-snapshot"
-if RELEASE
%C%_libopenocd_la_CPPFLAGS += -DRELSTR=\"\"
%C%_libopenocd_la_CPPFLAGS += -DGITVERSION=\"\"
-else
-%C%_libopenocd_la_CPPFLAGS += -DRELSTR=\"`$(top_srcdir)/guess-rev.sh $(top_srcdir)`\"
-%C%_libopenocd_la_CPPFLAGS += -DGITVERSION=\"`cd $(top_srcdir) && git describe`\"
-%C%_libopenocd_la_CPPFLAGS += -DPKGBLDDATE=\"`date +%F-%R`\"
-endif
+
# add default CPPFLAGS
%C%_libopenocd_la_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS)
|