From 8db5913e7470b22c7c4f98b34bfbe306040f3095 Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Sat, 23 Jan 2016 16:38:01 -0500 Subject: Makefile.am: Pass PACKAGE_VERSION in shld stdin, not version.sh Making version.sh depend on .git/ causes it to be regenerated on every make run. --- diff --git a/Makefile.am b/Makefile.am index 0a4373a..e7fe1a3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,7 +28,8 @@ PACKAGE_VERSION_GIT = $(PACKAGE_VERSION) endif SUFFIXES = .sh .sho .ms .1in .1 .8in .8 -LINK = '$(srcdir)/tools/shld.sh' -I '$(SH)' -o $@ config.sh version.sh +LINK = printf "PACKAGE_VERSION='%s'\n" "$(PACKAGE_VERSION_GIT)" | \ + '$(srcdir)/tools/shld.sh' -I '$(SH)' -o $@ config.sh - bin_PROGRAMS = prokit @@ -38,7 +39,7 @@ prokit_SHPPFLAGS = \ -DLOCALEDIR="$(localedir)" \ -DTEXTDOMAIN="$(TEXTDOMAIN)" prokit_LDADD = $(prokit_SOURCES:.sh=.sho) -EXTRA_prokit_DEPENDENCIES = config.sh version.sh +EXTRA_prokit_DEPENDENCIES = config.sh locale_MESSAGES = $(locale_sources:.sh=.ms) @@ -70,13 +71,6 @@ AM_TESTS_ENVIRONMENT = srcdir=$(top_srcdir) COLOR_TEST_LOGS=$(COLOR_TEST_LOGS) .builddirstamp: $(AM_V_GEN)touch .builddirstamp -version.sh: - $(AM_V_GEN)printf "PACKAGE_VERSION='%s'\n" "$(PACKAGE_VERSION_GIT)" >$@ - -if IN_GIT -version.sh $(man1_MANS) $(man8_MANS): $(top_srcdir)/.git -endif - todo_script = \ /^[0-9]* .[ \t]*\#[ \t]*TODO/,/^[0-9]* \.[ \t]*[^ \t\#]/{ \ /^[0-9]* \.[ \t]*\#/p; \ -- cgit v0.9.1