mirror of
https://github.com/postgres/postgres.git
synced 2025-10-15 05:46:52 +03:00
Remove maintainer-check target, fold into normal build
make maintainer-check was obscure and rarely called in practice, and many breakages were missed. Fold everything that make maintainer-check used to do into the normal build. Specifically: - Call duplicate_oids when genbki.pl is called. - Check for tabs in SGML files when the documentation is built. - Run msgfmt with the -c option during the regular build. Add an additional configure check to see whether we are using the GNU version. (make maintainer-check probably used to fail with non-GNU msgfmt.) Keep maintainer-check as around as phony target for the time being in case anyone is calling it. But it won't do anything anymore.
This commit is contained in:
@@ -18,11 +18,11 @@
|
||||
#
|
||||
# Meta configuration
|
||||
|
||||
standard_targets = all install installdirs uninstall distprep clean distclean maintainer-clean coverage check installcheck maintainer-check init-po update-po
|
||||
standard_targets = all install installdirs uninstall distprep clean distclean maintainer-clean coverage check installcheck init-po update-po
|
||||
# these targets should recurse even into subdirectories not being built:
|
||||
standard_always_targets = distprep clean distclean maintainer-clean
|
||||
|
||||
.PHONY: $(standard_targets) install-strip html man installcheck-parallel
|
||||
.PHONY: $(standard_targets) install-strip html man installcheck-parallel maintainer-check
|
||||
|
||||
# make `all' the default target
|
||||
all:
|
||||
@@ -283,6 +283,7 @@ perl_embed_ldflags = @perl_embed_ldflags@
|
||||
AWK = @AWK@
|
||||
LN_S = @LN_S@
|
||||
MSGFMT = @MSGFMT@
|
||||
MSGFMT_FLAGS = @MSGFMT_FLAGS@
|
||||
MSGMERGE = @MSGMERGE@
|
||||
PYTHON = @PYTHON@
|
||||
TAR = @TAR@
|
||||
|
@@ -62,7 +62,8 @@ schemapg.h: postgres.bki ;
|
||||
# even in distribution tarballs. So this is cheating a bit, but it
|
||||
# will achieve the goal of updating the version number when it
|
||||
# changes.
|
||||
postgres.bki: genbki.pl Catalog.pm $(POSTGRES_BKI_SRCS) $(top_srcdir)/configure
|
||||
postgres.bki: genbki.pl Catalog.pm $(POSTGRES_BKI_SRCS) $(top_srcdir)/configure $(top_srcdir)/src/include/catalog/duplicate_oids
|
||||
cd $(top_srcdir)/src/include/catalog && ./duplicate_oids
|
||||
$(PERL) -I $(catalogdir) $< $(pg_includes) --set-version=$(MAJORVERSION) $(POSTGRES_BKI_SRCS)
|
||||
|
||||
.PHONY: install-data
|
||||
|
@@ -45,4 +45,4 @@ clean: clean-local
|
||||
clean-local:
|
||||
rm -f $(subsysfilename) $(OBJS)
|
||||
|
||||
$(call recurse,coverage maintainer-check)
|
||||
$(call recurse,coverage)
|
||||
|
@@ -75,6 +75,3 @@ clean:
|
||||
|
||||
distclean maintainer-clean: clean
|
||||
rm -f pg_config.h pg_config_ext.h pg_config_os.h dynloader.h stamp-h stamp-ext-h
|
||||
|
||||
maintainer-check:
|
||||
cd catalog && ./duplicate_oids
|
||||
|
@@ -68,7 +68,7 @@ BACKEND_COMMON_GETTEXT_FLAGS = \
|
||||
all-po: $(MO_FILES)
|
||||
|
||||
%.mo: %.po
|
||||
$(MSGFMT) -o $@ $<
|
||||
$(MSGFMT) $(MSGFMT_FLAGS) -o $@ $<
|
||||
|
||||
ifeq ($(word 1,$(GETTEXT_FILES)),+)
|
||||
po/$(CATALOG_NAME).pot: $(word 2, $(GETTEXT_FILES)) $(MAKEFILE_LIST)
|
||||
@@ -113,12 +113,6 @@ clean-po:
|
||||
rm -f po/$(CATALOG_NAME).pot
|
||||
|
||||
|
||||
maintainer-check-po: $(ALL_PO_FILES)
|
||||
for file in $^; do \
|
||||
$(MSGFMT) -c -v -o /dev/null $$file || exit 1; \
|
||||
done
|
||||
|
||||
|
||||
init-po: po/$(CATALOG_NAME).pot
|
||||
|
||||
|
||||
@@ -155,7 +149,6 @@ install: install-po
|
||||
installdirs: installdirs-po
|
||||
uninstall: uninstall-po
|
||||
clean distclean maintainer-clean: clean-po
|
||||
maintainer-check: maintainer-check-po
|
||||
|
||||
.PHONY: all-po install-po installdirs-po uninstall-po clean-po \
|
||||
maintainer-check-po init-po update-po
|
||||
init-po update-po
|
||||
|
Reference in New Issue
Block a user