Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit01368e5

Browse files
committed
Split all OBJS style lines in makefiles into one-line-per-entry style.
When maintaining or merging patches, one of the most common sourcesfor conflicts are the list of objects in makefiles. Especially whenthe split across lines has been changed on both sides, which issomewhat common due to attempting to stay below 80 columns, thoseconflicts are unnecessarily laborious to resolve.By splitting, and alphabetically sorting, OBJS style lines into oneobject per line, conflicts should be less frequent, and easier toresolve when they still occur.Author: Andres FreundDiscussion:https://postgr.es/m/20191029200901.vww4idgcxv74cwes@alap3.anarazel.de
1 parent66c61c8 commit01368e5

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‎

Lines changed: 3 additions & 1 deletion
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‎

Lines changed: 3 additions & 1 deletion
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‎

Lines changed: 3 additions & 1 deletion
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
ifdefUSE_PGXS

‎contrib/bloom/Makefile‎

Lines changed: 8 additions & 1 deletion
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‎

Lines changed: 3 additions & 1 deletion
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‎

Lines changed: 25 additions & 6 deletions
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‎

Lines changed: 4 additions & 1 deletion
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‎

Lines changed: 3 additions & 1 deletion
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‎

Lines changed: 3 additions & 1 deletion
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‎

Lines changed: 3 additions & 1 deletion
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

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp