build-sys,refactor: arrange check-genfile target more make-oriented

Signed-off-by: Masatake YAMATO <[email protected]>

Author: masatake

makefiles/testing.mak

@@ -309,42 +309,91 @@ clean-man-test:
 chkgen_verbose = $(chkgen_verbose_@AM_V@)
 chkgen_verbose_ = $(chkgen_verbose_@AM_DEFAULT_V@)
 chkgen_verbose_0 = @echo CHKGEN "    $@";
-check-genfile:
-if BUILD_IN_GIT_REPO
+
+recover_side_effects = cg-force-optlib2c-srcs cg-force-txt2cstr-srcs cg-force-man-docs
+
 # OPTLIB2C_SRCS : committed for win32 build
+.PHONY: cg-clean-optlib2c-srcs cg-force-optlib2c-srcs check-genfile-optlib2c-srcs
+cg-clean-optlib2c-srcs:
+if BUILD_IN_GIT_REPO
 	$(chkgen_verbose)rm -f $(OPTLIB2C_SRCS)
+endif
+cg-force-optlib2c-srcs: cg-clean-optlib2c-srcs
+if BUILD_IN_GIT_REPO
 	$(chkgen_verbose)$(MAKE) $(OPTLIB2C_SRCS)
+endif
+check-genfile-optlib2c-srcs: $(recover_side_effects) cg-force-optlib2c-srcs
+if BUILD_IN_GIT_REPO
 	$(chkgen_verbose)if ! git diff --exit-code $(OPTLIB2C_DIR); then \
 		echo "Files under $(OPTLIB2C_DIR) are not up to date." ; \
 		echo "If you change $(OPTLIB2C_DIR)/foo.ctags, don't forget to add $(OPTLIB2C_DIR)/foo.c to your commit." ; \
 		exit 1 ; \
 	else \
 		echo "Files under $(OPTLIB2C_DIR) are up to date." ; \
 	fi
+endif
+
 # TXT2CSTR_SRCS : committed for win32 build
+.PHONY: cg-clean-txt2cstr-srcs cg-force-txt2cstr-srcs check-genfile-txt2cstr-srcs
+cg-clean-txt2cstr-srcs:
+if BUILD_IN_GIT_REPO
 	$(chkgen_verbose)rm -f $(TXT2CSTR_SRCS)
+endif
+cg-force-txt2cstr-srcs: cg-clean-txt2cstr-srcs
+if BUILD_IN_GIT_REPO
 	$(chkgen_verbose)$(MAKE) $(TXT2CSTR_SRCS)
+endif
+check-genfile-txt2cstr-srcs: $(recover_side_effects) cg-force-txt2cstr-srcs
+if BUILD_IN_GIT_REPO
 	$(chkgen_verbose)if ! git diff --exit-code $(TXT2CSTR_DIR); then \
 		echo "Files under $(TXT2CSTR_DIR) are not up to date." ; \
 		echo "If you change $(TXT2CSTR_DIR)/foo.ps, don't forget to add $(TXT2CSTR_DIR)/foo.c to your commit." ; \
 		exit 1 ; \
 	else \
 		echo "Files under $(TXT2CSTR_DIR) are up to date." ; \
 	fi
-if HAVE_RST2MAN
+endif
+
 # man/*.in : committed for man pages to be genrated without rst2man
 #   make clean-docs remove both man/*.in and docs/man/*.rst
+.PHONY: cg-clean-man-docs cg-force-man-docs check-genfile-man-docs
+cg-clean-man-docs:
+if BUILD_IN_GIT_REPO
+if HAVE_RST2MAN
 	$(chkgen_verbose)$(MAKE) -C man clean-docs
+endif
+endif
+cg-force-man-docs: cg-clean-man-docs
+if BUILD_IN_GIT_REPO
+if HAVE_RST2MAN
 	$(chkgen_verbose)$(MAKE) -C man man-in
+endif
+endif
+check-genfile-man-docs:  $(recover_side_effects) cg-force-man-docs
+if BUILD_IN_GIT_REPO
+if HAVE_RST2MAN
 	$(chkgen_verbose)if ! git diff --exit-code -- man; then \
 		echo "Files under man/ are not up to date." ; \
 		echo "Please execute 'make -C man man-in' and commit them." ; \
 		exit 1 ; \
 	else \
 		echo "Files under man are up to date." ; \
 	fi
+endif
+endif
+
 # docs/man/*.rst : committed for Read the Docs
+.PHONY: cg-force-update-docs check-genfile-update-docs
+cg-force-update-docs: check-genfile-man-docs
+if BUILD_IN_GIT_REPO
+if HAVE_RST2MAN
 	$(chkgen_verbose)$(MAKE) -C man update-docs
+endif
+endif
+
+check-genfile-update-docs: cg-force-update-docs $(recover_side_effects)
+if BUILD_IN_GIT_REPO
+if HAVE_RST2MAN
 	$(chkgen_verbose)if ! git diff --exit-code -- docs/man; then \
 		echo "Files under docs/man/ are not up to date." ; \
 		echo "Please execute 'make -C man update-docs' and commit them." ; \
@@ -353,12 +402,20 @@ if HAVE_RST2MAN
 		echo "Files under docs/man are up to date." ; \
 	fi
 endif
+endif
+
 # win32/ctags_vs2013.vcxproj* : committed for win32 build without POSIX tools
 #   regenerate files w/o out-of-source build and w/ GNU make
+.PHONY: cg-force-win32 check-genfile-win32
+cg-force-win32:
+if BUILD_IN_GIT_REPO
 	$(chkgen_verbose)if test "$(top_srcdir)" = "$(top_builddir)" \
 		&& ($(MAKE) --version) 2>/dev/null | grep -q GNU ; then \
 		$(MAKE) -BC win32 ; \
 	fi
+endif
+check-genfile-win32: cg-force-win32 $(recover_side_effects)
+if BUILD_IN_GIT_REPO
 	$(chkgen_verbose)if ! git diff --exit-code -- win32; then \
 		if test "$(SKIP_CHECKGEN_WIN32)" = "yes"; then \
 			echo "Skip checking the files under win32." ; \
@@ -373,6 +430,12 @@ endif
 	fi
 endif
 
+check-genfile: \
+	check-genfile-optlib2c-srcs \
+	check-genfile-txt2cstr-srcs \
+	check-genfile-update-docs \
+	check-genfile-win32
+
 #
 # Test installation
 #