build: simplify working with template deps

* Makefile.am: Use text_tpl_deps instead of c_s for automatic
dependency everywhere.
* lib/rpm/Makefile.inc, tests/Makefile.am: Likewise.
* share/postgresql-setup/Makefile.inc: Likewise.
* configure.ac: Don't define c_s as it is not needed now.
* m4/_ax_text_tpl.m4: Add Makefile into auto deps for templates,
that's needed because we don't need to reconfigure to adjust
template outputs, it is enough to define Makefile.am variable.

Author: praiskup

Makefile.am

@@ -51,36 +51,36 @@ pgdoc_DATA = $(readme_dist)
 
 noinst_DATA += $(TEST_GEN_FILES_LIST)
 
-$(ctl): $(ctl_in) $(c_s)
+$(ctl): $(ctl_in) $(text_tpl_deps)
 	$(text_tpl_gen_script)
 
-$(setup): $(setup_in) $(c_s)
+$(setup): $(setup_in) $(text_tpl_deps)
 	$(text_tpl_gen_script)
 
-$(checkdb): $(check) $(checkdb_in) $(c_s)
+$(checkdb): $(check) $(checkdb_in) $(text_tpl_deps)
 	$(text_tpl_gen_script)
 
-$(initscript): $(initscript_in) $(c_s)
+$(initscript): $(initscript_in) $(text_tpl_deps)
 	$(text_tpl_gen_script)
 
-initdb upgrade: legacy-sysv-script.in $(c_s)
+initdb upgrade: legacy-sysv-script.in $(text_tpl_deps)
 	$(text_tpl_gen_script)
 
 # In ideal world, [email protected] would be hardlink to postgresql.service.
 # That would require, however, the rhbz#1141824 resolved so we could install
 # system-default drop-in file.  Make a "almost" duplicate files now.
 
-$(serviceat): $(serviceat_in) $(c_s)
+$(serviceat): $(serviceat_in) $(text_tpl_deps)
 	$(AM_V_GEN)\
 	ax_text_add_sed_substs="-e /@PGDATA_ENVIRONMENT[@]/d" ; \
 	$(text_tpl_gen_verbose)
 
-$(service): $(service_in) $(c_s)
+$(service): $(service_in) $(text_tpl_deps)
 	$(AM_V_GEN)\
 	ax_text_add_sed_substs="-e s|@PGDATA_ENVIRONMENT[@]|Environment=PGDATA=$(PGDATADIR)|" ; \
 	$(text_tpl_gen_verbose)
 
-$(readme_dist_sed): $(readme_template) $(c_s)
+$(readme_dist_sed): $(readme_template) $(text_tpl_deps)
 	$(text_tpl_gen)
 
 $(readme_dist_m4): $(readme_dist_sed)

configure.ac

@@ -63,7 +63,6 @@ conf_dir([pgcontribdocdir],          ['${datarootdir}/doc/${NAME_PACKAGE}-contri
 INSTANTIATE_CONV="\$(AM_V_GEN)rm -rf \$@; \$(MKDIR_P) \$(@D)"
 INSTANTIATE="\$(INSTANTIATE_CONV) && \$(SED_CALL) \$< > \$@ && chmod -w \$@"
 INSTANTIATE_SCRIPT="\$(INSTANTIATE) && chmod +x \$@"
-c_s='$(top_builddir)/config.status'
 
 AC_PATH_PROG([SED], [sed])
 test -z "$ac_cv_path_SED" &&

lib/rpm/Makefile.inc

@@ -6,5 +6,5 @@ rpmmacros_DATA	= $(rpm_macros)
 GENERATED_FILES	+= $(rpmmacros_DATA)
 EXTRA_DIST	+= $(rpm_macros_in)
 
-$(rpm_macros): $(rpm_macros_in) $(c_s)
+$(rpm_macros): $(rpm_macros_in) $(text_tpl_deps)
 	$(text_tpl_gen)

m4/_ax_text_tpl.m4

@@ -123,7 +123,7 @@ text_tpl_gen_script_verbose="\$(text_tpl_gen_verbose) && chmod +x \@S|@@"
 text_tpl_gen_script="\$(AM_V_GEN)\$(text_tpl_gen_script_verbose) && chmod +x \@S|@@"
 
 # Make dependencies for targets of $(text_tpl_gen) and $(text_tpl_gen_script)
-text_tpl_deps='$(top_builddir)/config.status'
+text_tpl_deps='$(top_builddir)/config.status Makefile'
 
 AC_PATH_PROG([SED], [sed])
 test -z "$ac_cv_path_SED" &&

share/postgresql-setup/Makefile.inc

@@ -23,7 +23,7 @@ rawpkgdata_DATA = \
 GENERATED_FILES += $(rawdata_generated_files)
 EXTRA_DIST += $(rawdata_static_files) $(rawdata_template_files)
 
-$(lib): $(lib_in) $(c_s)
+$(lib): $(lib_in) $(text_tpl_deps)
 	$(text_tpl_gen)
 
 # vim: ft=automake noet

tests/Makefile.am

@@ -23,7 +23,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
 TESTSUITE = $(srcdir)/testsuite
 CHECK_DEPS = atconfig atlocal $(TESTSUITE) $(top_builddir)/$(TEST_GEN_FILES_LIST)
 
-atlocal: atlocal.in $(c_s)
+atlocal: atlocal.in $(text_tpl_deps)
 	$(text_tpl_gen)
 
 check-local: $(CHECK_DEPS)