zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 16:05:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix small bugs in the automake construction which were preventing the

Browse Source 
revision number from being automatically baked into the automake-built
binaries.

[originally from svn r9890]
This commit is contained in:
Simon Tatham
2013-07-02 06:48:26 +00:00
parent 6c34cb721c
commit 1ee9f5f2ef
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Recipe
View File

@ -136,7 +136,7 @@ version2.def: FORCE
# backtick expression. We also force rebuilding via a -D option that # backtick expression. We also force rebuilding via a -D option that
# makes version.o include empty.h, which we construct ourselves and # makes version.o include empty.h, which we construct ourselves and
# touch whenever any source file is updated. # touch whenever any source file is updated.
!cflags am version $(VER) -DINCLUDE_EMPTY_H `if test -z "$(VER)" && (cd $(srcdir)/..; md5sum -c manifest >/dev/null 2>&1); then cat $(srcdir)/../version.def; else echo "$(VER)"; fi` !cflags am version $(VER) -DINCLUDE_EMPTY_H `if test -z "$(VER)" && (cd $(srcdir) && test -f manifest && md5sum -c manifest >/dev/null 2>&1); then cat $(srcdir)/version.def; elif test -z "$(VER)" && test -d .svn && svnversion . >/dev/null 2>&1; then echo "-DREVISION=\`svnversion .\`"; else echo "$(VER)"; fi`
!begin am !begin am
BUILT_SOURCES = empty.h BUILT_SOURCES = empty.h
CLEANFILES = empty.h CLEANFILES = empty.h

1
mkfiles.pl
View File

@ -1229,6 +1229,7 @@ if (defined $makefiles{'am'}) {
if (defined $cflags{'am'} && $cflags{'am'}->{$obj}) { if (defined $cflags{'am'} && $cflags{'am'}->{$obj}) {
# This file needs to go in an archive, so that we can # This file needs to go in an archive, so that we can
# change the compile flags as specified in Recipe # change the compile flags as specified in Recipe
$use_archive = 1;
$archivecflags{$obj} = [$cflags{'am'}->{$obj}]; $archivecflags{$obj} = [$cflags{'am'}->{$obj}];
} }
if ($use_archive) { if ($use_archive) {