From 395d1259ad7481ef19c1d425ba399c861c667129 Mon Sep 17 00:00:00 2001 From: Bruce Momjian <bruce@momjian.us> Date: Wed, 12 May 2010 11:33:10 +0000 Subject: [PATCH] Add PGFILEDESC description to Makefiles for all /contrib executables. Add PGAPPICON to all executable makefiles. --- contrib/oid2name/Makefile | 5 ++++- contrib/pg_standby/Makefile | 5 ++++- contrib/pg_upgrade/Makefile | 19 ++++++++++--------- contrib/pgbench/Makefile | 5 ++++- contrib/vacuumlo/Makefile | 5 ++++- src/backend/Makefile | 4 +++- src/bin/initdb/Makefile | 4 +++- src/bin/pg_config/Makefile | 4 +++- src/bin/pg_controldata/Makefile | 4 +++- src/bin/pg_ctl/Makefile | 4 +++- src/bin/pg_dump/Makefile | 4 +++- src/bin/pg_resetxlog/Makefile | 4 +++- src/bin/pgevent/Makefile | 2 ++ src/bin/psql/Makefile | 3 ++- src/bin/scripts/Makefile | 4 +++- src/interfaces/ecpg/preproc/Makefile | 4 +++- 16 files changed, 57 insertions(+), 23 deletions(-) diff --git a/contrib/oid2name/Makefile b/contrib/oid2name/Makefile index d5dd1be0308..ce043550afb 100644 --- a/contrib/oid2name/Makefile +++ b/contrib/oid2name/Makefile @@ -1,4 +1,7 @@ -# $PostgreSQL: pgsql/contrib/oid2name/Makefile,v 1.10 2007/11/10 23:59:51 momjian Exp $ +# $PostgreSQL: pgsql/contrib/oid2name/Makefile,v 1.11 2010/05/12 11:33:07 momjian Exp $ + +PGFILEDESC = "oid2name - examine the file structure" +PGAPPICON=win32 PROGRAM = oid2name OBJS = oid2name.o diff --git a/contrib/pg_standby/Makefile b/contrib/pg_standby/Makefile index 74e1358cb05..5e6bbd91458 100644 --- a/contrib/pg_standby/Makefile +++ b/contrib/pg_standby/Makefile @@ -1,4 +1,7 @@ -# $PostgreSQL: pgsql/contrib/pg_standby/Makefile,v 1.5 2009/07/16 09:59:46 heikki Exp $ +# $PostgreSQL: pgsql/contrib/pg_standby/Makefile,v 1.6 2010/05/12 11:33:07 momjian Exp $ + +PGFILEDESC = "pg_standby - supports creation of a warm standby" +PGAPPICON=win32 PROGRAM = pg_standby OBJS = pg_standby.o diff --git a/contrib/pg_upgrade/Makefile b/contrib/pg_upgrade/Makefile index 87d72d977fa..870f3978929 100644 --- a/contrib/pg_upgrade/Makefile +++ b/contrib/pg_upgrade/Makefile @@ -6,17 +6,18 @@ # This Makefile generates an executable and a shared object file # -PROGRAM = pg_upgrade -OBJS = check.o controldata.o dump.o exec.o file.o function.o info.o \ - option.o page.o pg_upgrade.o relfilenode.o server.o \ - tablespace.o util.o version.o version_old_8_3.o $(WIN32RES) +PGFILEDESC = "pg_upgrade - an in-place binary upgrade utility" +PGAPPICON = win32 -PG_CPPFLAGS = -DFRONTEND -DDLSUFFIX=\"$(DLSUFFIX)\" -I$(srcdir) -I$(libpq_srcdir) -PG_LIBS = $(libpq_pgport) +PROGRAM = pg_upgrade +OBJS = check.o controldata.o dump.o exec.o file.o function.o info.o \ + option.o page.o pg_upgrade.o relfilenode.o server.o \ + tablespace.o util.o version.o version_old_8_3.o $(WIN32RES) + +MODULES = pg_upgrade_sysoids -PGFILEDESC = "pg_upgrade - In-Place Binary Upgrade Utility" -PGAPPICON = win32 -MODULES = pg_upgrade_sysoids +PG_CPPFLAGS = -DFRONTEND -DDLSUFFIX=\"$(DLSUFFIX)\" -I$(srcdir) -I$(libpq_srcdir) +PG_LIBS = $(libpq_pgport) ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/contrib/pgbench/Makefile b/contrib/pgbench/Makefile index 0570705dad5..786ba10fd95 100644 --- a/contrib/pgbench/Makefile +++ b/contrib/pgbench/Makefile @@ -1,4 +1,7 @@ -# $PostgreSQL: pgsql/contrib/pgbench/Makefile,v 1.17 2009/08/03 18:30:55 tgl Exp $ +# $PostgreSQL: pgsql/contrib/pgbench/Makefile,v 1.18 2010/05/12 11:33:08 momjian Exp $ + +PGFILEDESC = "pgbench - a simple program for running benchmark tests" +PGAPPICON=win32 PROGRAM = pgbench OBJS = pgbench.o diff --git a/contrib/vacuumlo/Makefile b/contrib/vacuumlo/Makefile index dc1e9524bc5..4c68e695781 100644 --- a/contrib/vacuumlo/Makefile +++ b/contrib/vacuumlo/Makefile @@ -1,4 +1,7 @@ -# $PostgreSQL: pgsql/contrib/vacuumlo/Makefile,v 1.17 2007/11/10 23:59:52 momjian Exp $ +# $PostgreSQL: pgsql/contrib/vacuumlo/Makefile,v 1.18 2010/05/12 11:33:08 momjian Exp $ + +PGFILEDESC = "vacuumlo - removes orphaned large objects" +PGAPPICON=win32 PROGRAM = vacuumlo OBJS = vacuumlo.o diff --git a/src/backend/Makefile b/src/backend/Makefile index 5916aaa5112..6af63db92cf 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -5,11 +5,13 @@ # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/backend/Makefile,v 1.141 2010/01/20 23:12:03 tgl Exp $ +# $PostgreSQL: pgsql/src/backend/Makefile,v 1.142 2010/05/12 11:33:09 momjian Exp $ # #------------------------------------------------------------------------- PGFILEDESC = "PostgreSQL Server" +PGAPPICON=win32 + subdir = src/backend top_builddir = ../.. include $(top_builddir)/src/Makefile.global diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile index 7198f9438a6..4f8771569f0 100644 --- a/src/bin/initdb/Makefile +++ b/src/bin/initdb/Makefile @@ -5,11 +5,13 @@ # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.59 2010/01/02 16:57:58 momjian Exp $ +# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.60 2010/05/12 11:33:09 momjian Exp $ # #------------------------------------------------------------------------- PGFILEDESC = "initdb - initialize a new database cluster" +PGAPPICON=win32 + subdir = src/bin/initdb top_builddir = ../../.. include $(top_builddir)/src/Makefile.global diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile index a9b9f49d64a..43558749654 100644 --- a/src/bin/pg_config/Makefile +++ b/src/bin/pg_config/Makefile @@ -4,11 +4,13 @@ # # Copyright (c) 1998-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/bin/pg_config/Makefile,v 1.23 2010/01/02 16:57:58 momjian Exp $ +# $PostgreSQL: pgsql/src/bin/pg_config/Makefile,v 1.24 2010/05/12 11:33:09 momjian Exp $ # #------------------------------------------------------------------------- PGFILEDESC = "pg_config - report configuration information" +PGAPPICON=win32 + subdir = src/bin/pg_config top_builddir = ../../.. include $(top_builddir)/src/Makefile.global diff --git a/src/bin/pg_controldata/Makefile b/src/bin/pg_controldata/Makefile index f3de00a34e6..c12bf335570 100644 --- a/src/bin/pg_controldata/Makefile +++ b/src/bin/pg_controldata/Makefile @@ -4,11 +4,13 @@ # # Copyright (c) 1998-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/bin/pg_controldata/Makefile,v 1.20 2010/01/02 16:57:58 momjian Exp $ +# $PostgreSQL: pgsql/src/bin/pg_controldata/Makefile,v 1.21 2010/05/12 11:33:09 momjian Exp $ # #------------------------------------------------------------------------- PGFILEDESC = "pg_controldata - reads the data from pg_control" +PGAPPICON=win32 + subdir = src/bin/pg_controldata top_builddir = ../../.. include $(top_builddir)/src/Makefile.global diff --git a/src/bin/pg_ctl/Makefile b/src/bin/pg_ctl/Makefile index 4a85b797303..32a4fc92cb7 100644 --- a/src/bin/pg_ctl/Makefile +++ b/src/bin/pg_ctl/Makefile @@ -5,11 +5,13 @@ # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/bin/pg_ctl/Makefile,v 1.28 2010/01/02 16:57:58 momjian Exp $ +# $PostgreSQL: pgsql/src/bin/pg_ctl/Makefile,v 1.29 2010/05/12 11:33:09 momjian Exp $ # #------------------------------------------------------------------------- PGFILEDESC = "pg_ctl - starts/stops/restarts the PostgreSQL server" +PGAPPICON=win32 + subdir = src/bin/pg_ctl top_builddir = ../../.. include $(top_builddir)/src/Makefile.global diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile index d0920c52ca1..2eeb099b73d 100644 --- a/src/bin/pg_dump/Makefile +++ b/src/bin/pg_dump/Makefile @@ -5,11 +5,13 @@ # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.69 2010/01/02 16:57:58 momjian Exp $ +# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.70 2010/05/12 11:33:09 momjian Exp $ # #------------------------------------------------------------------------- PGFILEDESC = "pg_dump/pg_restore/pg_dumpall - backup and restore PostgreSQL databases" +PGAPPICON=win32 + subdir = src/bin/pg_dump top_builddir = ../../.. include $(top_builddir)/src/Makefile.global diff --git a/src/bin/pg_resetxlog/Makefile b/src/bin/pg_resetxlog/Makefile index 3d836678c0d..57efc8d6e64 100644 --- a/src/bin/pg_resetxlog/Makefile +++ b/src/bin/pg_resetxlog/Makefile @@ -4,11 +4,13 @@ # # Copyright (c) 1998-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/bin/pg_resetxlog/Makefile,v 1.22 2010/01/02 16:57:59 momjian Exp $ +# $PostgreSQL: pgsql/src/bin/pg_resetxlog/Makefile,v 1.23 2010/05/12 11:33:10 momjian Exp $ # #------------------------------------------------------------------------- PGFILEDESC = "pg_resetxlog - reset PostgreSQL WAL log" +PGAPPICON=win32 + subdir = src/bin/pg_resetxlog top_builddir = ../../.. include $(top_builddir)/src/Makefile.global diff --git a/src/bin/pgevent/Makefile b/src/bin/pgevent/Makefile index e0f27e5d5a5..013b801c64f 100644 --- a/src/bin/pgevent/Makefile +++ b/src/bin/pgevent/Makefile @@ -7,6 +7,8 @@ #------------------------------------------------------------------------- PGFILEDESC = "Eventlog message formatter" +PGAPPICON=win32 + PGFILESHLIB = 1 subdir = src/bin/pgevent top_builddir = ../../.. diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile index 7020befb705..80e2daba131 100644 --- a/src/bin/psql/Makefile +++ b/src/bin/psql/Makefile @@ -5,12 +5,13 @@ # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.68 2010/01/02 16:57:59 momjian Exp $ +# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.69 2010/05/12 11:33:10 momjian Exp $ # #------------------------------------------------------------------------- PGFILEDESC = "psql - the PostgreSQL interactive terminal" PGAPPICON=win32 + subdir = src/bin/psql top_builddir = ../../.. include $(top_builddir)/src/Makefile.global diff --git a/src/bin/scripts/Makefile b/src/bin/scripts/Makefile index 5a7616457a4..5cd61ad7c3d 100644 --- a/src/bin/scripts/Makefile +++ b/src/bin/scripts/Makefile @@ -5,11 +5,13 @@ # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/bin/scripts/Makefile,v 1.44 2010/01/02 16:58:00 momjian Exp $ +# $PostgreSQL: pgsql/src/bin/scripts/Makefile,v 1.45 2010/05/12 11:33:10 momjian Exp $ # #------------------------------------------------------------------------- PGFILEDESC = "PostgreSQL utility" +PGAPPICON=win32 + subdir = src/bin/scripts top_builddir = ../../.. include $(top_builddir)/src/Makefile.global diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile index 39f9068ef4d..3c0a4c732f0 100644 --- a/src/interfaces/ecpg/preproc/Makefile +++ b/src/interfaces/ecpg/preproc/Makefile @@ -4,11 +4,13 @@ # # Copyright (c) 1998-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.148 2010/01/02 16:58:11 momjian Exp $ +# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.149 2010/05/12 11:33:10 momjian Exp $ # #------------------------------------------------------------------------- PGFILEDESC = "ecpg - embedded SQL precompiler for C" +PGAPPICON=win32 + subdir = src/interfaces/ecpg/preproc top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -- GitLab