comparison Makefile.am @ 30250:74541f1faf3c

merge of '5aacaf467359c75ac94de8b4a1897a191bc2a261' and '5cf492b57fa4a297212cbaa711deb42e1e431a08'
author Marcus Lundblad <ml@update.uu.se>
date Wed, 07 Jul 2010 20:06:35 +0000
parents a14c2e81fcf0
children a7cf3dbaba02 3b4e12c42d3c
comparison
equal deleted inserted replaced
30249:5ec2d3617538 30250:74541f1faf3c
98 .PHONY: package_revision_raw.txt 98 .PHONY: package_revision_raw.txt
99 # if both attempts fail, then we need to remove the empty file that > 99 # if both attempts fail, then we need to remove the empty file that >
100 # creates, and also make sure that the shell command exits 100 # creates, and also make sure that the shell command exits
101 # successfully; the rm -f ensures both 101 # successfully; the rm -f ensures both
102 package_revision_raw.txt: 102 package_revision_raw.txt:
103 REAL_BLDDIR=$$PWD/$(top_builddir); \ 103 $(AM_V_GEN)REAL_BLDDIR=$$PWD/$(top_builddir); \
104 (cd $(srcdir) && $$REAL_BLDDIR/mtn --root=. automate get_base_revision_id) 2>/dev/null >$@ \ 104 (cd $(srcdir) && $$REAL_BLDDIR/mtn --root=. automate get_base_revision_id) 2>/dev/null >$@ \
105 || (cd $(srcdir) && mtn --root=. automate get_base_revision_id) 2>/dev/null >$@ \ 105 || (cd $(srcdir) && mtn --root=. automate get_base_revision_id) 2>/dev/null >$@ \
106 || rm -f $@ 106 || rm -f $@
107 package_revision.h: package_revision_raw.txt 107 package_revision.h: package_revision_raw.txt
108 if test -f $<; then \ 108 $(AM_V_GEN)if test -f $<; then \
109 echo "#define REVISION \"`cat $<`\"" > $@; \ 109 echo "#define REVISION \"`cat $<`\"" > $@; \
110 fi 110 fi
111 if test ! -f $@ -a -f $(srcdir)/$@; then \ 111 $(AM_V_at)if test ! -f $@ -a -f $(srcdir)/$@; then \
112 cp $(srcdir)/$@ $@; \ 112 cp $(srcdir)/$@ $@; \
113 fi 113 fi
114 test -f $@ || echo "#define REVISION \"unknown\"" > $@ 114 $(AM_V_at)test -f $@ || echo "#define REVISION \"unknown\"" > $@
115 115
116 # This is a magic directive copy-and-pasted, then modified, from the 116 # This is a magic directive copy-and-pasted, then modified, from the
117 # automake 1.9 manual, section 13.4, "Checking the distribution". 117 # automake 1.9 manual, section 13.4, "Checking the distribution".
118 # Normally, 'distcheck' does a clean build, and then afterwards runs 118 # Normally, 'distcheck' does a clean build, and then afterwards runs
119 # 'distclean', and 'distclean' is supposed to remove everything that 119 # 'distclean', and 'distclean' is supposed to remove everything that