Commit8e9d64c

committed

Merge branch 'master' of github.com:postgrespro/postgres_cluster

2 parents47bcca1 +28fcf4e commit8e9d64cCopy full SHA for 8e9d64c

File tree

+455

-278

lines changed

+455

-278

lines changed

Lines changed: 1 addition & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,5 @@`
`1`	`1`	`MODULE_big = multimaster`
`2`		`-OBJS = multimaster.o ../arbiter/lib/libarbiter.a ../arbiter/sockhub/libsockhub.a bytebuf.o bgwpool.o pglogical_output.o pglogical_proto.o pglogical_receiver.o pglogical_apply.o pglogical_hooks.o pglogical_config.o`
`3`		`-#OBJS = multimaster.o pglogical_receiver.o decoder_raw.o libdtm.o bytebuf.o bgwpool.o sockhub/sockhub.o`
`4`		`-`
`5`		`-overrideCPPFLAGS += -I../arbiter/api -I../arbiter/sockhub`
	`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`
`6`	`3`
`7`	`4`	`EXTENSION = multimaster`
`8`	`5`	`DATA = multimaster--1.0.sql`
`@@ -11,12 +8,6 @@ DATA = multimaster--1.0.sql`
`11`	`8`
`12`	`9`	`all: multimaster.o multimaster.so`
`13`	`10`
`14`		`-../arbiter/sockhub/libsockhub.a:`
`15`		`-make -C ../arbiter/sockhub`
`16`		`-`
`17`		`-../arbiter/lib/libarbiter.a:`
`18`		`-make -C ../arbiter`
`19`		`-`
`20`	`11`	`PG_CPPFLAGS = -I$(libpq_srcdir) -DUSE_PGLOGICAL_OUTPUT`
`21`	`12`	`SHLIB_LINK =$(libpq)`
`22`	`13`

Comments

(0)