Break up long GETTEXT_FILES lists

One file per line seems best.  We already did this in some cases.
This adopts the same format everywhere (except in some cases where the
list reasonably fits on one line).

diff --git a/src/bin/initdb/nls.mk b/src/bin/initdb/nls.mk
index 19c91368493ed0873449e092a2cdefd551b9a538..80af642dbf9ff476900122532eea4c7dc054a0d6 100644 (file)
--- a/src/bin/initdb/nls.mk
+++ b/src/bin/initdb/nls.mk
@@ -1,5 +1,16 @@
 # src/bin/initdb/nls.mk
 CATALOG_NAME     = initdb
-GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) findtimezone.c initdb.c ../../common/exec.c ../../common/fe_memutils.c ../../common/file_utils.c ../../common/pgfnames.c ../../common/restricted_token.c ../../common/rmtree.c ../../common/username.c ../../common/wait_error.c ../../port/dirmod.c
+GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
+                   findtimezone.c \
+                   initdb.c \
+                   ../../common/exec.c \
+                   ../../common/fe_memutils.c \
+                   ../../common/file_utils.c \
+                   ../../common/pgfnames.c \
+                   ../../common/restricted_token.c \
+                   ../../common/rmtree.c \
+                   ../../common/username.c \
+                   ../../common/wait_error.c \
+                   ../../port/dirmod.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) simple_prompt
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS)

diff --git a/src/bin/pg_ctl/nls.mk b/src/bin/pg_ctl/nls.mk
index 84e7fb4e56084f2ba77658679b5d400864032c68..fd6355483c47c21961453faaf572ea43846cc4df 100644 (file)
--- a/src/bin/pg_ctl/nls.mk
+++ b/src/bin/pg_ctl/nls.mk
@@ -1,3 +1,7 @@
 # src/bin/pg_ctl/nls.mk
 CATALOG_NAME     = pg_ctl
-GETTEXT_FILES    = pg_ctl.c ../../common/exec.c ../../common/fe_memutils.c ../../common/wait_error.c ../../port/path.c
+GETTEXT_FILES    = pg_ctl.c \
+                   ../../common/exec.c \
+                   ../../common/fe_memutils.c \
+                   ../../common/wait_error.c \
+                   ../../port/path.c

diff --git a/src/bin/pg_dump/nls.mk b/src/bin/pg_dump/nls.mk
index 3054f93fadf9f32cd5aa7a21a95b85b0a6c2b1a6..ecb4b79b93856b23322369d73e5e186dc76ee389 100644 (file)
--- a/src/bin/pg_dump/nls.mk
+++ b/src/bin/pg_dump/nls.mk
@@ -1,13 +1,25 @@
 # src/bin/pg_dump/nls.mk
 CATALOG_NAME     = pg_dump
 GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
-                   pg_backup_archiver.c pg_backup_db.c pg_backup_custom.c \
-                   pg_backup_null.c pg_backup_tar.c \
-                   pg_backup_directory.c dumputils.c compress_io.c \
-                   pg_dump.c common.c pg_dump_sort.c \
-                   pg_restore.c pg_dumpall.c \
-                   parallel.c parallel.h pg_backup_utils.c pg_backup_utils.h \
-                   ../../common/exec.c ../../common/fe_memutils.c \
+                   pg_backup_archiver.c \
+                   pg_backup_db.c \
+                   pg_backup_custom.c \
+                   pg_backup_null.c \
+                   pg_backup_tar.c \
+                   pg_backup_directory.c \
+                   dumputils.c \
+                   compress_io.c \
+                   pg_dump.c \
+                   common.c \
+                   pg_dump_sort.c \
+                   pg_restore.c \
+                   pg_dumpall.c \
+                   parallel.c \
+                   parallel.h \
+                   pg_backup_utils.c \
+                   pg_backup_utils.h \
+                   ../../common/exec.c \
+                   ../../common/fe_memutils.c \
                    ../../common/wait_error.c \
                    ../../fe_utils/option_utils.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \

diff --git a/src/bin/pg_resetwal/nls.mk b/src/bin/pg_resetwal/nls.mk
index bc25482f2ca439709b1f866d574221f2f2698bc1..7fc84f0825d7495b1f125b0c5ccea043149b9dff 100644 (file)
--- a/src/bin/pg_resetwal/nls.mk
+++ b/src/bin/pg_resetwal/nls.mk
@@ -1,5 +1,7 @@
 # src/bin/pg_resetwal/nls.mk
 CATALOG_NAME     = pg_resetwal
-GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) pg_resetwal.c ../../common/restricted_token.c
+GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
+                   pg_resetwal.c \
+                   ../../common/restricted_token.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS)

diff --git a/src/bin/pg_rewind/nls.mk b/src/bin/pg_rewind/nls.mk
index 0618cb8c2cff51a7ac6d947d93ec4e8c92bd0332..8f5f20593ab1e45463d1bae0e792c69cbf80f016 100644 (file)
--- a/src/bin/pg_rewind/nls.mk
+++ b/src/bin/pg_rewind/nls.mk
@@ -1,6 +1,19 @@
 # src/bin/pg_rewind/nls.mk
 CATALOG_NAME     = pg_rewind
-GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) datapagemap.c file_ops.c filemap.c libpq_source.c local_source.c parsexlog.c pg_rewind.c timeline.c xlogreader.c ../../common/fe_memutils.c ../../common/restricted_token.c ../../fe_utils/archive.c ../../fe_utils/recovery_gen.c
+GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
+                   datapagemap.c \
+                   file_ops.c \
+                   filemap.c \
+                   libpq_source.c \
+                   local_source.c \
+                   parsexlog.c \
+                   pg_rewind.c \
+                   timeline.c \
+                   xlogreader.c \
+                   ../../common/fe_memutils.c \
+                   ../../common/restricted_token.c \
+                   ../../fe_utils/archive.c \
+                   ../../fe_utils/recovery_gen.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) report_invalid_record:2
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS) \
     report_invalid_record:2:c-format

diff --git a/src/bin/pg_upgrade/nls.mk b/src/bin/pg_upgrade/nls.mk
index 4721fa6b5aa26efa55d0169a71e107826b568350..9e2c1386e20d56924c67a46d6d21713e77d6c38b 100644 (file)
--- a/src/bin/pg_upgrade/nls.mk
+++ b/src/bin/pg_upgrade/nls.mk
@@ -1,8 +1,20 @@
 # src/bin/pg_upgrade/nls.mk
 CATALOG_NAME     = pg_upgrade
-GETTEXT_FILES    = check.c controldata.c dump.c exec.c file.c function.c \
-                   info.c option.c parallel.c pg_upgrade.c relfilenumber.c \
-                   server.c tablespace.c util.c version.c
+GETTEXT_FILES    = check.c \
+                   controldata.c \
+                   dump.c \
+                   exec.c \
+                   file.c \
+                   function.c \
+                   info.c \
+                   option.c \
+                   parallel.c \
+                   pg_upgrade.c \
+                   relfilenumber.c \
+                   server.c \
+                   tablespace.c \
+                   util.c \
+                   version.c
 GETTEXT_TRIGGERS = pg_fatal pg_log:2 prep_status prep_status_progress report_status:2
 GETTEXT_FLAGS    = \
     pg_fatal:1:c-format \

diff --git a/src/bin/pg_waldump/nls.mk b/src/bin/pg_waldump/nls.mk
index 1cc7335d59afa774af78eaf36b3356262cf64621..4f00e129ff4e0465fc05f3c97fe102bef1f66dc4 100644 (file)
--- a/src/bin/pg_waldump/nls.mk
+++ b/src/bin/pg_waldump/nls.mk
@@ -1,6 +1,9 @@
 # src/bin/pg_waldump/nls.mk
 CATALOG_NAME     = pg_waldump
-GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) pg_waldump.c xlogreader.c xlogstats.c
+GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
+                   pg_waldump.c \
+                   xlogreader.c \
+                   xlogstats.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) report_invalid_record:2
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS) \
     report_invalid_record:2:c-format

diff --git a/src/bin/psql/nls.mk b/src/bin/psql/nls.mk
index dad5816b9c737f2f0230f470c377da19ed6dbc1c..cf0b80029183b60aa655854c70cb5cc6b08d0f16 100644 (file)
--- a/src/bin/psql/nls.mk
+++ b/src/bin/psql/nls.mk
@@ -1,13 +1,29 @@
 # src/bin/psql/nls.mk
 CATALOG_NAME     = psql
 GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
-                   command.c common.c copy.c crosstabview.c help.c input.c large_obj.c \
-                   mainloop.c psqlscanslash.c startup.c \
-                   describe.c sql_help.h sql_help.c \
-                   tab-complete.c variables.c \
-                   ../../fe_utils/cancel.c ../../fe_utils/print.c ../../fe_utils/psqlscan.c \
-                   ../../common/exec.c ../../common/fe_memutils.c ../../common/username.c \
-                   ../../common/wait_error.c ../../port/thread.c
+                   command.c \
+                   common.c \
+                   copy.c \
+                   crosstabview.c \
+                   help.c \
+                   input.c \
+                   large_obj.c \
+                   mainloop.c \
+                   psqlscanslash.c \
+                   startup.c \
+                   describe.c \
+                   sql_help.h \
+                   sql_help.c \
+                   tab-complete.c \
+                   variables.c \
+                   ../../fe_utils/cancel.c \
+                   ../../fe_utils/print.c \
+                   ../../fe_utils/psqlscan.c \
+                   ../../common/exec.c \
+                   ../../common/fe_memutils.c \
+                   ../../common/username.c \
+                   ../../common/wait_error.c \
+                   ../../port/thread.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \
                    HELP0 HELPN N_ simple_prompt simple_prompt_extended
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS) \

diff --git a/src/bin/scripts/nls.mk b/src/bin/scripts/nls.mk
index f4638a06f0daecb6c3cd6a4b73d33a46ca115711..5fe63fa71069577d48f05b2c89373c5f46c70dca 100644 (file)
--- a/src/bin/scripts/nls.mk
+++ b/src/bin/scripts/nls.mk
@@ -1,16 +1,22 @@
 # src/bin/scripts/nls.mk
 CATALOG_NAME     = pgscripts
 GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
-                   createdb.c createuser.c \
-                   dropdb.c dropuser.c \
-                   clusterdb.c vacuumdb.c reindexdb.c \
+                   createdb.c \
+                   createuser.c \
+                   dropdb.c \
+                   dropuser.c \
+                   clusterdb.c \
+                   vacuumdb.c \
+                   reindexdb.c \
                    pg_isready.c \
                    common.c \
                    ../../fe_utils/parallel_slot.c \
-                   ../../fe_utils/cancel.c ../../fe_utils/print.c \
+                   ../../fe_utils/cancel.c \
+                   ../../fe_utils/print.c \
                    ../../fe_utils/connect_utils.c \
                    ../../fe_utils/option_utils.c \
                    ../../fe_utils/query_utils.c \
-                   ../../common/fe_memutils.c ../../common/username.c
+                   ../../common/fe_memutils.c \
+                   ../../common/username.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) simple_prompt yesno_prompt
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS)

diff --git a/src/interfaces/libpq/nls.mk b/src/interfaces/libpq/nls.mk
index 4df544ecef56bc6d3d6fe8de510acac87c615df4..b6ed4551831eb2690ce1a942cafac0d832bee835 100644 (file)
--- a/src/interfaces/libpq/nls.mk
+++ b/src/interfaces/libpq/nls.mk
@@ -1,6 +1,19 @@
 # src/interfaces/libpq/nls.mk
 CATALOG_NAME     = libpq
-GETTEXT_FILES    = fe-auth.c fe-auth-scram.c fe-connect.c fe-exec.c fe-gssapi-common.c fe-lobj.c fe-misc.c fe-protocol3.c fe-secure.c fe-secure-common.c fe-secure-gssapi.c fe-secure-openssl.c win32.c ../../port/thread.c
+GETTEXT_FILES    = fe-auth.c \
+                   fe-auth-scram.c \
+                   fe-connect.c \
+                   fe-exec.c \
+                   fe-gssapi-common.c \
+                   fe-lobj.c \
+                   fe-misc.c \
+                   fe-protocol3.c \
+                   fe-secure.c \
+                   fe-secure-common.c \
+                   fe-secure-gssapi.c \
+                   fe-secure-openssl.c \
+                   win32.c \
+                   ../../port/thread.c
 GETTEXT_TRIGGERS = libpq_append_conn_error:2 \
                    libpq_append_error:2 \
                    libpq_gettext pqInternalNotice:2

diff --git a/src/pl/plpgsql/src/nls.mk b/src/pl/plpgsql/src/nls.mk
index 2bd620a8ddd26ed47ad3b26c49176a70b5c7dcfb..e1d3bde6c373a6f7bf0b73962fdc5949a79cab7a 100644 (file)
--- a/src/pl/plpgsql/src/nls.mk
+++ b/src/pl/plpgsql/src/nls.mk
@@ -1,5 +1,10 @@
 # src/pl/plpgsql/src/nls.mk
 CATALOG_NAME     = plpgsql
-GETTEXT_FILES    = pl_comp.c pl_exec.c pl_gram.c pl_funcs.c pl_handler.c pl_scanner.c
+GETTEXT_FILES    = pl_comp.c \
+                   pl_exec.c \
+                   pl_gram.c \
+                   pl_funcs.c \
+                   pl_handler.c \
+                   pl_scanner.c
 GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) yyerror plpgsql_yyerror
 GETTEXT_FLAGS    = $(BACKEND_COMMON_GETTEXT_FLAGS)

diff --git a/src/pl/plpython/nls.mk b/src/pl/plpython/nls.mk
index 4c68a0e571de1c40aa1978d2c61397d10ce9fb4f..e7a25ca01367d5d3ea54c1046742a1d26d471b64 100644 (file)
--- a/src/pl/plpython/nls.mk
+++ b/src/pl/plpython/nls.mk
@@ -1,7 +1,17 @@
 # src/pl/plpython/nls.mk
 CATALOG_NAME     = plpython
-GETTEXT_FILES    = plpy_cursorobject.c plpy_elog.c plpy_exec.c plpy_main.c plpy_planobject.c plpy_plpymodule.c \
-                   plpy_procedure.c plpy_resultobject.c plpy_spi.c plpy_subxactobject.c plpy_typeio.c plpy_util.c
+GETTEXT_FILES    = plpy_cursorobject.c \
+                   plpy_elog.c \
+                   plpy_exec.c \
+                   plpy_main.c \
+                   plpy_planobject.c \
+                   plpy_plpymodule.c \
+                   plpy_procedure.c \
+                   plpy_resultobject.c \
+                   plpy_spi.c \
+                   plpy_subxactobject.c \
+                   plpy_typeio.c \
+                   plpy_util.c
 GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) PLy_elog:2 PLy_exception_set:2 PLy_exception_set_plural:2,3
 GETTEXT_FLAGS    = $(BACKEND_COMMON_GETTEXT_FLAGS) \
     PLy_elog:2:c-format \