Commit 01368e5d authored by Andres Freund's avatar Andres Freund

Split all OBJS style lines in makefiles into one-line-per-entry style.

When maintaining or merging patches, one of the most common sources
for conflicts are the list of objects in makefiles. Especially when
the split across lines has been changed on both sides, which is
somewhat common due to attempting to stay below 80 columns, those
conflicts are unnecessarily laborious to resolve.

By splitting, and alphabetically sorting, OBJS style lines into one
object per line, conflicts should be less frequent, and easier to
resolve when they still occur.

Author: Andres Freund
Discussion: https://postgr.es/m/20191029200901.vww4idgcxv74cwes@alap3.anarazel.de
parent 66c61c81
# contrib/adminpack/Makefile
MODULE_big = adminpack
OBJS = adminpack.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
adminpack.o
PG_CPPFLAGS = -I$(libpq_srcdir)
EXTENSION = adminpack
......
# contrib/amcheck/Makefile
MODULE_big = amcheck
OBJS = verify_nbtree.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
verify_nbtree.o
EXTENSION = amcheck
DATA = amcheck--1.1--1.2.sql amcheck--1.0--1.1.sql amcheck--1.0.sql
......
# contrib/auto_explain/Makefile
MODULE_big = auto_explain
OBJS = auto_explain.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
auto_explain.o
PGFILEDESC = "auto_explain - logging facility for execution plans"
ifdef USE_PGXS
......
# contrib/bloom/Makefile
MODULE_big = bloom
OBJS = blcost.o blinsert.o blscan.o blutils.o blvacuum.o blvalidate.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
blcost.o \
blinsert.o \
blscan.o \
blutils.o \
blvacuum.o \
blvalidate.o
EXTENSION = bloom
DATA = bloom--1.0.sql
......
# contrib/btree_gin/Makefile
MODULE_big = btree_gin
OBJS = btree_gin.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
btree_gin.o
EXTENSION = btree_gin
DATA = btree_gin--1.0.sql btree_gin--1.0--1.1.sql btree_gin--1.1--1.2.sql \
......
......@@ -2,12 +2,31 @@
MODULE_big = btree_gist
OBJS = btree_gist.o btree_utils_num.o btree_utils_var.o btree_int2.o \
btree_int4.o btree_int8.o btree_float4.o btree_float8.o btree_cash.o \
btree_oid.o btree_ts.o btree_time.o btree_date.o btree_interval.o \
btree_macaddr.o btree_macaddr8.o btree_inet.o btree_text.o \
btree_bytea.o btree_bit.o btree_numeric.o btree_uuid.o \
btree_enum.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
btree_bit.o \
btree_bytea.o \
btree_cash.o \
btree_date.o \
btree_enum.o \
btree_float4.o \
btree_float8.o \
btree_gist.o \
btree_inet.o \
btree_int2.o \
btree_int4.o \
btree_int8.o \
btree_interval.o \
btree_macaddr.o \
btree_macaddr8.o \
btree_numeric.o \
btree_oid.o \
btree_text.o \
btree_time.o \
btree_ts.o \
btree_utils_num.o \
btree_utils_var.o \
btree_uuid.o
EXTENSION = btree_gist
DATA = btree_gist--unpackaged--1.0.sql btree_gist--1.0--1.1.sql \
......
# contrib/cube/Makefile
MODULE_big = cube
OBJS= cube.o cubeparse.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
cube.o \
cubeparse.o
EXTENSION = cube
DATA = cube--1.2.sql cube--1.2--1.3.sql cube--1.3--1.4.sql \
......
# contrib/dblink/Makefile
MODULE_big = dblink
OBJS = dblink.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
dblink.o
PG_CPPFLAGS = -I$(libpq_srcdir)
SHLIB_LINK_INTERNAL = $(libpq)
......
# contrib/dict_int/Makefile
MODULE_big = dict_int
OBJS = dict_int.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
dict_int.o
EXTENSION = dict_int
DATA = dict_int--1.0.sql dict_int--unpackaged--1.0.sql
......
# contrib/dict_xsyn/Makefile
MODULE_big = dict_xsyn
OBJS = dict_xsyn.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
dict_xsyn.o
EXTENSION = dict_xsyn
DATA = dict_xsyn--1.0.sql dict_xsyn--unpackaged--1.0.sql
......
# contrib/fuzzystrmatch/Makefile
MODULE_big = fuzzystrmatch
OBJS = fuzzystrmatch.o dmetaphone.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
dmetaphone.o \
fuzzystrmatch.o
EXTENSION = fuzzystrmatch
DATA = fuzzystrmatch--1.1.sql fuzzystrmatch--1.0--1.1.sql \
......
# contrib/hstore/Makefile
MODULE_big = hstore
OBJS = hstore_io.o hstore_op.o hstore_gist.o hstore_gin.o hstore_compat.o \
$(WIN32RES)
OBJS = \
$(WIN32RES) \
hstore_compat.o \
hstore_gin.o \
hstore_gist.o \
hstore_io.o \
hstore_op.o
EXTENSION = hstore
DATA = hstore--1.4.sql \
......
# contrib/hstore_plperl/Makefile
MODULE_big = hstore_plperl
OBJS = hstore_plperl.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
hstore_plperl.o
PGFILEDESC = "hstore_plperl - hstore transform for plperl"
......
# contrib/hstore_plpython/Makefile
MODULE_big = hstore_plpython$(python_majorversion)
OBJS = hstore_plpython.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
hstore_plpython.o
PGFILEDESC = "hstore_plpython - hstore transform for plpython"
EXTENSION = hstore_plpythonu hstore_plpython2u hstore_plpython3u
......
# contrib/intarray/Makefile
MODULE_big = _int
OBJS = _int_bool.o _int_gist.o _int_op.o _int_tool.o \
_intbig_gist.o _int_gin.o _int_selfuncs.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
_int_bool.o \
_int_gin.o \
_int_gist.o \
_int_op.o \
_int_selfuncs.o \
_int_tool.o \
_intbig_gist.o
EXTENSION = intarray
DATA = intarray--1.2.sql intarray--1.1--1.2.sql intarray--1.0--1.1.sql \
......
# contrib/jsonb_plperl/Makefile
MODULE_big = jsonb_plperl
OBJS = jsonb_plperl.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
jsonb_plperl.o
PGFILEDESC = "jsonb_plperl - jsonb transform for plperl"
PG_CPPFLAGS = -I$(top_srcdir)/src/pl/plperl
......
# contrib/jsonb_plpython/Makefile
MODULE_big = jsonb_plpython$(python_majorversion)
OBJS = jsonb_plpython.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
jsonb_plpython.o
PGFILEDESC = "jsonb_plpython - transform between jsonb and plpythonu"
PG_CPPFLAGS = -I$(top_srcdir)/src/pl/plpython $(python_includespec) -DPLPYTHON_LIBNAME='"plpython$(python_majorversion)"'
......
# contrib/ltree/Makefile
MODULE_big = ltree
OBJS = ltree_io.o ltree_op.o lquery_op.o _ltree_op.o crc32.o \
ltxtquery_io.o ltxtquery_op.o ltree_gist.o _ltree_gist.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
_ltree_gist.o \
_ltree_op.o \
crc32.o \
lquery_op.o \
ltree_gist.o \
ltree_io.o \
ltree_op.o \
ltxtquery_io.o \
ltxtquery_op.o
PG_CPPFLAGS = -DLOWER_NODE
EXTENSION = ltree
......
# contrib/ltree_plpython/Makefile
MODULE_big = ltree_plpython$(python_majorversion)
OBJS = ltree_plpython.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
ltree_plpython.o
PGFILEDESC = "ltree_plpython - ltree transform for plpython"
EXTENSION = ltree_plpythonu ltree_plpython2u ltree_plpython3u
......
......@@ -4,7 +4,9 @@ PGFILEDESC = "oid2name - examine the file structure"
PGAPPICON = win32
PROGRAM = oid2name
OBJS = oid2name.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
oid2name.o
TAP_TESTS = 1
......
# contrib/pageinspect/Makefile
MODULE_big = pageinspect
OBJS = rawpage.o heapfuncs.o btreefuncs.o fsmfuncs.o \
brinfuncs.o ginfuncs.o hashfuncs.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
brinfuncs.o \
btreefuncs.o \
fsmfuncs.o \
ginfuncs.o \
hashfuncs.o \
heapfuncs.o \
rawpage.o
EXTENSION = pageinspect
DATA = pageinspect--1.7--1.8.sql pageinspect--1.6--1.7.sql \
......
# contrib/passwordcheck/Makefile
MODULE_big = passwordcheck
OBJS = passwordcheck.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
passwordcheck.o
PGFILEDESC = "passwordcheck - strengthen user password checks"
# uncomment the following two lines to enable cracklib support
......
# contrib/pg_buffercache/Makefile
MODULE_big = pg_buffercache
OBJS = pg_buffercache_pages.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
pg_buffercache_pages.o
EXTENSION = pg_buffercache
DATA = pg_buffercache--1.2.sql pg_buffercache--1.2--1.3.sql \
......
# contrib/pg_freespacemap/Makefile
MODULE_big = pg_freespacemap
OBJS = pg_freespacemap.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
pg_freespacemap.o
EXTENSION = pg_freespacemap
DATA = pg_freespacemap--1.1.sql pg_freespacemap--1.1--1.2.sql \
......
# contrib/pg_prewarm/Makefile
MODULE_big = pg_prewarm
OBJS = pg_prewarm.o autoprewarm.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
autoprewarm.o \
pg_prewarm.o
EXTENSION = pg_prewarm
DATA = pg_prewarm--1.1--1.2.sql pg_prewarm--1.1.sql pg_prewarm--1.0--1.1.sql
......
......@@ -4,7 +4,9 @@ PGFILEDESC = "pg_standby - supports creation of a warm standby"
PGAPPICON = win32
PROGRAM = pg_standby
OBJS = pg_standby.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
pg_standby.o
ifdef USE_PGXS
PG_CONFIG = pg_config
......
# contrib/pg_stat_statements/Makefile
MODULE_big = pg_stat_statements
OBJS = pg_stat_statements.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
pg_stat_statements.o
EXTENSION = pg_stat_statements
DATA = pg_stat_statements--1.4.sql pg_stat_statements--1.6--1.7.sql \
......
# contrib/pg_trgm/Makefile
MODULE_big = pg_trgm
OBJS = trgm_op.o trgm_gist.o trgm_gin.o trgm_regexp.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
trgm_gin.o \
trgm_gist.o \
trgm_op.o \
trgm_regexp.o
EXTENSION = pg_trgm
DATA = pg_trgm--1.3--1.4.sql \
......
# contrib/pg_visibility/Makefile
MODULE_big = pg_visibility
OBJS = pg_visibility.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
pg_visibility.o
EXTENSION = pg_visibility
DATA = pg_visibility--1.1.sql pg_visibility--1.1--1.2.sql \
......
......@@ -14,16 +14,35 @@ CF_SRCS = $(if $(subst no,,$(with_openssl)), $(OSSL_SRCS), $(INT_SRCS))
CF_TESTS = $(if $(subst no,,$(with_openssl)), $(OSSL_TESTS), $(INT_TESTS))
CF_PGP_TESTS = $(if $(subst no,,$(with_zlib)), $(ZLIB_TST), $(ZLIB_OFF_TST))
SRCS = pgcrypto.c px.c px-hmac.c px-crypt.c \
crypt-gensalt.c crypt-blowfish.c crypt-des.c \
crypt-md5.c $(CF_SRCS) \
mbuf.c pgp.c pgp-armor.c pgp-cfb.c pgp-compress.c \
pgp-decrypt.c pgp-encrypt.c pgp-info.c pgp-mpi.c \
pgp-pubdec.c pgp-pubenc.c pgp-pubkey.c pgp-s2k.c \
pgp-pgsql.c
SRCS = \
$(CF_SRCS) \
crypt-blowfish.c \
crypt-des.c \
crypt-gensalt.c \
crypt-md5.c \
mbuf.c \
pgcrypto.c \
pgp-armor.c \
pgp-cfb.c \
pgp-compress.c \
pgp-decrypt.c \
pgp-encrypt.c \
pgp-info.c \
pgp-mpi.c \
pgp-pgsql.c \
pgp-pubdec.c \
pgp-pubenc.c \
pgp-pubkey.c \
pgp-s2k.c \
pgp.c \
px-crypt.c \
px-hmac.c \
px.c
MODULE_big = pgcrypto
OBJS = $(SRCS:.c=.o) $(WIN32RES)
OBJS = \
$(SRCS:.c=.o) \
$(WIN32RES)
EXTENSION = pgcrypto
DATA = pgcrypto--1.3.sql pgcrypto--1.2--1.3.sql pgcrypto--1.1--1.2.sql \
......
# contrib/pgrowlocks/Makefile
MODULE_big = pgrowlocks
OBJS = pgrowlocks.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
pgrowlocks.o
EXTENSION = pgrowlocks
DATA = pgrowlocks--1.2.sql pgrowlocks--1.1--1.2.sql pgrowlocks--1.0--1.1.sql \
......
# contrib/pgstattuple/Makefile
MODULE_big = pgstattuple
OBJS = pgstattuple.o pgstatindex.o pgstatapprox.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
pgstatapprox.o \
pgstatindex.o \
pgstattuple.o
EXTENSION = pgstattuple
DATA = pgstattuple--1.4.sql pgstattuple--1.4--1.5.sql \
......
# contrib/postgres_fdw/Makefile
MODULE_big = postgres_fdw
OBJS = postgres_fdw.o option.o deparse.o connection.o shippable.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
connection.o \
deparse.o \
option.o \
postgres_fdw.o \
shippable.o
PGFILEDESC = "postgres_fdw - foreign data wrapper for PostgreSQL"
PG_CPPFLAGS = -I$(libpq_srcdir)
......
# contrib/seg/Makefile
MODULE_big = seg
OBJS = seg.o segparse.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
seg.o \
segparse.o
EXTENSION = seg
DATA = seg--1.1.sql seg--1.1--1.2.sql seg--1.2--1.3.sql \
......
# contrib/sepgsql/Makefile
MODULE_big = sepgsql
OBJS = hooks.o selinux.o uavc.o label.o dml.o \
database.o schema.o relation.o proc.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
database.o \
dml.o \
hooks.o \
label.o \
proc.o \
relation.o \
schema.o \
selinux.o \
uavc.o
DATA_built = sepgsql.sql
PGFILEDESC = "sepgsql - SELinux integration"
......
# contrib/sslinfo/Makefile
MODULE_big = sslinfo
OBJS = sslinfo.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
sslinfo.o
EXTENSION = sslinfo
DATA = sslinfo--1.2.sql sslinfo--1.1--1.2.sql sslinfo--1.0--1.1.sql \
......
# contrib/tsm_system_rows/Makefile
MODULE_big = tsm_system_rows
OBJS = tsm_system_rows.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
tsm_system_rows.o
PGFILEDESC = "tsm_system_rows - TABLESAMPLE method which accepts number of rows as a limit"
EXTENSION = tsm_system_rows
......
# contrib/tsm_system_time/Makefile
MODULE_big = tsm_system_time
OBJS = tsm_system_time.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
tsm_system_time.o
PGFILEDESC = "tsm_system_time - TABLESAMPLE method which accepts time in milliseconds as a limit"
EXTENSION = tsm_system_time
......
# contrib/unaccent/Makefile
MODULE_big = unaccent
OBJS = unaccent.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
unaccent.o
EXTENSION = unaccent
DATA = unaccent--1.1.sql unaccent--1.0--1.1.sql unaccent--unpackaged--1.0.sql
......
# contrib/uuid-ossp/Makefile
MODULE_big = uuid-ossp
OBJS = uuid-ossp.o $(UUID_EXTRA_OBJS) $(WIN32RES)
OBJS = \
$(UUID_EXTRA_OBJS) \
$(WIN32RES) \
uuid-ossp.o
EXTENSION = uuid-ossp
DATA = uuid-ossp--1.1.sql uuid-ossp--1.0--1.1.sql uuid-ossp--unpackaged--1.0.sql
......
......@@ -4,7 +4,9 @@ PGFILEDESC = "vacuumlo - removes orphaned large objects"
PGAPPICON = win32
PROGRAM = vacuumlo
OBJS = vacuumlo.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
vacuumlo.o
TAP_TESTS = 1
......
# contrib/xml2/Makefile
MODULE_big = pgxml
OBJS = xpath.o xslt_proc.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
xpath.o \
xslt_proc.o
EXTENSION = xml2
DATA = xml2--1.1.sql xml2--1.0--1.1.sql xml2--unpackaged--1.0.sql
......
......@@ -37,8 +37,11 @@ LOCALOBJS += utils/probes.o
endif
endif
OBJS = $(SUBDIROBJS) $(LOCALOBJS) $(top_builddir)/src/port/libpgport_srv.a \
$(top_builddir)/src/common/libpgcommon_srv.a
OBJS = \
$(LOCALOBJS) \
$(SUBDIROBJS) \
$(top_builddir)/src/common/libpgcommon_srv.a \
$(top_builddir)/src/port/libpgport_srv.a
# We put libpgport and libpgcommon into OBJS, so remove it from LIBS; also add
# libldap and ICU
......
......@@ -12,7 +12,14 @@ subdir = src/backend/access/brin
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = brin.o brin_pageops.o brin_revmap.o brin_tuple.o brin_xlog.o \
brin_minmax.o brin_inclusion.o brin_validate.o
OBJS = \
brin.o \
brin_inclusion.o \
brin_minmax.o \
brin_pageops.o \
brin_revmap.o \
brin_tuple.o \
brin_validate.o \
brin_xlog.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,8 +12,19 @@ subdir = src/backend/access/common
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = bufmask.o detoast.o heaptuple.o indextuple.o printsimple.o \
printtup.o relation.o reloptions.o scankey.o session.o toast_internals.o \
tupconvert.o tupdesc.o
OBJS = \
bufmask.o \
detoast.o \
heaptuple.o \
indextuple.o \
printsimple.o \
printtup.o \
relation.o \
reloptions.o \
scankey.o \
session.o \
toast_internals.o \
tupconvert.o \
tupdesc.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,8 +12,21 @@ subdir = src/backend/access/gin
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = ginutil.o gininsert.o ginxlog.o ginentrypage.o gindatapage.o \
ginbtree.o ginscan.o ginget.o ginvacuum.o ginarrayproc.o \
ginbulk.o ginfast.o ginpostinglist.o ginlogic.o ginvalidate.o
OBJS = \
ginarrayproc.o \
ginbtree.o \
ginbulk.o \
gindatapage.o \
ginentrypage.o \
ginfast.o \
ginget.o \
gininsert.o \
ginlogic.o \
ginpostinglist.o \
ginscan.o \
ginutil.o \
ginvacuum.o \
ginvalidate.o \
ginxlog.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,7 +12,17 @@ subdir = src/backend/access/gist
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = gist.o gistutil.o gistxlog.o gistvacuum.o gistget.o gistscan.o \
gistproc.o gistsplit.o gistbuild.o gistbuildbuffers.o gistvalidate.o
OBJS = \
gist.o \
gistbuild.o \
gistbuildbuffers.o \
gistget.o \
gistproc.o \
gistscan.o \
gistsplit.o \
gistutil.o \
gistvacuum.o \
gistvalidate.o \
gistxlog.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,7 +12,16 @@ subdir = src/backend/access/hash
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = hash.o hashfunc.o hashinsert.o hashovfl.o hashpage.o hashsearch.o \
hashsort.o hashutil.o hashvalidate.o hash_xlog.o
OBJS = \
hash.o \
hash_xlog.o \
hashfunc.o \
hashinsert.o \
hashovfl.o \
hashpage.o \
hashsearch.o \
hashsort.o \
hashutil.o \
hashvalidate.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,7 +12,16 @@ subdir = src/backend/access/heap
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = heapam.o heapam_handler.o heapam_visibility.o hio.o pruneheap.o rewriteheap.o \
syncscan.o heaptoast.o vacuumlazy.o visibilitymap.o
OBJS = \
heapam.o \
heapam_handler.o \
heapam_visibility.o \
heaptoast.o \
hio.o \
pruneheap.o \
rewriteheap.o \
syncscan.o \
vacuumlazy.o \
visibilitymap.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,6 +12,10 @@ subdir = src/backend/access/index
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = amapi.o amvalidate.o genam.o indexam.o
OBJS = \
amapi.o \
amvalidate.o \
genam.o \
indexam.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,7 +12,16 @@ subdir = src/backend/access/nbtree
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = nbtcompare.o nbtinsert.o nbtpage.o nbtree.o nbtsearch.o \
nbtsplitloc.o nbtutils.o nbtsort.o nbtvalidate.o nbtxlog.o
OBJS = \
nbtcompare.o \
nbtinsert.o \
nbtpage.o \
nbtree.o \
nbtsearch.o \
nbtsort.o \
nbtsplitloc.o \
nbtutils.o \
nbtvalidate.o \
nbtxlog.o
include $(top_srcdir)/src/backend/common.mk
......@@ -8,9 +8,27 @@ subdir = src/backend/access/rmgrdesc
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = brindesc.o clogdesc.o committsdesc.o dbasedesc.o genericdesc.o \
gindesc.o gistdesc.o hashdesc.o heapdesc.o logicalmsgdesc.o \
mxactdesc.o nbtdesc.o relmapdesc.o replorigindesc.o seqdesc.o \
smgrdesc.o spgdesc.o standbydesc.o tblspcdesc.o xactdesc.o xlogdesc.o
OBJS = \
brindesc.o \
clogdesc.o \
committsdesc.o \
dbasedesc.o \
genericdesc.o \
gindesc.o \
gistdesc.o \
hashdesc.o \
heapdesc.o \
logicalmsgdesc.o \
mxactdesc.o \
nbtdesc.o \
relmapdesc.o \
replorigindesc.o \
seqdesc.o \
smgrdesc.o \
spgdesc.o \
standbydesc.o \
tblspcdesc.o \
xactdesc.o \
xlogdesc.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,9 +12,17 @@ subdir = src/backend/access/spgist
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = spgutils.o spginsert.o spgscan.o spgvacuum.o spgvalidate.o \
spgdoinsert.o spgxlog.o \
spgtextproc.o spgquadtreeproc.o spgkdtreeproc.o \
spgproc.o
OBJS = \
spgdoinsert.o \
spginsert.o \
spgkdtreeproc.o \
spgproc.o \
spgquadtreeproc.o \
spgscan.o \
spgtextproc.o \
spgutils.o \
spgvacuum.o \
spgvalidate.o \
spgxlog.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,6 +12,10 @@ subdir = src/backend/access/table
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = table.o tableam.o tableamapi.o toast_helper.o
OBJS = \
table.o \
tableam.o \
tableamapi.o \
toast_helper.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,6 +12,9 @@ subdir = src/backend/access/tablesample
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = bernoulli.o system.o tablesample.o
OBJS = \
bernoulli.o \
system.o \
tablesample.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,10 +12,27 @@ subdir = src/backend/access/transam
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = clog.o commit_ts.o generic_xlog.o multixact.o parallel.o rmgr.o slru.o \
subtrans.o timeline.o transam.o twophase.o twophase_rmgr.o varsup.o \
xact.o xlog.o xlogarchive.o xlogfuncs.o \
xloginsert.o xlogreader.o xlogutils.o
OBJS = \
clog.o \
commit_ts.o \
generic_xlog.o \
multixact.o \
parallel.o \
rmgr.o \
slru.o \
subtrans.o \
timeline.o \
transam.o \
twophase.o \
twophase_rmgr.o \
varsup.o \
xact.o \
xlog.o \
xlogarchive.o \
xlogfuncs.o \
xloginsert.o \
xlogreader.o \
xlogutils.o
include $(top_srcdir)/src/backend/common.mk
......
......@@ -12,7 +12,9 @@ include $(top_builddir)/src/Makefile.global
override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
OBJS= bootparse.o bootstrap.o
OBJS = \
bootparse.o \
bootstrap.o
include $(top_srcdir)/src/backend/common.mk
......
......@@ -13,13 +13,36 @@ subdir = src/backend/catalog
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
OBJS = catalog.o dependency.o heap.o index.o indexing.o namespace.o aclchk.o \
objectaccess.o objectaddress.o partition.o pg_aggregate.o pg_collation.o \
pg_constraint.o pg_conversion.o \
pg_depend.o pg_enum.o pg_inherits.o pg_largeobject.o pg_namespace.o \
pg_operator.o pg_proc.o pg_publication.o pg_range.o \
pg_db_role_setting.o pg_shdepend.o pg_subscription.o pg_type.o \
storage.o toasting.o
OBJS = \
aclchk.o \
catalog.o \
dependency.o \
heap.o \
index.o \
indexing.o \
namespace.o \
objectaccess.o \
objectaddress.o \
partition.o \
pg_aggregate.o \
pg_collation.o \
pg_constraint.o \
pg_conversion.o \
pg_db_role_setting.o \
pg_depend.o \
pg_enum.o \
pg_inherits.o \
pg_largeobject.o \
pg_namespace.o \
pg_operator.o \
pg_proc.o \
pg_publication.o \
pg_range.o \
pg_shdepend.o \
pg_subscription.o \
pg_type.o \
storage.o \
toasting.o
BKIFILES = postgres.bki postgres.description postgres.shdescription
......
......@@ -12,14 +12,51 @@ subdir = src/backend/commands
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
OBJS = amcmds.o aggregatecmds.o alter.o analyze.o async.o cluster.o comment.o \
collationcmds.o constraint.o conversioncmds.o copy.o createas.o \
dbcommands.o define.o discard.o dropcmds.o \
event_trigger.o explain.o extension.o foreigncmds.o functioncmds.o \
indexcmds.o lockcmds.o matview.o operatorcmds.o opclasscmds.o \
policy.o portalcmds.o prepare.o proclang.o publicationcmds.o \
schemacmds.o seclabel.o sequence.o statscmds.o subscriptioncmds.o \
tablecmds.o tablespace.o trigger.o tsearchcmds.o typecmds.o user.o \
vacuum.o variable.o view.o
OBJS = \
aggregatecmds.o \
alter.o \
amcmds.o \
analyze.o \
async.o \
cluster.o \
collationcmds.o \
comment.o \
constraint.o \
conversioncmds.o \
copy.o \
createas.o \
dbcommands.o \
define.o \
discard.o \
dropcmds.o \
event_trigger.o \
explain.o \
extension.o \
foreigncmds.o \
functioncmds.o \
indexcmds.o \
lockcmds.o \
matview.o \
opclasscmds.o \
operatorcmds.o \
policy.o \
portalcmds.o \
prepare.o \
proclang.o \
publicationcmds.o \
schemacmds.o \
seclabel.o \
sequence.o \
statscmds.o \
subscriptioncmds.o \
tablecmds.o \
tablespace.o \
trigger.o \
tsearchcmds.o \
typecmds.o \
user.o \
vacuum.o \
variable.o \
view.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,23 +12,67 @@ subdir = src/backend/executor
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
OBJS = execAmi.o execCurrent.o execExpr.o execExprInterp.o \
execGrouping.o execIndexing.o execJunk.o \
execMain.o execParallel.o execPartition.o execProcnode.o \
execReplication.o execScan.o execSRF.o execTuples.o \
execUtils.o functions.o instrument.o nodeAppend.o nodeAgg.o \
nodeBitmapAnd.o nodeBitmapOr.o \
nodeBitmapHeapscan.o nodeBitmapIndexscan.o \
nodeCustom.o nodeFunctionscan.o nodeGather.o \
nodeHash.o nodeHashjoin.o nodeIndexscan.o nodeIndexonlyscan.o \
nodeLimit.o nodeLockRows.o nodeGatherMerge.o \
nodeMaterial.o nodeMergeAppend.o nodeMergejoin.o nodeModifyTable.o \
nodeNestloop.o nodeProjectSet.o nodeRecursiveunion.o nodeResult.o \
nodeSamplescan.o nodeSeqscan.o nodeSetOp.o nodeSort.o nodeUnique.o \
nodeValuesscan.o \
nodeCtescan.o nodeNamedtuplestorescan.o nodeWorktablescan.o \
nodeGroup.o nodeSubplan.o nodeSubqueryscan.o nodeTidscan.o \
nodeForeignscan.o nodeWindowAgg.o tstoreReceiver.o tqueue.o spi.o \
nodeTableFuncscan.o
OBJS = \
execAmi.o \
execCurrent.o \
execExpr.o \
execExprInterp.o \
execGrouping.o \
execIndexing.o \
execJunk.o \
execMain.o \
execParallel.o \
execPartition.o \
execProcnode.o \
execReplication.o \
execSRF.o \
execScan.o \
execTuples.o \
execUtils.o \
functions.o \
instrument.o \
nodeAgg.o \
nodeAppend.o \
nodeBitmapAnd.o \
nodeBitmapHeapscan.o \
nodeBitmapIndexscan.o \
nodeBitmapOr.o \
nodeCtescan.o \
nodeCustom.o \
nodeForeignscan.o \
nodeFunctionscan.o \
nodeGather.o \
nodeGatherMerge.o \
nodeGroup.o \
nodeHash.o \
nodeHashjoin.o \
nodeIndexonlyscan.o \
nodeIndexscan.o \
nodeLimit.o \
nodeLockRows.o \
nodeMaterial.o \
nodeMergeAppend.o \
nodeMergejoin.o \
nodeModifyTable.o \
nodeNamedtuplestorescan.o \
nodeNestloop.o \
nodeProjectSet.o \
nodeRecursiveunion.o \
nodeResult.o \
nodeSamplescan.o \
nodeSeqscan.o \
nodeSetOp.o \
nodeSort.o \
nodeSubplan.o \
nodeSubqueryscan.o \
nodeTableFuncscan.o \
nodeTidscan.o \
nodeUnique.o \
nodeValuesscan.o \
nodeWindowAgg.o \
nodeWorktablescan.o \
spi.o \
tqueue.o \
tstoreReceiver.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,6 +12,7 @@ subdir = src/backend/foreign
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
OBJS= foreign.o
OBJS = \
foreign.o
include $(top_srcdir)/src/backend/common.mk
......@@ -17,6 +17,7 @@ include $(top_builddir)/src/Makefile.global
override CPPFLAGS += -DDLSUFFIX=\"$(DLSUFFIX)\"
OBJS = jit.o
OBJS = \
jit.o
include $(top_srcdir)/src/backend/common.mk
......@@ -33,12 +33,20 @@ SHLIB_LINK += $(LLVM_LIBS)
# loadable modules.
override COMPILER = $(CXX) $(CFLAGS)
OBJS=$(WIN32RES)
OBJS = \
$(WIN32RES)
# Infrastructure
OBJS += llvmjit.o llvmjit_error.o llvmjit_inline.o llvmjit_wrap.o
OBJS += \
llvmjit.o \
llvmjit_error.o \
llvmjit_inline.o \
llvmjit_wrap.o
# Code generation
OBJS += llvmjit_expr.o llvmjit_deform.o
OBJS += \
llvmjit_deform.o \
llvmjit_expr.o
all: all-shared-lib llvmjit_types.bc
......
......@@ -12,7 +12,17 @@ subdir = src/backend/lib
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
OBJS = binaryheap.o bipartite_match.o bloomfilter.o dshash.o hyperloglog.o \
ilist.o integerset.o knapsack.o pairingheap.o rbtree.o stringinfo.o
OBJS = \
binaryheap.o \
bipartite_match.o \
bloomfilter.o \
dshash.o \
hyperloglog.o \
ilist.o \
integerset.o \
knapsack.o \
pairingheap.o \
rbtree.o \
stringinfo.o
include $(top_srcdir)/src/backend/common.mk
......@@ -14,8 +14,19 @@ include $(top_builddir)/src/Makefile.global
# be-fsstubs is here for historical reasons, probably belongs elsewhere
OBJS = be-fsstubs.o be-secure.o be-secure-common.o auth.o crypt.o hba.o ifaddr.o pqcomm.o \
pqformat.o pqmq.o pqsignal.o auth-scram.o
OBJS = \
auth-scram.o \
auth.o \
be-fsstubs.o \
be-secure-common.o \
be-secure.o \
crypt.o \
hba.o \
ifaddr.o \
pqcomm.o \
pqformat.o \
pqmq.o \
pqsignal.o
ifeq ($(with_openssl),yes)
OBJS += be-secure-openssl.o
......
......@@ -12,6 +12,7 @@ subdir = src/backend/main
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
OBJS = main.o
OBJS = \
main.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,8 +12,21 @@ subdir = src/backend/nodes
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
OBJS = nodeFuncs.o nodes.o list.o bitmapset.o tidbitmap.o \
copyfuncs.o equalfuncs.o extensible.o makefuncs.o \
outfuncs.o readfuncs.o print.o read.o params.o value.o
OBJS = \
bitmapset.o \
copyfuncs.o \
equalfuncs.o \
extensible.o \
list.o \
makefuncs.o \
nodeFuncs.o \
nodes.o \
outfuncs.o \
params.o \
print.o \
read.o \
readfuncs.o \
tidbitmap.o \
value.o
include $(top_srcdir)/src/backend/common.mk
......@@ -13,9 +13,21 @@ subdir = src/backend/optimizer/geqo
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = geqo_copy.o geqo_eval.o geqo_main.o geqo_misc.o \
geqo_mutation.o geqo_pool.o geqo_random.o geqo_recombination.o \
geqo_selection.o \
geqo_erx.o geqo_pmx.o geqo_cx.o geqo_px.o geqo_ox1.o geqo_ox2.o
OBJS = \
geqo_copy.o \
geqo_cx.o \
geqo_erx.o \
geqo_eval.o \
geqo_main.o \
geqo_misc.o \
geqo_mutation.o \
geqo_ox1.o \
geqo_ox2.o \
geqo_pmx.o \
geqo_pool.o \
geqo_px.o \
geqo_random.o \
geqo_recombination.o \
geqo_selection.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,7 +12,15 @@ subdir = src/backend/optimizer/path
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = allpaths.o clausesel.o costsize.o equivclass.o indxpath.o \
joinpath.o joinrels.o pathkeys.o tidpath.o
OBJS = \
allpaths.o \
clausesel.o \
costsize.o \
equivclass.o \
indxpath.o \
joinpath.o \
joinrels.o \
pathkeys.o \
tidpath.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,7 +12,14 @@ subdir = src/backend/optimizer/plan
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = analyzejoins.o createplan.o initsplan.o planagg.o planmain.o planner.o \
setrefs.o subselect.o
OBJS = \
analyzejoins.o \
createplan.o \
initsplan.o \
planagg.o \
planmain.o \
planner.o \
setrefs.o \
subselect.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,6 +12,10 @@ subdir = src/backend/optimizer/prep
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = prepjointree.o prepqual.o preptlist.o prepunion.o
OBJS = \
prepjointree.o \
prepqual.o \
preptlist.o \
prepunion.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,8 +12,20 @@ subdir = src/backend/optimizer/util
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = appendinfo.o clauses.o inherit.o joininfo.o orclauses.o \
paramassign.o pathnode.o placeholder.o plancat.o predtest.o \
relnode.o restrictinfo.o tlist.o var.o
OBJS = \
appendinfo.o \
clauses.o \
inherit.o \
joininfo.o \
orclauses.o \
paramassign.o \
pathnode.o \
placeholder.o \
plancat.o \
predtest.o \
relnode.o \
restrictinfo.o \
tlist.o \
var.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,11 +12,27 @@ include $(top_builddir)/src/Makefile.global
override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
OBJS= analyze.o gram.o scan.o parser.o \
parse_agg.o parse_clause.o parse_coerce.o parse_collate.o parse_cte.o \
parse_enr.o parse_expr.o parse_func.o parse_node.o parse_oper.o \
parse_param.o parse_relation.o parse_target.o parse_type.o \
parse_utilcmd.o scansup.o
OBJS = \
analyze.o \
gram.o \
parse_agg.o \
parse_clause.o \
parse_coerce.o \
parse_collate.o \
parse_cte.o \
parse_enr.o \
parse_expr.o \
parse_func.o \
parse_node.o \
parse_oper.o \
parse_param.o \
parse_relation.o \
parse_target.o \
parse_type.o \
parse_utilcmd.o \
parser.o \
scan.o \
scansup.o
include $(top_srcdir)/src/backend/common.mk
......
......@@ -12,6 +12,9 @@ subdir = src/backend/partitioning
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
OBJS = partbounds.o partdesc.o partprune.o
OBJS = \
partbounds.o \
partdesc.o \
partprune.o
include $(top_srcdir)/src/backend/common.mk
......@@ -21,7 +21,11 @@ subdir = src/backend/port
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
OBJS = atomics.o pg_sema.o pg_shmem.o $(TAS)
OBJS = \
$(TAS) \
atomics.o \
pg_sema.o \
pg_shmem.o
ifeq ($(PORTNAME), win32)
SUBDIRS += win32
......
......@@ -12,7 +12,10 @@ subdir = src/backend/port/win32
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = timer.o socket.o signal.o
OBJS = \
signal.o \
socket.o \
timer.o
ifeq ($(have_win32_dbghelp), yes)
OBJS += crashdump.o
endif
......
......@@ -12,7 +12,17 @@ subdir = src/backend/postmaster
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
OBJS = autovacuum.o bgworker.o bgwriter.o checkpointer.o fork_process.o \
pgarch.o pgstat.o postmaster.o startup.o syslogger.o walwriter.o
OBJS = \
autovacuum.o \
bgworker.o \
bgwriter.o \
checkpointer.o \
fork_process.o \
pgarch.o \
pgstat.o \
postmaster.o \
startup.o \
syslogger.o \
walwriter.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,7 +12,13 @@ subdir = src/backend/regex
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
OBJS = regcomp.o regerror.o regexec.o regfree.o regprefix.o regexport.o
OBJS = \
regcomp.o \
regerror.o \
regexec.o \
regexport.o \
regfree.o \
regprefix.o
include $(top_srcdir)/src/backend/common.mk
......
......@@ -14,8 +14,16 @@ include $(top_builddir)/src/Makefile.global
override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
OBJS = walsender.o walreceiverfuncs.o walreceiver.o basebackup.o \
repl_gram.o slot.o slotfuncs.o syncrep.o syncrep_gram.o
OBJS = \
basebackup.o \
repl_gram.o \
slot.o \
slotfuncs.o \
syncrep.o \
syncrep_gram.o \
walreceiver.o \
walreceiverfuncs.o \
walsender.o
SUBDIRS = logical
......
......@@ -14,7 +14,9 @@ include $(top_builddir)/src/Makefile.global
override CPPFLAGS := -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS)
OBJS = libpqwalreceiver.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
libpqwalreceiver.o
SHLIB_LINK_INTERNAL = $(libpq)
SHLIB_LINK = $(filter -lintl, $(LIBS))
SHLIB_PREREQS = submake-libpq
......
......@@ -14,7 +14,18 @@ include $(top_builddir)/src/Makefile.global
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
OBJS = decode.o launcher.o logical.o logicalfuncs.o message.o origin.o \
proto.o relation.o reorderbuffer.o snapbuild.o tablesync.o worker.o
OBJS = \
decode.o \
launcher.o \
logical.o \
logicalfuncs.o \
message.o \
origin.o \
proto.o \
relation.o \
reorderbuffer.o \
snapbuild.o \
tablesync.o \
worker.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,7 +12,9 @@ subdir = src/backend/replication/pgoutput
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = pgoutput.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
pgoutput.o
PGFILEDESC = "pgoutput - standard logical replication output plugin"
NAME = pgoutput
......
......@@ -12,8 +12,12 @@ subdir = src/backend/rewrite
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
OBJS = rewriteRemove.o rewriteDefine.o \
rewriteHandler.o rewriteManip.o rewriteSupport.o \
rowsecurity.o
OBJS = \
rewriteDefine.o \
rewriteHandler.o \
rewriteManip.o \
rewriteRemove.o \
rewriteSupport.o \
rowsecurity.o
include $(top_srcdir)/src/backend/common.mk
......@@ -16,7 +16,13 @@ include $(top_builddir)/src/Makefile.global
override CPPFLAGS := -I$(top_srcdir)/src/include/snowball \
-I$(top_srcdir)/src/include/snowball/libstemmer $(CPPFLAGS)
OBJS= $(WIN32RES) dict_snowball.o api.o utilities.o \
OBJS = \
$(WIN32RES) \
api.o \
dict_snowball.o \
utilities.o
OBJS += \
stem_ISO_8859_1_danish.o \
stem_ISO_8859_1_dutch.o \
stem_ISO_8859_1_english.o \
......
......@@ -12,6 +12,10 @@ subdir = src/backend/statistics
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
OBJS = extended_stats.o dependencies.o mcv.o mvdistinct.o
OBJS = \
dependencies.o \
extended_stats.o \
mcv.o \
mvdistinct.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,6 +12,11 @@ subdir = src/backend/storage/buffer
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = buf_table.o buf_init.o bufmgr.o freelist.o localbuf.o
OBJS = \
buf_init.o \
buf_table.o \
bufmgr.o \
freelist.o \
localbuf.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,6 +12,11 @@ subdir = src/backend/storage/file
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = fd.o buffile.o copydir.o reinit.o sharedfileset.o
OBJS = \
buffile.o \
copydir.o \
fd.o \
reinit.o \
sharedfileset.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,6 +12,9 @@ subdir = src/backend/storage/freespace
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = freespace.o fsmpage.o indexfsm.o
OBJS = \
freespace.o \
fsmpage.o \
indexfsm.o
include $(top_srcdir)/src/backend/common.mk
......@@ -8,8 +8,23 @@ subdir = src/backend/storage/ipc
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = barrier.o dsm_impl.o dsm.o ipc.o ipci.o latch.o pmsignal.o procarray.o \
procsignal.o shmem.o shmqueue.o shm_mq.o shm_toc.o signalfuncs.o \
sinval.o sinvaladt.o standby.o
OBJS = \
barrier.o \
dsm.o \
dsm_impl.o \
ipc.o \
ipci.o \
latch.o \
pmsignal.o \
procarray.o \
procsignal.o \
shm_mq.o \
shm_toc.o \
shmem.o \
shmqueue.o \
signalfuncs.o \
sinval.o \
sinvaladt.o \
standby.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,6 +12,7 @@ subdir = src/backend/storage/large_object
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = inv_api.o
OBJS = \
inv_api.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,8 +12,17 @@ subdir = src/backend/storage/lmgr
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = lmgr.o lock.o proc.o deadlock.o lwlock.o lwlocknames.o spin.o \
s_lock.o predicate.o condition_variable.o
OBJS = \
condition_variable.o \
deadlock.o \
lmgr.o \
lock.o \
lwlock.o \
lwlocknames.o \
predicate.o \
proc.o \
s_lock.o \
spin.o
include $(top_srcdir)/src/backend/common.mk
......
......@@ -12,7 +12,10 @@ subdir = src/backend/storage/page
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = bufpage.o checksum.o itemptr.o
OBJS = \
bufpage.o \
checksum.o \
itemptr.o
include $(top_srcdir)/src/backend/common.mk
......
......@@ -12,6 +12,8 @@ subdir = src/backend/storage/smgr
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = md.o smgr.o
OBJS = \
md.o \
smgr.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,6 +12,7 @@ subdir = src/backend/storage/sync
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = sync.o
OBJS = \
sync.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,6 +12,11 @@ subdir = src/backend/tcop
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
OBJS= dest.o fastpath.o postgres.o pquery.o utility.o
OBJS = \
dest.o \
fastpath.o \
postgres.o \
pquery.o \
utility.o
include $(top_srcdir)/src/backend/common.mk
......@@ -23,10 +23,22 @@ DICTFILES=synonym_sample.syn thesaurus_sample.ths \
# Local paths to dictionaries files
DICTFILES_PATH=$(addprefix dicts/,$(DICTFILES))
OBJS = ts_locale.o ts_parse.o wparser.o wparser_def.o dict.o \
dict_simple.o dict_synonym.o dict_thesaurus.o \
dict_ispell.o regis.o spell.o \
to_tsany.o ts_selfuncs.o ts_typanalyze.o ts_utils.o
OBJS = \
ts_locale.o \
ts_parse.o \
wparser.o \
wparser_def.o \
dict.o \
dict_simple.o \
dict_synonym.o \
dict_thesaurus.o \
dict_ispell.o \
regis.o \
spell.o \
to_tsany.o \
ts_selfuncs.o \
ts_typanalyze.o \
ts_utils.o
include $(top_srcdir)/src/backend/common.mk
......
......@@ -9,29 +9,107 @@ top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
# keep this list arranged alphabetically or it gets to be a mess
OBJS = acl.o amutils.o arrayfuncs.o array_expanded.o array_selfuncs.o \
array_typanalyze.o array_userfuncs.o arrayutils.o ascii.o \
bool.o cash.o char.o cryptohashes.o \
date.o datetime.o datum.o dbsize.o domains.o \
encode.o enum.o expandeddatum.o expandedrecord.o \
float.o format_type.o formatting.o genfile.o \
geo_ops.o geo_selfuncs.o geo_spgist.o inet_cidr_ntop.o inet_net_pton.o \
int.o int8.o json.o jsonb.o jsonb_gin.o jsonb_op.o jsonb_util.o \
jsonfuncs.o jsonpath_gram.o jsonpath.o jsonpath_exec.o \
like.o like_support.o lockfuncs.o mac.o mac8.o misc.o name.o \
network.o network_gist.o network_selfuncs.o network_spgist.o \
numeric.o numutils.o oid.o oracle_compat.o \
orderedsetaggs.o partitionfuncs.o pg_locale.o pg_lsn.o \
pg_upgrade_support.o pgstatfuncs.o \
pseudotypes.o quote.o rangetypes.o rangetypes_gist.o \
rangetypes_selfuncs.o rangetypes_spgist.o rangetypes_typanalyze.o \
regexp.o regproc.o ri_triggers.o rowtypes.o ruleutils.o \
selfuncs.o tid.o timestamp.o trigfuncs.o \
tsginidx.o tsgistidx.o tsquery.o tsquery_cleanup.o tsquery_gist.o \
tsquery_op.o tsquery_rewrite.o tsquery_util.o tsrank.o \
tsvector.o tsvector_op.o tsvector_parser.o \
txid.o uuid.o varbit.o varchar.o varlena.o version.o \
windowfuncs.o xid.o xml.o
OBJS = \
acl.o \
amutils.o \
array_expanded.o \
array_selfuncs.o \
array_typanalyze.o \
array_userfuncs.o \
arrayfuncs.o \
arrayutils.o \
ascii.o \
bool.o \
cash.o \
char.o \
cryptohashes.o \
date.o \
datetime.o \
datum.o \
dbsize.o \
domains.o \
encode.o \
enum.o \
expandeddatum.o \
expandedrecord.o \
float.o \
format_type.o \
formatting.o \
genfile.o \
geo_ops.o \
geo_selfuncs.o \
geo_spgist.o \
inet_cidr_ntop.o \
inet_net_pton.o \
int.o \
int8.o \
json.o \
jsonb.o \
jsonb_gin.o \
jsonb_op.o \
jsonb_util.o \
jsonfuncs.o \
jsonpath.o \
jsonpath_exec.o \
jsonpath_gram.o \
like.o \
like_support.o \
lockfuncs.o \
mac.o \
mac8.o \
misc.o \
name.o \
network.o \
network_gist.o \
network_selfuncs.o \
network_spgist.o \
numeric.o \
numutils.o \
oid.o \
oracle_compat.o \
orderedsetaggs.o \
partitionfuncs.o \
pg_locale.o \
pg_lsn.o \
pg_upgrade_support.o \
pgstatfuncs.o \
pseudotypes.o \
quote.o \
rangetypes.o \
rangetypes_gist.o \
rangetypes_selfuncs.o \
rangetypes_spgist.o \
rangetypes_typanalyze.o \
regexp.o \
regproc.o \
ri_triggers.o \
rowtypes.o \
ruleutils.o \
selfuncs.o \
tid.o \
timestamp.o \
trigfuncs.o \
tsginidx.o \
tsgistidx.o \
tsquery.o \
tsquery_cleanup.o \
tsquery_gist.o \
tsquery_op.o \
tsquery_rewrite.o \
tsquery_util.o \
tsrank.o \
tsvector.o \
tsvector_op.o \
tsvector_parser.o \
txid.o \
uuid.o \
varbit.o \
varchar.o \
varlena.o \
version.o \
windowfuncs.o \
xid.o \
xml.o
jsonpath_scan.c: FLEXFLAGS = -CF -p -p
jsonpath_scan.c: FLEX_NO_BACKUP=yes
......
......@@ -12,8 +12,20 @@ subdir = src/backend/utils/cache
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = attoptcache.o catcache.o evtcache.o inval.o lsyscache.o \
partcache.o plancache.o relcache.o relmapper.o relfilenodemap.o \
spccache.o syscache.o ts_cache.o typcache.o
OBJS = \
attoptcache.o \
catcache.o \
evtcache.o \
inval.o \
lsyscache.o \
partcache.o \
plancache.o \
relcache.o \
relfilenodemap.o \
relmapper.o \
spccache.o \
syscache.o \
ts_cache.o \
typcache.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,6 +12,8 @@ subdir = src/backend/utils/error
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = assert.o elog.o
OBJS = \
assert.o \
elog.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,7 +12,10 @@ subdir = src/backend/utils/fmgr
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = dfmgr.o fmgr.o funcapi.o
OBJS = \
dfmgr.o \
fmgr.o \
funcapi.o
override CPPFLAGS += -DDLSUFFIX=\"$(DLSUFFIX)\"
......
......@@ -12,6 +12,9 @@ subdir = src/backend/utils/hash
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = dynahash.o hashfn.o pg_crc.o
OBJS = \
dynahash.o \
hashfn.o \
pg_crc.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,6 +12,9 @@ subdir = src/backend/utils/init
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = globals.o miscinit.o postinit.o
OBJS = \
globals.o \
miscinit.o \
postinit.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,7 +12,13 @@ subdir = src/backend/utils/mb
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = encnames.o conv.o mbutils.o wchar.o wstrcmp.o wstrncmp.o
OBJS = \
conv.o \
encnames.o \
mbutils.o \
wchar.o \
wstrcmp.o \
wstrncmp.o
include $(top_srcdir)/src/backend/common.mk
......
......@@ -14,9 +14,19 @@ include $(top_builddir)/src/Makefile.global
override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
OBJS = guc.o help_config.o pg_config.o pg_controldata.o pg_rusage.o \
ps_status.o queryenvironment.o rls.o sampling.o superuser.o \
timeout.o tzparser.o
OBJS = \
guc.o \
help_config.o \
pg_config.o \
pg_controldata.o \
pg_rusage.o \
ps_status.o \
queryenvironment.o \
rls.o \
sampling.o \
superuser.o \
timeout.o \
tzparser.o
# This location might depend on the installation directories. Therefore
# we can't substitute it into pg_config.h.
......
......@@ -12,6 +12,14 @@ subdir = src/backend/utils/mmgr
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = aset.o dsa.o freepage.o generation.o mcxt.o memdebug.o portalmem.o slab.o
OBJS = \
aset.o \
dsa.o \
freepage.o \
generation.o \
mcxt.o \
memdebug.o \
portalmem.o \
slab.o
include $(top_srcdir)/src/backend/common.mk
......@@ -12,6 +12,7 @@ subdir = src/backend/utils/resowner
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = resowner.o
OBJS = \
resowner.o
include $(top_srcdir)/src/backend/common.mk
......@@ -14,7 +14,12 @@ include $(top_builddir)/src/Makefile.global
override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
OBJS = logtape.o sharedtuplestore.o sortsupport.o tuplesort.o tuplestore.o
OBJS = \
logtape.o \
sharedtuplestore.o \
sortsupport.o \
tuplesort.o \
tuplestore.o
tuplesort.o: qsort_tuple.c
......
......@@ -12,6 +12,8 @@ subdir = src/backend/utils/time
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = combocid.o snapmgr.o
OBJS = \
combocid.o \
snapmgr.o
include $(top_srcdir)/src/backend/common.mk
......@@ -26,7 +26,12 @@ ifneq (,$(with_system_tzdata))
override CPPFLAGS += '-DSYSTEMTZDIR="$(with_system_tzdata)"'
endif
OBJS= initdb.o findtimezone.o localtime.o encnames.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
encnames.o \
findtimezone.o \
initdb.o \
localtime.o
all: initdb
......
......@@ -7,7 +7,9 @@ subdir = src/bin/pg_archivecleanup
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
OBJS = pg_archivecleanup.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
pg_archivecleanup.o
all: pg_archivecleanup
......
......@@ -21,7 +21,11 @@ include $(top_builddir)/src/Makefile.global
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport)
OBJS=receivelog.o streamutil.o walmethods.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
receivelog.o \
streamutil.o \
walmethods.o
all: pg_basebackup pg_receivewal pg_recvlogical
......
......@@ -15,7 +15,9 @@ subdir = src/bin/pg_checksums
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
OBJS= pg_checksums.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
pg_checksums.o
all: pg_checksums
......
......@@ -15,7 +15,9 @@ subdir = src/bin/pg_config
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
OBJS= pg_config.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
pg_config.o
all: pg_config
......
......@@ -15,7 +15,9 @@ subdir = src/bin/pg_controldata
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
OBJS= pg_controldata.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
pg_controldata.o
all: pg_controldata
......
......@@ -24,7 +24,9 @@ LDFLAGS_INTERNAL += $(libpq_pgport)
SUBMAKE_LIBPQ := submake-libpq
endif
OBJS= pg_ctl.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
pg_ctl.o
all: pg_ctl
......
......@@ -19,9 +19,18 @@ include $(top_builddir)/src/Makefile.global
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport)
OBJS= pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o \
pg_backup_null.o pg_backup_tar.o pg_backup_directory.o \
pg_backup_utils.o parallel.o compress_io.o dumputils.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
compress_io.o \
dumputils.o \
parallel.o \
pg_backup_archiver.o \
pg_backup_custom.o \
pg_backup_db.o \
pg_backup_directory.o \
pg_backup_null.o \
pg_backup_tar.o \
pg_backup_utils.o
all: pg_dump pg_restore pg_dumpall
......
......@@ -15,7 +15,9 @@ subdir = src/bin/pg_resetwal
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
OBJS= pg_resetwal.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
pg_resetwal.o
all: pg_resetwal
......
......@@ -18,9 +18,18 @@ include $(top_builddir)/src/Makefile.global
override CPPFLAGS := -I$(libpq_srcdir) -DFRONTEND $(CPPFLAGS)
LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport)
OBJS = pg_rewind.o parsexlog.o xlogreader.o datapagemap.o timeline.o \
fetch.o file_ops.o copy_fetch.o libpq_fetch.o filemap.o \
$(WIN32RES)
OBJS = \
$(WIN32RES) \
copy_fetch.o \
datapagemap.o \
fetch.o \
file_ops.o \
filemap.o \
libpq_fetch.o \
parsexlog.o \
pg_rewind.o \
timeline.o \
xlogreader.o
EXTRA_CLEAN = xlogreader.c
......
......@@ -7,7 +7,9 @@ subdir = src/bin/pg_test_fsync
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
OBJS = pg_test_fsync.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
pg_test_fsync.o
all: pg_test_fsync
......
......@@ -7,7 +7,9 @@ subdir = src/bin/pg_test_timing
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
OBJS = pg_test_timing.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
pg_test_timing.o
all: pg_test_timing
......
......@@ -7,9 +7,23 @@ subdir = src/bin/pg_upgrade
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
OBJS = check.o controldata.o dump.o exec.o file.o function.o info.o \
option.o parallel.o pg_upgrade.o relfilenode.o server.o \
tablespace.o util.o version.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
check.o \
controldata.o \
dump.o \
exec.o \
file.o \
function.o \
info.o \
option.o \
parallel.o \
pg_upgrade.o \
relfilenode.o \
server.o \
tablespace.o \
util.o \
version.o
override CPPFLAGS := -DDLSUFFIX=\"$(DLSUFFIX)\" -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS)
LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport)
......
......@@ -7,8 +7,13 @@ subdir = src/bin/pg_waldump
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
OBJS = pg_waldump.o compat.o xlogreader.o rmgrdesc.o \
$(RMGRDESCOBJS) $(WIN32RES)
OBJS = \
$(RMGRDESCOBJS) \
$(WIN32RES) \
compat.o \
pg_waldump.o \
rmgrdesc.o \
xlogreader.o
override CPPFLAGS := -DFRONTEND $(CPPFLAGS)
......
......@@ -7,7 +7,10 @@ subdir = src/bin/pgbench
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
OBJS = pgbench.o exprparse.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
exprparse.o \
pgbench.o
override CPPFLAGS := -I. -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS)
LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport)
......
......@@ -16,7 +16,9 @@ include $(top_builddir)/src/Makefile.global
ifeq ($(PORTNAME), win32)
OBJS=pgevent.o pgmsgevent.o
OBJS = \
pgevent.o \
pgmsgevent.o
NAME=pgevent
SHLIB_LINK =
......
......@@ -21,11 +21,24 @@ REFDOCDIR= $(top_srcdir)/doc/src/sgml/ref
override CPPFLAGS := -I. -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS)
LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport)
OBJS= command.o common.o copy.o crosstabview.o \
describe.o help.o input.o large_obj.o mainloop.o \
prompt.o psqlscanslash.o sql_help.o startup.o stringutils.o \
tab-complete.o variables.o \
$(WIN32RES)
OBJS = \
$(WIN32RES) \
command.o \
common.o \
copy.o \
crosstabview.o \
describe.o \
help.o \
input.o \
large_obj.o \
mainloop.o \
prompt.o \
psqlscanslash.o \
sql_help.o \
startup.o \
stringutils.o \
tab-complete.o \
variables.o
all: psql
......
......@@ -46,11 +46,30 @@ LIBS += $(PTHREAD_LIBS)
# If you add objects here, see also src/tools/msvc/Mkvcbuild.pm
OBJS_COMMON = base64.o config_info.o controldata_utils.o d2s.o exec.o f2s.o \
file_perm.o ip.o keywords.o kwlookup.o link-canary.o md5.o \
pg_lzcompress.o pgfnames.o psprintf.o relpath.o \
rmtree.o saslprep.o scram-common.o string.o unicode_norm.o \
username.o wait_error.o
OBJS_COMMON = \
base64.o \
config_info.o \
controldata_utils.o \
d2s.o \
exec.o \
f2s.o \
file_perm.o \
ip.o \
keywords.o \
kwlookup.o \
link-canary.o \
md5.o \
pg_lzcompress.o \
pgfnames.o \
psprintf.o \
relpath.o \
rmtree.o \
saslprep.o \
scram-common.o \
string.o \
unicode_norm.o \
username.o \
wait_error.o
ifeq ($(with_openssl),yes)
OBJS_COMMON += sha2_openssl.o
......@@ -60,8 +79,12 @@ endif
# A few files are currently only built for frontend, not server
# (Mkvcbuild.pm has a copy of this list, too)
OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o file_utils.o \
logging.o restricted_token.o
OBJS_FRONTEND = \
$(OBJS_COMMON) \
fe_memutils.o \
file_utils.o \
logging.o \
restricted_token.o
# foo.o, foo_shlib.o, and foo_srv.o are all built from foo.c
OBJS_SHLIB = $(OBJS_FRONTEND:%.o=%_shlib.o)
......
......@@ -19,8 +19,14 @@ include $(top_builddir)/src/Makefile.global
override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS)
OBJS = conditional.o mbprint.o print.o psqlscan.o recovery_gen.o \
simple_list.o string_utils.o
OBJS = \
conditional.o \
mbprint.o \
print.o \
psqlscan.o \
recovery_gen.o \
simple_list.o \
string_utils.o
all: libpgfeutils.a
......
......@@ -28,7 +28,9 @@ SHLIB_PREREQS = submake-ecpglib submake-pgtypeslib
SHLIB_EXPORTS = exports.txt
OBJS= informix.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
informix.o
PKG_CONFIG_REQUIRES_PRIVATE = libecpg libpgtypes
......
......@@ -22,8 +22,18 @@ override CPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include \
-I$(libpq_srcdir) -I$(top_builddir)/src/port -DFRONTEND $(CPPFLAGS)
override CFLAGS += $(PTHREAD_CFLAGS)
OBJS= execute.o typename.o descriptor.o sqlda.o data.o error.o prepare.o \
memory.o connect.o misc.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
connect.o \
data.o \
descriptor.o \
error.o \
execute.o \
memory.o \
misc.o \
prepare.o \
sqlda.o \
typename.o
SHLIB_LINK_INTERNAL = -L../pgtypeslib -lpgtypes $(libpq_pgport_shlib)
SHLIB_LINK = $(filter -lintl -lm, $(LIBS)) $(PTHREAD_LIBS)
......
......@@ -27,8 +27,14 @@ SHLIB_LINK += $(filter -lintl -lm, $(LIBS))
SHLIB_EXPORTS = exports.txt
OBJS= numeric.o datetime.o common.o dt_common.o timestamp.o interval.o \
$(WIN32RES)
OBJS = \
$(WIN32RES) \
common.o \
datetime.o \
dt_common.o \
interval.o \
numeric.o \
timestamp.o
all: all-lib
......
......@@ -23,9 +23,20 @@ override CPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include \
override CFLAGS += $(PTHREAD_CFLAGS)
OBJS= preproc.o pgc.o type.o ecpg.o output.o parser.o \
keywords.o c_keywords.o ecpg_keywords.o typename.o descriptor.o variable.o \
$(WIN32RES)
OBJS = \
$(WIN32RES) \
c_keywords.o \
descriptor.o \
ecpg.o \
ecpg_keywords.o \
keywords.o \
output.o \
parser.o \
pgc.o \
preproc.o \
type.o \
typename.o \
variable.o
# where to find gen_keywordlist.pl and subsidiary files
TOOLSDIR = $(top_srcdir)/src/tools
......
......@@ -27,19 +27,36 @@ endif
# The MSVC build system scrapes OBJS from this file. If you change any of
# the conditional additions of files to OBJS, update Mkvcbuild.pm to match.
OBJS= fe-auth.o fe-auth-scram.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \
fe-protocol2.o fe-protocol3.o pqexpbuffer.o fe-secure.o \
legacy-pqsignal.o libpq-events.o
OBJS = \
fe-auth-scram.o \
fe-connect.o \
fe-exec.o \
fe-lobj.o \
fe-misc.o \
fe-print.o \
fe-protocol2.o \
fe-protocol3.o \
fe-secure.o \
legacy-pqsignal.o \
libpq-events.o \
pqexpbuffer.o \
fe-auth.o
# src/backend/utils/mb
OBJS += encnames.o wchar.o
OBJS += \
encnames.o \
wchar.o
ifeq ($(with_openssl),yes)
OBJS += fe-secure-openssl.o fe-secure-common.o
OBJS += \
fe-secure-common.o \
fe-secure-openssl.o
endif
ifeq ($(with_gssapi),yes)
OBJS += fe-gssapi-common.o fe-secure-gssapi.o
OBJS += \
fe-gssapi-common.o \
fe-secure-gssapi.o
endif
ifeq ($(PORTNAME), cygwin)
......@@ -47,7 +64,9 @@ override shlib = cyg$(NAME)$(DLSUFFIX)
endif
ifeq ($(PORTNAME), win32)
OBJS += win32.o libpqrc.o
OBJS += \
libpqrc.o \
win32.o
libpqrc.o: libpq.rc
$(WINDRES) -i $< -o $@
......
......@@ -19,8 +19,14 @@ override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
SHLIB_LINK = $(filter -lintl, $(LIBS))
rpath =
OBJS = pl_gram.o pl_handler.o pl_comp.o pl_exec.o \
pl_funcs.o pl_scanner.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
pl_comp.o \
pl_exec.o \
pl_funcs.o \
pl_gram.o \
pl_handler.o \
pl_scanner.o
DATA = plpgsql.control plpgsql--1.0.sql plpgsql--unpackaged--1.0.sql
......
......@@ -22,7 +22,9 @@ PGFILEDESC = "PL/Tcl - procedural language"
NAME = pltcl
OBJS = pltcl.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
pltcl.o
DATA = pltcl.control pltcl--1.0.sql pltcl--unpackaged--1.0.sql \
pltclu.control pltclu--1.0.sql pltclu--unpackaged--1.0.sql
......
......@@ -35,11 +35,30 @@ include $(top_builddir)/src/Makefile.global
override CPPFLAGS := -I$(top_builddir)/src/port -DFRONTEND $(CPPFLAGS)
LIBS += $(PTHREAD_LIBS)
OBJS = $(LIBOBJS) $(PG_CRC32C_OBJS) chklocale.o erand48.o inet_net_ntop.o \
noblock.o path.o pg_bitutils.o pgcheckdir.o pgmkdirp.o pgsleep.o \
pg_strong_random.o pgstrcasecmp.o pgstrsignal.o pqsignal.o \
qsort.o qsort_arg.o quotes.o snprintf.o sprompt.o strerror.o \
tar.o thread.o
OBJS = \
$(LIBOBJS) \
$(PG_CRC32C_OBJS) \
chklocale.o \
erand48.o \
inet_net_ntop.o \
noblock.o \
path.o \
pg_bitutils.o \
pg_strong_random.o \
pgcheckdir.o \
pgmkdirp.o \
pgsleep.o \
pgstrcasecmp.o \
pgstrsignal.o \
pqsignal.o \
qsort.o \
qsort_arg.o \
quotes.o \
snprintf.o \
sprompt.o \
strerror.o \
tar.o \
thread.o
# libpgport.a, libpgport_shlib.a, and libpgport_srv.a contain the same files
# foo.o, foo_shlib.o, and foo_srv.o are all built from foo.c
......
......@@ -11,7 +11,10 @@ include $(top_builddir)/src/Makefile.global
override CPPFLAGS := -I$(srcdir) -I$(libpq_srcdir) -I$(srcdir)/../regress $(CPPFLAGS)
OBJS = specparse.o isolationtester.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
isolationtester.o \
specparse.o
all: isolationtester$(X) pg_isolation_regress$(X)
......
# src/test/modules/test_bloomfilter/Makefile
MODULE_big = test_bloomfilter
OBJS = test_bloomfilter.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
test_bloomfilter.o
PGFILEDESC = "test_bloomfilter - test code for Bloom filter library"
EXTENSION = test_bloomfilter
......
# src/test/modules/test_ginpostinglist/Makefile
MODULE_big = test_ginpostinglist
OBJS = test_ginpostinglist.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
test_ginpostinglist.o
PGFILEDESC = "test_ginpostinglist - test code for src/backend/access/gin//ginpostinglist.c"
EXTENSION = test_ginpostinglist
......
# src/test/modules/test_integerset/Makefile
MODULE_big = test_integerset
OBJS = test_integerset.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
test_integerset.o
PGFILEDESC = "test_integerset - test code for src/backend/lib/integerset.c"
EXTENSION = test_integerset
......
# src/test/modules/test_parser/Makefile
MODULE_big = test_parser
OBJS = test_parser.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
test_parser.o
PGFILEDESC = "test_parser - example of a custom parser for full-text search"
EXTENSION = test_parser
......
# src/test/modules/test_predtest/Makefile
MODULE_big = test_predtest
OBJS = test_predtest.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
test_predtest.o
PGFILEDESC = "test_predtest - test code for optimizer/util/predtest.c"
EXTENSION = test_predtest
......
# src/test/modules/test_rbtree/Makefile
MODULE_big = test_rbtree
OBJS = test_rbtree.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
test_rbtree.o
PGFILEDESC = "test_rbtree - test code for red-black tree library"
EXTENSION = test_rbtree
......
# src/test/modules/test_rls_hooks/Makefile
MODULE_big = test_rls_hooks
OBJS = test_rls_hooks.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
test_rls_hooks.o
PGFILEDESC = "test_rls_hooks - example use of RLS hooks"
EXTENSION = test_rls_hooks
......
# src/test/modules/test_shm_mq/Makefile
MODULE_big = test_shm_mq
OBJS = test.o setup.o worker.o $(WIN32RES)
OBJS = \
$(WIN32RES) \
setup.o \
test.o \
worker.o
PGFILEDESC = "test_shm_mq - example use of shared memory message queue"
EXTENSION = test_shm_mq
......
......@@ -16,10 +16,15 @@ top_builddir = ../..
include $(top_builddir)/src/Makefile.global
# files to build into backend
OBJS= localtime.o strftime.o pgtz.o
OBJS = \
localtime.o \
pgtz.o \
strftime.o
# files needed to build zic utility program
ZICOBJS= zic.o $(WIN32RES)
ZICOBJS = \
$(WIN32RES) \
zic.o
# we now distribute the timezone data as a single file
TZDATAFILES = $(srcdir)/data/tzdata.zi
......
......@@ -15,7 +15,8 @@ include $(top_builddir)/src/Makefile.global
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
LDFLAGS_INTERNAL += $(libpq_pgport)
OBJS= findoidjoins.o
OBJS = \
findoidjoins.o
all: findoidjoins
......
......@@ -16,7 +16,8 @@ libpq_backend_dir = $(top_builddir)/src/backend/libpq
override CPPFLAGS := -I$(libpq_backend_dir) $(CPPFLAGS)
OBJS = test_ifaddrs.o
OBJS = \
test_ifaddrs.o
all: test_ifaddrs
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment