Changeset 1324

Timestamp:

Jan 23, 2011, 2:40:47 AM (10 years ago)

Author:

Peter Johansson

Message:

lift out revision number to a separate file 'lib/.revision' and then build subversion_info.cc based on this file and subversion_info.cc.in.

File:

• trunk/lib/Makefile.am (modified) (2 diffs)

trunk/lib/Makefile.am

@@ -60 +60 @@
   html_utility.cc LineTypeParser.cc main_utility.cc Node.cc \
   NodeCounter.cc OptionVersion.cc \
-  rmdirhier.cc Stats.cc StatsCollection.cc subversion_info.cc SVN.cc \
+  rmdirhier.cc Stats.cc StatsCollection.cc SVN.cc \
   SVNblame.cc SVNdiff.cc SVNinfo.cc \
   SVNlog.cc SVNproperty.cc TinyStats.cc \
   Trac.cc utility.cc Vector.cc
 
+nodist_libsvndigest_core_a_SOURCES = subversion_info.cc
 
 
@@ -73 +74 @@
 all-local:
 
+EXTRA_DIST = subversion_info.cc.in .revision
+CLEANFILES = subversion_info.cc
+
 if HAVE_SVN_WC
-$(srcdir)/subversion_info.cc: subversion_info.cc.tmp
-  @$(MOVE_IF_CHANGE) subversion_info.cc.tmp $@
-
-subversion_info.cc.tmp: FORCE
-  @echo '// subversion_info.cc generated from subversion_info.cc.in.' > $@ ;\
-  revision=$(SVN_REVISION);\
-  $(SED) -e 's/sub_2_svn_revision/r'$$revision'/g' \
-  $(srcdir)/subversion_info.cc.in >> $@ ;
-
+$(srcdir)/.revision: FORCE
+  @$(SVNVERSION) $(top_srcdir) > $@-t && $(MOVE_IF_CHANGE) $@-t $@
 else
-# this is needed in 'svn export' build
-$(srcdir)/subversion_info.cc:
-  $(SED) -e 's/sub_2_svn_revision//g' \
-  $(srcdir)/subversion_info.cc.in >> $@ ;
-
+## this is needed in 'svn export' build
+$(srcdir)/.revision:
+  echo "" > $@
 endif
 
+subversion_info.cc: $(srcdir)/subversion_info.cc.in $(srcdir)/.revision 
+  @rm -f $@-t $@ && \
+  { revision=`cat $(srcdir)/.revision`; \
+    echo '// DO NOT EDIT! GENERATED AUTOMATICALLY!' && \
+    $(SED) -e 's/sub_2_svn_revision/r'$$revision'/g' \
+    < $(srcdir)/subversion_info.cc.in; \
+  } > $@-t && mv $@-t $@ 
+
 FORCE: