Commitdef159b

committed

Merge branch 'PGPROEE9_6_MULTIMASTER' ofhttps://gitlab.postgrespro.ru/pgpro-dev/postgrespro into PGPROEE9_6_MULTIMASTER

2 parentsba6313a +f5d9e03 commitdef159bCopy full SHA for def159b

File tree

+10

-9

lines changed

+10

-9

lines changed

Lines changed: 10 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,8 @@`
`1`		`-MODULE_big = multimaster`
`2`		`-OBJS = multimaster.o arbiter.o bytebuf.o bgwpool.o pglogical_output.o pglogical_proto.o pglogical_receiver.o pglogical_apply.o pglogical_hooks.o pglogical_config.o pglogical_relid_map.o ddd.o bkb.o spill.o`
`3`	`1`
`4`	`2`	`EXTENSION = multimaster`
`5`	`3`	`DATA = multimaster--1.0.sql`
`6`		`-`
`7`		`-.PHONY: all`
`8`		`-`
`9`		`-EXTRA_INSTALL=contrib/mmts`
`10`		`-`
`11`		`-all: multimaster.so`
	`4`	`+OBJS = multimaster.o arbiter.o bytebuf.o bgwpool.o pglogical_output.o pglogical_proto.o pglogical_receiver.o pglogical_apply.o pglogical_hooks.o pglogical_config.o pglogical_relid_map.o ddd.o bkb.o spill.o`
	`5`	`+MODULE_big = multimaster`
`12`	`6`
`13`	`7`	`PG_CPPFLAGS = -I$(libpq_srcdir)`
`14`	`8`	`SHLIB_LINK =$(libpq)`
`@@ -18,11 +12,18 @@ PG_CONFIG = pg_config`
`18`	`12`	`PGXS :=$(shell$(PG_CONFIG) --pgxs)`
`19`	`13`	`include$(PGXS)`
`20`	`14`	`else`
`21`		`-subdir = contrib/multimaster`
	`15`	`+subdir = contrib/mmts`
`22`	`16`	`top_builddir = ../..`
`23`	`17`	`include$(top_builddir)/src/Makefile.global`
`24`	`18`	`include$(top_srcdir)/contrib/contrib-global.mk`
`25`	`19`	`endif`
	`20`	`+.PHONY: all`
	`21`	`+`
	`22`	`+EXTRA_INSTALL=contrib/mmts`
	`23`	`+`
	`24`	`+all: multimaster.so`
	`25`	`+`
	`26`	`+`
`26`	`27`
`27`	`28`	`check: temp-install`
`28`	`29`	`$(prove_check)`

Comments

(0)