Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 01368e5

Browse files
anarazelanarazel
committed
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
1 parent 66c61c8 commit 01368e5

File tree

147 files changed

+1271
-302
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+1271
-302
lines changed

‎contrib/adminpack/Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# contrib/adminpack/Makefile
22

33
MODULE_big = adminpack
4-
OBJS = adminpack.o $(WIN32RES)
4+
OBJS = \
5+
$(WIN32RES) \
6+
adminpack.o
57
PG_CPPFLAGS = -I$(libpq_srcdir)
68

79
EXTENSION = adminpack

‎contrib/amcheck/Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# contrib/amcheck/Makefile
22

33
MODULE_big = amcheck
4-
OBJS = verify_nbtree.o $(WIN32RES)
4+
OBJS = \
5+
$(WIN32RES) \
6+
verify_nbtree.o
57

68
EXTENSION = amcheck
79
DATA = amcheck--1.1--1.2.sql amcheck--1.0--1.1.sql amcheck--1.0.sql

‎contrib/auto_explain/Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# contrib/auto_explain/Makefile
22

33
MODULE_big = auto_explain
4-
OBJS = auto_explain.o $(WIN32RES)
4+
OBJS = \
5+
$(WIN32RES) \
6+
auto_explain.o
57
PGFILEDESC = "auto_explain - logging facility for execution plans"
68

79
ifdef USE_PGXS

‎contrib/bloom/Makefile

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
# contrib/bloom/Makefile
22

33
MODULE_big = bloom
4-
OBJS = blcost.o blinsert.o blscan.o blutils.o blvacuum.o blvalidate.o $(WIN32RES)
4+
OBJS = \
5+
$(WIN32RES) \
6+
blcost.o \
7+
blinsert.o \
8+
blscan.o \
9+
blutils.o \
10+
blvacuum.o \
11+
blvalidate.o
512

613
EXTENSION = bloom
714
DATA = bloom--1.0.sql

‎contrib/btree_gin/Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# contrib/btree_gin/Makefile
22

33
MODULE_big = btree_gin
4-
OBJS = btree_gin.o $(WIN32RES)
4+
OBJS = \
5+
$(WIN32RES) \
6+
btree_gin.o
57

68
EXTENSION = btree_gin
79
DATA = btree_gin--1.0.sql btree_gin--1.0--1.1.sql btree_gin--1.1--1.2.sql \

‎contrib/btree_gist/Makefile

+25-6
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,31 @@
22

33
MODULE_big = btree_gist
44

5-
OBJS = btree_gist.o btree_utils_num.o btree_utils_var.o btree_int2.o \
6-
btree_int4.o btree_int8.o btree_float4.o btree_float8.o btree_cash.o \
7-
btree_oid.o btree_ts.o btree_time.o btree_date.o btree_interval.o \
8-
btree_macaddr.o btree_macaddr8.o btree_inet.o btree_text.o \
9-
btree_bytea.o btree_bit.o btree_numeric.o btree_uuid.o \
10-
btree_enum.o $(WIN32RES)
5+
OBJS = \
6+
$(WIN32RES) \
7+
btree_bit.o \
8+
btree_bytea.o \
9+
btree_cash.o \
10+
btree_date.o \
11+
btree_enum.o \
12+
btree_float4.o \
13+
btree_float8.o \
14+
btree_gist.o \
15+
btree_inet.o \
16+
btree_int2.o \
17+
btree_int4.o \
18+
btree_int8.o \
19+
btree_interval.o \
20+
btree_macaddr.o \
21+
btree_macaddr8.o \
22+
btree_numeric.o \
23+
btree_oid.o \
24+
btree_text.o \
25+
btree_time.o \
26+
btree_ts.o \
27+
btree_utils_num.o \
28+
btree_utils_var.o \
29+
btree_uuid.o
1130

1231
EXTENSION = btree_gist
1332
DATA = btree_gist--unpackaged--1.0.sql btree_gist--1.0--1.1.sql \

