From 7fb8b92cd5d361246fcb155be3771cc1e86064cc Mon Sep 17 00:00:00 2001 From: Micah Cowan Date: Mon, 15 Oct 2007 17:22:27 -0700 Subject: [PATCH] Remove intermediate hg-id. --- src/ChangeLog | 5 +++++ src/Makefile.am | 9 ++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 8b9c65b4..361ac9ef 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2007-10-15 Micah Cowan + + * Makefile.am: Remove intermediary hg-id file generation, make + version.c-generation more portable. + 2007-10-14 Micah Cowan * cmpt.c, cookies.c, ftp-basic.c, ftp-ls.c, ftp.c, hash.c, diff --git a/src/Makefile.am b/src/Makefile.am index 361de3c7..f75d7460 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -48,16 +48,11 @@ EXTRA_wget_SOURCES = mswindows.c LDADD = $(ALLOCA) $(LIBOBJS) ../lib/libgnu.a AM_CPPFLAGS = -I$(top_srcdir)/lib -version.c: hg-id +version.c: $(wget_SOURCES) $(LDADD) printf '%s' 'const char *version_string = "@VERSION@' > $@ - -HG_ID=$$(cat hg-id); [ "$$HG_ID" ] && printf '%s' " ($${HG_ID})" >> $@ + -hg log -r tip --template=' ({node|short})' >> $@ printf '%s\n' '";' >> $@ -.INTERMEDIATE: hg-id -.PHONY: hg-id -hg-id: $(wget_SOURCES) $(LDADD) - -( hg id | cut -f 1 -d ' ' ) 2>/dev/null > $@ - check_LIBRARIES = libunittest.a libunittest_a_SOURCES = $(wget_SOURCES) test.c test.h libunittest_a_CPPFLAGS = -DTESTING -- 2.39.2