diff options
| author | Peter Eisentraut | 2013-10-18 01:52:54 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2013-10-18 02:02:35 +0000 |
| commit | f39418e9b36987ce1dac0c55da1452e43ec46e15 (patch) | |
| tree | 501ed965e65b7d3c6b1f66c78372002b6f488e6f /src/bin | |
| parent | ed632ab21e9c638328498a85ccf77452645943bb (diff) | |
Switch dependency order of libpgcommon and libpgport
Continuing 63f32f3416a8b4f8e057dc184e8e8eae734ccc8a, libpgcommon should
depend on libpgport, but not vice versa. But wait_result_to_str() in
wait_error.c depends on pstrdup() in libpgcommon. So move exec.c and
wait_error.c from libpgport to libpgcommon. Also switch the link order
in the place that's actually used by the failing ecpg builds.
The function declarations have been left in port.h for now. That should
perhaps be separated sometime.
Diffstat (limited to 'src/bin')
| -rw-r--r-- | src/bin/initdb/nls.mk | 2 | ||||
| -rw-r--r-- | src/bin/pg_config/nls.mk | 2 | ||||
| -rw-r--r-- | src/bin/pg_ctl/nls.mk | 2 | ||||
| -rw-r--r-- | src/bin/pg_dump/nls.mk | 2 | ||||
| -rw-r--r-- | src/bin/psql/nls.mk | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/bin/initdb/nls.mk b/src/bin/initdb/nls.mk index c0e85fcda8..f10b6177f2 100644 --- a/src/bin/initdb/nls.mk +++ b/src/bin/initdb/nls.mk @@ -1,5 +1,5 @@ # src/bin/initdb/nls.mk CATALOG_NAME = initdb AVAIL_LANGUAGES = cs de es fr it ja pl pt_BR ru zh_CN -GETTEXT_FILES = findtimezone.c initdb.c ../../common/fe_memutils.c ../../port/dirmod.c ../../port/exec.c ../../port/wait_error.c +GETTEXT_FILES = findtimezone.c initdb.c ../../common/exec.c ../../common/fe_memutils.c ../../common/wait_error.c ../../port/dirmod.c GETTEXT_TRIGGERS = simple_prompt diff --git a/src/bin/pg_config/nls.mk b/src/bin/pg_config/nls.mk index 2888c46204..387bbf2c28 100644 --- a/src/bin/pg_config/nls.mk +++ b/src/bin/pg_config/nls.mk @@ -1,4 +1,4 @@ # src/bin/pg_config/nls.mk CATALOG_NAME = pg_config AVAIL_LANGUAGES = cs de es fr it ja ko nb pl pt_BR ro ru sv ta tr zh_CN zh_TW -GETTEXT_FILES = pg_config.c ../../port/exec.c +GETTEXT_FILES = pg_config.c ../../common/exec.c diff --git a/src/bin/pg_ctl/nls.mk b/src/bin/pg_ctl/nls.mk index 51a21a6c47..187df40883 100644 --- a/src/bin/pg_ctl/nls.mk +++ b/src/bin/pg_ctl/nls.mk @@ -1,4 +1,4 @@ # src/bin/pg_ctl/nls.mk CATALOG_NAME = pg_ctl AVAIL_LANGUAGES = cs de es fr it ja pl pt_BR ru sv zh_CN zh_TW -GETTEXT_FILES = pg_ctl.c ../../common/fe_memutils.c ../../port/exec.c ../../port/wait_error.c +GETTEXT_FILES = pg_ctl.c ../../common/exec.c ../../common/fe_memutils.c ../../common/wait_error.c diff --git a/src/bin/pg_dump/nls.mk b/src/bin/pg_dump/nls.mk index 278a0fb5e6..bf40e28eaf 100644 --- a/src/bin/pg_dump/nls.mk +++ b/src/bin/pg_dump/nls.mk @@ -7,7 +7,7 @@ GETTEXT_FILES = pg_backup_archiver.c pg_backup_db.c pg_backup_custom.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/fe_memutils.c ../../port/exec.c + ../../common/exec.c ../../common/fe_memutils.c GETTEXT_TRIGGERS = write_msg:2 exit_horribly:2 simple_prompt \ ExecuteSqlCommand:3 ahlog:3 warn_or_exit_horribly:3 GETTEXT_FLAGS = \ diff --git a/src/bin/psql/nls.mk b/src/bin/psql/nls.mk index b7c739fb9c..e2505f1774 100644 --- a/src/bin/psql/nls.mk +++ b/src/bin/psql/nls.mk @@ -4,6 +4,6 @@ AVAIL_LANGUAGES = cs de es fr it ja pl pt_BR ru zh_CN zh_TW GETTEXT_FILES = command.c common.c copy.c help.c input.c large_obj.c \ mainloop.c print.c psqlscan.c startup.c describe.c sql_help.h sql_help.c \ tab-complete.c variables.c \ - ../../common/fe_memutils.c ../../port/exec.c ../../port/wait_error.c + ../../common/exec.c ../../common/fe_memutils.c ../../common/wait_error.c GETTEXT_TRIGGERS = N_ psql_error simple_prompt GETTEXT_FLAGS = psql_error:1:c-format |