From 513b034d2489e3ecfb8b74b20bcb09967509f95b Mon Sep 17 00:00:00 2001 From: Jesse Zhang Date: Mon, 9 Jan 2017 17:40:01 -0800 Subject: [PATCH] Extract common dependencies into one declaration The four BSA agents seem to (inherently, as opposed to incidentally) share the same dependencies. If that's true, we might as well declare them together in one place. --- src/bin/pg_dump/cdb/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/bin/pg_dump/cdb/Makefile b/src/bin/pg_dump/cdb/Makefile index 7b6b61467a..8c16c23936 100644 --- a/src/bin/pg_dump/cdb/Makefile +++ b/src/bin/pg_dump/cdb/Makefile @@ -84,16 +84,18 @@ libgpbsa71.so: cdb_bsa_util.o $(libpq_builddir)/libpq.a libgpbsa.so: libgpbsa76.so cp libgpbsa76.so libgpbsa.so -cdb_bsa_dump_agent: cdb_bsa_dump_agent.o cdb_dump_util.o cdb_lockbox.o $(libpq_builddir)/libpq.a +cdb_bsa_dump_agent cdb_bsa_restore_agent cdb_bsa_query_agent cdb_bsa_delete_agent: cdb_dump_util.o cdb_lockbox.o $(libpq_builddir)/libpq.a + +cdb_bsa_dump_agent: cdb_bsa_dump_agent.o $(CC) $(CFLAGS) cdb_bsa_dump_agent.o cdb_dump_util.o cdb_lockbox.o $(PGDUMP_DIR)/dumputils.o $(KEYWRDOBJS) $(libpq) $(LDFLAGS) $(DDBOOSTLIB) $(GPBSALIB) $(LIBS) -o $@ -cdb_bsa_restore_agent: cdb_bsa_restore_agent.o cdb_dump_util.o cdb_lockbox.o $(libpq_builddir)/libpq.a +cdb_bsa_restore_agent: cdb_bsa_restore_agent.o $(CC) $(CFLAGS) cdb_bsa_restore_agent.o cdb_dump_util.o cdb_lockbox.o $(PGDUMP_DIR)/dumputils.o $(KEYWRDOBJS) $(libpq) $(LDFLAGS) $(DDBOOSTLIB) $(GPBSALIB) $(LIBS) -o $@ -cdb_bsa_query_agent: cdb_bsa_query_agent.o cdb_dump_util.o cdb_lockbox.o $(libpq_builddir)/libpq.a +cdb_bsa_query_agent: cdb_bsa_query_agent.o $(CC) $(CFLAGS) cdb_bsa_query_agent.o cdb_dump_util.o cdb_lockbox.o $(PGDUMP_DIR)/dumputils.o $(KEYWRDOBJS) $(libpq) $(LDFLAGS) $(DDBOOSTLIB) $(GPBSALIB) $(LIBS) -o $@ -cdb_bsa_delete_agent: cdb_bsa_delete_agent.o cdb_dump_util.o cdb_lockbox.o $(libpq_builddir)/libpq.a +cdb_bsa_delete_agent: cdb_bsa_delete_agent.o $(CC) $(CFLAGS) cdb_bsa_delete_agent.o cdb_dump_util.o cdb_lockbox.o $(PGDUMP_DIR)/dumputils.o $(KEYWRDOBJS) $(libpq) $(LDFLAGS) $(DDBOOSTLIB) $(GPBSALIB) $(LIBS) -o $@ .PHONY: submake-backend -- GitLab