[Gnash-commit] [SCM] Gnash branch, master, updated. 061d79a819e1471ff7d4e5ddb7414e92f4d0b068

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  061d79a819e1471ff7d4e5ddb7414e92f4d0b068 (commit)
      from  ad34287ded116791e343569ad3a286fcf52c95c3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=061d79a819e1471ff7d4e5ddb7414e92f4d0b068


commit 061d79a819e1471ff7d4e5ddb7414e92f4d0b068
Author: Sandro Santilli <address@hidden>
Date:   Sun Nov 7 21:04:52 2010 +0100

    Drop duplicated rule for building revno.h

diff --git a/Makefile.am b/Makefile.am
index 957116d..e23ab3e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -113,7 +113,8 @@ EXTRA_DIST =  \
 #      @test -d "$(distdir)/packaging" || $(mkinstalldirs) 
"$(distdir)/packaging"
 #      cp -p $(srcdir)/*.am $(top_distdir)/packaging/
 
-CLEANFILES =
+CLEANFILES = revno.h .configline
+BUILT_SOURCES = revno.h .configline
 
 #
 # Extract info from the repository to include in the build. If
@@ -127,8 +128,6 @@ CLEANFILES =
 # so it'll be an improvement anyway. Bzr is amazing slow producing
 # the info, which is why we don't want to do it all the time.
 #
-CLEANFILES += revno.h .configline
-BUILT_SOURCES = revno.h .configline
 revno.h: Makefile.in
        address@hidden test -d $(srcdir)/.bzr; then \
          status=`which bzr 2>&1 | grep -c " no bzr"`; \
@@ -166,31 +165,6 @@ revno.h: Makefile.in
 BRANCH_REVNO  := $(shell grep "REVNO" revno.h | cut -d '"' -f 2 | cut -d '.' 
-f 1)
 BRANCH_NICK   := $(shell grep "NICK" revno.h | cut -d '"' -f 2)
 
-# Extract info from the repository to include in the build. If
-# GIT (git) isn't installed, just print stubs, as this is only
-# used for display purposes. It's primarily used by the testsuites
-# and when building binary packages from multiple branches.
-# Note that this is only rebuilt after "make clean", if the Makefile
-# has changed, or the source tree gets reconfigured. So unless you do
-# a make clean, or nuke the revno.h file, this can get slightly
-# behind the current version. Currently Gnash doesn't have this info
-# so it'll be an improvement anyway. 
-
-revno.h: Makefile.in
-        @status=`which git 2>&1 | grep -c " no bzr"`; \
-        if test x"$${status}" = x"0"; then \
-           echo "Generating revno.h"; \
-           $(RM) -f revno.h; \
-           revno=`(cd $(srcdir) && git describe --tags | cut -d '-' -f 2-3)`; \
-           nick=`basename $(top_srcdir)`; \
-        else \
-           revno="${NOW}"; \
-           nick="none"; \
-        fi; \
-        echo "Generating revno.h"; \
-        echo "static const char *BRANCH_REVNO  = \"$${revno}\";" > revno.h; \
-        echo "static const char *BRANCH_NICK = \"$${nick}\";" >> revno.h;
-
 .configline: config.log
        address@hidden -f .configline
        @head config.log | grep " .*/configure " | sed -e 's:^  . .*configure 
::' > .configline

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am |   30 ++----------------------------
 1 files changed, 2 insertions(+), 28 deletions(-)


hooks/post-receive
-- 
Gnash