‎contrib/cube/Makefile

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# contrib/cube/Makefile
22

33
MODULE_big = cube
4-
OBJS= cube.o cubeparse.o $(WIN32RES)
4+
OBJS = \
5+
$(WIN32RES) \
6+
cube.o \
7+
cubeparse.o
58

69
EXTENSION = cube
710
DATA = cube--1.2.sql cube--1.2--1.3.sql cube--1.3--1.4.sql \

‎contrib/dblink/Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# contrib/dblink/Makefile
22

33
MODULE_big = dblink
4-
OBJS = dblink.o $(WIN32RES)
4+
OBJS = \
5+
$(WIN32RES) \
6+
dblink.o
57
PG_CPPFLAGS = -I$(libpq_srcdir)
68
SHLIB_LINK_INTERNAL = $(libpq)
79

‎contrib/dict_int/Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# contrib/dict_int/Makefile
22

33
MODULE_big = dict_int
4-
OBJS = dict_int.o $(WIN32RES)
4+
OBJS = \
5+
$(WIN32RES) \
6+
dict_int.o
57

68
EXTENSION = dict_int
79
DATA = dict_int--1.0.sql dict_int--unpackaged--1.0.sql

‎contrib/dict_xsyn/Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# contrib/dict_xsyn/Makefile
22

33
MODULE_big = dict_xsyn
4-
OBJS = dict_xsyn.o $(WIN32RES)
4+
OBJS = \
5+
$(WIN32RES) \
6+
dict_xsyn.o
57

68
EXTENSION = dict_xsyn
79
DATA = dict_xsyn--1.0.sql dict_xsyn--unpackaged--1.0.sql

‎contrib/fuzzystrmatch/Makefile

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# contrib/fuzzystrmatch/Makefile
22

33
MODULE_big = fuzzystrmatch
4-
OBJS = fuzzystrmatch.o dmetaphone.o $(WIN32RES)
4+
OBJS = \
5+
$(WIN32RES) \
6+
dmetaphone.o \
7+
fuzzystrmatch.o
58

69
EXTENSION = fuzzystrmatch
710
DATA = fuzzystrmatch--1.1.sql fuzzystrmatch--1.0--1.1.sql \

‎contrib/hstore/Makefile

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
# contrib/hstore/Makefile
22

33
MODULE_big = hstore
4-
OBJS = hstore_io.o hstore_op.o hstore_gist.o hstore_gin.o hstore_compat.o \
5-
$(WIN32RES)
4+
OBJS = \
5+
$(WIN32RES) \
6+
hstore_compat.o \
7+
hstore_gin.o \
8+
hstore_gist.o \
9+
hstore_io.o \
10+
hstore_op.o
611

712
EXTENSION = hstore
813
DATA = hstore--1.4.sql \

‎contrib/hstore_plperl/Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# contrib/hstore_plperl/Makefile
22

33
MODULE_big = hstore_plperl
4-
OBJS = hstore_plperl.o $(WIN32RES)
4+
OBJS = \
5+
$(WIN32RES) \
6+
hstore_plperl.o
57
PGFILEDESC = "hstore_plperl - hstore transform for plperl"
68

79

‎contrib/hstore_plpython/Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# contrib/hstore_plpython/Makefile
22

33
MODULE_big = hstore_plpython$(python_majorversion)
4-
OBJS = hstore_plpython.o $(WIN32RES)
4+
OBJS = \
5+
$(WIN32RES) \
6+
hstore_plpython.o
57
PGFILEDESC = "hstore_plpython - hstore transform for plpython"
68

79
EXTENSION = hstore_plpythonu hstore_plpython2u hstore_plpython3u

‎contrib/intarray/Makefile

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
# contrib/intarray/Makefile
22

