build system: Define target 'version' in the toplevel Makefile.

Also, let the manpage depend on 'version'.

diff --git a/Makefile.am b/Makefile.am
index 9baf3dabd11cf10887911c2408337a89636b0c03..61071f03dad38405667f8d2635f094a43ef8b70d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,3 +2,7 @@ SUBDIRS = doc src
 
 EXTRA_DIST = autogen.sh version-gen.sh
 
 
 EXTRA_DIST = autogen.sh version-gen.sh
 

+version: FORCE
+       @# As a side-effect, this updates ../version.
+       @echo Building $(PACKAGE_NAME) version $$( cd .. && ./version-gen.sh )
+

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7bb7de99fd24550a8a1eb1d13186b48d9702a02d..62399e67b2f22d9c96edf991cf9a8e6b16850c4e 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,7 +3,7 @@ CLEANFILES = tpdfview.1
 
 man_MANS = tpdfview.1
 
 
 man_MANS = tpdfview.1
 

-tpdfview.1: tpdfview.txt
+tpdfview.1: tpdfview.txt ../version

 
 .txt.1:
        a2x -d manpage -f manpage -atpdfv_version=$(PACKAGE_VERSION) $<
 
 .txt.1:
        a2x -d manpage -f manpage -atpdfv_version=$(PACKAGE_VERSION) $<

diff --git a/src/Makefile.am b/src/Makefile.am
index 4e3a166d0d9a1f746f5a12adcdda83aed6a07e65..90d41cf2c24901bcae2e1b568b3cd7766b4d3c79 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,10 +30,6 @@ tpdftoc_CFLAGS = $(AM_CFLAGS) -DBUILD_DATE="\"$$( date --utc '+%F %T' ) (UTC)\""
                @POPPLER_GLIB_CFLAGS@
 tpdftoc_LDFLAGS = @POPPLER_GLIB_LIBS@
 
                @POPPLER_GLIB_CFLAGS@
 tpdftoc_LDFLAGS = @POPPLER_GLIB_LIBS@
 

-../version: FORCE
-       @# As a side-effect, this updates ../version.
-       @echo Building $(PACKAGE_NAME) version $$( cd .. && ./version-gen.sh )
-

 tpdfv_features.h: tpdfv_features.h.in ../version
        source ../version; sed \
            -e "s/@TPDFV_VERSION_MAJOR@/$$VERSION_MAJOR/g" \
 tpdfv_features.h: tpdfv_features.h.in ../version
        source ../version; sed \
            -e "s/@TPDFV_VERSION_MAJOR@/$$VERSION_MAJOR/g" \