From 2735d128c9e731714bc505e0c7a45c6602fd2128 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Thu, 29 Dec 2011 00:32:27 +0100 Subject: [PATCH] build system: Define target 'version' in the toplevel Makefile. Also, let the manpage depend on 'version'. --- Makefile.am | 4 ++++ doc/Makefile.am | 2 +- src/Makefile.am | 4 ---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9baf3da..61071f0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,3 +2,7 @@ SUBDIRS = doc src 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 7bb7de9..62399e6 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -3,7 +3,7 @@ CLEANFILES = 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) $< diff --git a/src/Makefile.am b/src/Makefile.am index 4e3a166..90d41cf 100644 --- 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@ -../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" \ -- 2.30.2