33
MODULE_big = _int
4-
OBJS = _int_bool.o _int_gist.o _int_op.o _int_tool.o \
5-
_intbig_gist.o _int_gin.o _int_selfuncs.o $(WIN32RES)
4+
OBJS = \
5+
$(WIN32RES) \
6+
_int_bool.o \
7+
_int_gin.o \
8+
_int_gist.o \
9+
_int_op.o \
10+
_int_selfuncs.o \
11+
_int_tool.o \
12+
_intbig_gist.o
613

714
EXTENSION = intarray
815
DATA = intarray--1.2.sql intarray--1.1--1.2.sql intarray--1.0--1.1.sql \

‎contrib/jsonb_plperl/Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# contrib/jsonb_plperl/Makefile
22

33
MODULE_big = jsonb_plperl
4-
OBJS = jsonb_plperl.o $(WIN32RES)
4+
OBJS = \
5+
$(WIN32RES) \
6+
jsonb_plperl.o
57
PGFILEDESC = "jsonb_plperl - jsonb transform for plperl"
68

79
PG_CPPFLAGS = -I$(top_srcdir)/src/pl/plperl

‎contrib/jsonb_plpython/Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# contrib/jsonb_plpython/Makefile
22

33
MODULE_big = jsonb_plpython$(python_majorversion)
4-
OBJS = jsonb_plpython.o $(WIN32RES)
4+
OBJS = \
5+
$(WIN32RES) \
6+
jsonb_plpython.o
57
PGFILEDESC = "jsonb_plpython - transform between jsonb and plpythonu"
68

79
PG_CPPFLAGS = -I$(top_srcdir)/src/pl/plpython $(python_includespec) -DPLPYTHON_LIBNAME='"plpython$(python_majorversion)"'

‎contrib/ltree/Makefile

+11-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
# contrib/ltree/Makefile
22

33
MODULE_big = ltree
4-
OBJS = ltree_io.o ltree_op.o lquery_op.o _ltree_op.o crc32.o \
5-
ltxtquery_io.o ltxtquery_op.o ltree_gist.o _ltree_gist.o $(WIN32RES)
4+
OBJS = \
5+
$(WIN32RES) \
6+
_ltree_gist.o \
7+
_ltree_op.o \
8+
crc32.o \
9+
lquery_op.o \
10+
ltree_gist.o \
11+
ltree_io.o \
12+
ltree_op.o \
13+
ltxtquery_io.o \
14+
ltxtquery_op.o
615
PG_CPPFLAGS = -DLOWER_NODE
716

817
EXTENSION = ltree

‎contrib/ltree_plpython/Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# contrib/ltree_plpython/Makefile
22

33
MODULE_big = ltree_plpython$(python_majorversion)
4-
OBJS = ltree_plpython.o $(WIN32RES)
4+
OBJS = \
5+
$(WIN32RES) \
6+
ltree_plpython.o
57
PGFILEDESC = "ltree_plpython - ltree transform for plpython"
68

79
EXTENSION = ltree_plpythonu ltree_plpython2u ltree_plpython3u

‎contrib/oid2name/Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ PGFILEDESC = "oid2name - examine the file structure"
44
PGAPPICON = win32
55

66
PROGRAM = oid2name
7-
OBJS = oid2name.o $(WIN32RES)
7+
OBJS = \
8+
$(WIN32RES) \
9+
oid2name.o
810

911
TAP_TESTS = 1
1012

‎contrib/pageinspect/Makefile

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
# contrib/pageinspect/Makefile
22

33
MODULE_big = pageinspect
4-
OBJS = rawpage.o heapfuncs.o btreefuncs.o fsmfuncs.o \
5-
brinfuncs.o ginfuncs.o hashfuncs.o $(WIN32RES)
4+
OBJS = \
5+
$(WIN32RES) \
6+
brinfuncs.o \
7+
btreefuncs.o \
8+
fsmfuncs.o \
9+
ginfuncs.o \
10+
hashfuncs.o \
11+
heapfuncs.o \
12+
rawpage.o
613

714
EXTENSION = pageinspect
815
DATA = pageinspect--1.7--1.8.sql pageinspect--1.6--1.7.sql \

‎contrib/passwordcheck/Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# contrib/passwordcheck/Makefile
22

33
MODULE_big = passwordcheck
4-
OBJS = passwordcheck.o $(WIN32RES)
4+
OBJS = \
5+
$(WIN32RES) \
6+
passwordcheck.o
57
PGFILEDESC = "passwordcheck - strengthen user password checks"
68

79
# uncomment the following two lines to enable cracklib support

‎contrib/pg_buffercache/Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# contrib/pg_buffercache/Makefile
22

33
MODULE_big = pg_buffercache
4-
OBJS = pg_buffercache_pages.o $(WIN32RES)
4+
OBJS = \
5+
$(WIN32RES) \
6+
pg_buffercache_pages.o
57

68
EXTENSION = pg_buffercache
79
DATA = pg_buffercache--1.2.sql pg_buffercache--1.2--1.3.sql \

‎contrib/pg_freespacemap/Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# contrib/pg_freespacemap/Makefile
22

33
MODULE_big = pg_freespacemap
4-
OBJS = pg_freespacemap.o $(WIN32RES)
4+
OBJS = \
5+
$(WIN32RES) \
6+
pg_freespacemap.o
57

68
EXTENSION = pg_freespacemap
79
DATA = pg_freespacemap--1.1.sql pg_freespacemap--1.1--1.2.sql \

‎contrib/pg_prewarm/Makefile

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# contrib/pg_prewarm/Makefile
22

33
MODULE_big = pg_prewarm
4-
OBJS = pg_prewarm.o autoprewarm.o $(WIN32RES)
4+
OBJS = \
5+
$(WIN32RES) \
6+
autoprewarm.o \
7+
pg_prewarm.o
58

69
EXTENSION = pg_prewarm
710
DATA = pg_prewarm--1.1--1.2.sql pg_prewarm--1.1.sql pg_prewarm--1.0--1.1.sql

‎contrib/pg_standby/Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ PGFILEDESC = "pg_standby - supports creation of a warm standby"
44
PGAPPICON = win32
55

66
PROGRAM = pg_standby
7-
OBJS = pg_standby.o $(WIN32RES)
7+
OBJS = \
8+
$(WIN32RES) \
9+
pg_standby.o
810

911
ifdef USE_PGXS
1012
PG_CONFIG = pg_config

‎contrib/pg_stat_statements/Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# contrib/pg_stat_statements/Makefile
22

33
MODULE_big = pg_stat_statements
4-
OBJS = pg_stat_statements.o $(WIN32RES)
4+
OBJS = \
5+
$(WIN32RES) \
6+
pg_stat_statements.o
57

68
EXTENSION = pg_stat_statements
79
DATA = pg_stat_statements--1.4.sql pg_stat_statements--1.6--1.7.sql \

‎contrib/pg_trgm/Makefile

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
# contrib/pg_trgm/Makefile
22

33
MODULE_big = pg_trgm
4-
OBJS = trgm_op.o trgm_gist.o trgm_gin.o trgm_regexp.o $(WIN32RES)
4+
OBJS = \
5+
$(WIN32RES) \
6+
trgm_gin.o \
7+
trgm_gist.o \
8+
trgm_op.o \
9+
trgm_regexp.o
510

611
EXTENSION = pg_trgm
712
DATA = pg_trgm--1.3--1.4.sql \

‎contrib/pg_visibility/Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# contrib/pg_visibility/Makefile
22

33
MODULE_big = pg_visibility
4-
OBJS = pg_visibility.o $(WIN32RES)
4+
OBJS = \
5+
$(WIN32RES) \
6+
pg_visibility.o
57

68
EXTENSION = pg_visibility
79
DATA = pg_visibility--1.1.sql pg_visibility--1.1--1.2.sql \

0 commit comments

Comments
 (0)