From d8484f6695179fe491939aab17a447561e02e3dc Mon Sep 17 00:00:00 2001 From: Gao Zengqi Date: Mon, 20 Nov 2017 08:42:57 +0000 Subject: [PATCH] add dependency between client executables and static libraries --- src/Makefile.global.in | 15 +++++++++++++++ src/backend/storage/lmgr/Makefile | 2 +- src/bin/initdb/Makefile | 4 ++-- src/bin/pg_archivecleanup/Makefile | 2 +- src/bin/pg_basebackup/Makefile | 8 ++++---- src/bin/pg_config/Makefile | 2 +- src/bin/pg_controldata/Makefile | 2 +- src/bin/pg_ctl/Makefile | 2 +- src/bin/pg_dump/Makefile | 8 ++++---- src/bin/pg_resetwal/Makefile | 2 +- src/bin/pg_rewind/Makefile | 2 +- src/bin/pg_test_fsync/Makefile | 2 +- src/bin/pg_test_timing/Makefile | 2 +- src/bin/pg_upgrade/Makefile | 4 ++-- src/bin/pg_waldump/Makefile | 2 +- src/bin/pgbench/Makefile | 4 ++-- src/bin/psql/Makefile | 4 ++-- src/bin/scripts/Makefile | 18 +++++++++--------- src/interfaces/ecpg/preproc/Makefile | 2 +- src/test/isolation/Makefile | 2 +- src/test/regress/GNUmakefile | 4 ++-- src/timezone/Makefile | 2 +- src/tools/findoidjoins/Makefile | 2 +- 23 files changed, 56 insertions(+), 41 deletions(-) diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 27ec54a..b7caacf 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -502,6 +502,9 @@ ifeq ($(PORTNAME),cygwin) libpq_pgport += $(LDAP_LIBS_FE) endif +# This macro is for use by client executables linking to libpgfeutils. +libpgfeutils = -L$(top_builddir)/src/fe_utils -lpgfeutils + ########################################################################## # @@ -527,6 +530,18 @@ submake-generated-headers: ########################################################################## # +# Static libraries for client executables + +stlib_pgport = $(top_builddir)/src/port/libpgport.a $(top_builddir)/src/common/libpgcommon.a +stlib_pgfeutils = $(top_builddir)/src/fe_utils/libpgfeutils.a + +# start submake for these static libraries +$(stlib_pgport): | submake-libpgport +$(stlib_pgfeutils): | submake-libpgfeutils + + +########################################################################## +# # Testing support PL_TESTDB = pl_regression diff --git a/src/backend/storage/lmgr/Makefile b/src/backend/storage/lmgr/Makefile index e1b787e..2ca0595 100644 --- a/src/backend/storage/lmgr/Makefile +++ b/src/backend/storage/lmgr/Makefile @@ -21,7 +21,7 @@ ifdef TAS TASPATH = $(top_builddir)/src/backend/port/tas.o endif -s_lock_test: s_lock.c $(top_builddir)/src/port/libpgport.a +s_lock_test: s_lock.c $(stlib_pgport) $(CC) $(CPPFLAGS) $(CFLAGS) -DS_LOCK_TEST=1 $(srcdir)/s_lock.c \ $(TASPATH) -L $(top_builddir)/src/port -lpgport -o s_lock_test diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile index ec26652..f5000ca 100644 --- a/src/bin/initdb/Makefile +++ b/src/bin/initdb/Makefile @@ -19,7 +19,7 @@ include $(top_builddir)/src/Makefile.global override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) -I$(top_srcdir)/src/timezone $(CPPFLAGS) # note: we need libpq only because fe_utils does -override LDFLAGS := -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport) $(LDFLAGS) +override LDFLAGS := $(libpgfeutils) $(libpq_pgport) $(LDFLAGS) # use system timezone data? ifneq (,$(with_system_tzdata)) @@ -30,7 +30,7 @@ OBJS= initdb.o findtimezone.o localtime.o encnames.o $(WIN32RES) all: initdb -initdb: $(OBJS) | submake-libpq submake-libpgport submake-libpgfeutils +initdb: $(OBJS) $(stlib_pgport) $(stlib_pgfeutils) | submake-libpq $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) # We used to pull in all of libpq to get encnames.c, but that diff --git a/src/bin/pg_archivecleanup/Makefile b/src/bin/pg_archivecleanup/Makefile index c5bf99d..49aab01 100644 --- a/src/bin/pg_archivecleanup/Makefile +++ b/src/bin/pg_archivecleanup/Makefile @@ -11,7 +11,7 @@ OBJS = pg_archivecleanup.o $(WIN32RES) all: pg_archivecleanup -pg_archivecleanup: $(OBJS) | submake-libpgport +pg_archivecleanup: $(OBJS) $(stlib_pgport) $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) install: all installdirs diff --git a/src/bin/pg_basebackup/Makefile b/src/bin/pg_basebackup/Makefile index b707af9..4f731d1 100644 --- a/src/bin/pg_basebackup/Makefile +++ b/src/bin/pg_basebackup/Makefile @@ -19,19 +19,19 @@ top_builddir = ../../.. include $(top_builddir)/src/Makefile.global override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) -override LDFLAGS := -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport) $(LDFLAGS) +override LDFLAGS := $(libpgfeutils) $(libpq_pgport) $(LDFLAGS) OBJS=receivelog.o streamutil.o walmethods.o $(WIN32RES) all: pg_basebackup pg_receivewal pg_recvlogical -pg_basebackup: pg_basebackup.o $(OBJS) | submake-libpq submake-libpgport submake-libpgfeutils +pg_basebackup: pg_basebackup.o $(OBJS) $(stlib_pgport) $(stlib_pgfeutils) | submake-libpq $(CC) $(CFLAGS) pg_basebackup.o $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) -pg_receivewal: pg_receivewal.o $(OBJS) | submake-libpq submake-libpgport submake-libpgfeutils +pg_receivewal: pg_receivewal.o $(OBJS) $(stlib_pgport) $(stlib_pgfeutils) | submake-libpq $(CC) $(CFLAGS) pg_receivewal.o $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) -pg_recvlogical: pg_recvlogical.o $(OBJS) | submake-libpq submake-libpgport submake-libpgfeutils +pg_recvlogical: pg_recvlogical.o $(OBJS) $(stlib_pgport) $(stlib_pgfeutils) | submake-libpq $(CC) $(CFLAGS) pg_recvlogical.o $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) install: all installdirs diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile index c410087..b085575 100644 --- a/src/bin/pg_config/Makefile +++ b/src/bin/pg_config/Makefile @@ -19,7 +19,7 @@ OBJS= pg_config.o $(WIN32RES) all: pg_config -pg_config: $(OBJS) | submake-libpgport +pg_config: $(OBJS) $(stlib_pgport) $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) install: all installdirs diff --git a/src/bin/pg_controldata/Makefile b/src/bin/pg_controldata/Makefile index fd87daa..9bb580b 100644 --- a/src/bin/pg_controldata/Makefile +++ b/src/bin/pg_controldata/Makefile @@ -19,7 +19,7 @@ OBJS= pg_controldata.o $(WIN32RES) all: pg_controldata -pg_controldata: $(OBJS) | submake-libpgport +pg_controldata: $(OBJS) $(stlib_pgport) $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) install: all installdirs diff --git a/src/bin/pg_ctl/Makefile b/src/bin/pg_ctl/Makefile index e734c95..1c82171 100644 --- a/src/bin/pg_ctl/Makefile +++ b/src/bin/pg_ctl/Makefile @@ -28,7 +28,7 @@ OBJS= pg_ctl.o $(WIN32RES) all: pg_ctl -pg_ctl: $(OBJS) | submake-libpgport $(SUBMAKE_LIBPQ) +pg_ctl: $(OBJS) $(stlib_pgport) | $(SUBMAKE_LIBPQ) $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) install: all installdirs diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile index 3700884..aba501c 100644 --- a/src/bin/pg_dump/Makefile +++ b/src/bin/pg_dump/Makefile @@ -17,7 +17,7 @@ top_builddir = ../../.. include $(top_builddir)/src/Makefile.global override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) -override LDFLAGS := -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport) $(LDFLAGS) +override LDFLAGS := $(libpgfeutils) $(libpq_pgport) $(LDFLAGS) OBJS= pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o \ pg_backup_null.o pg_backup_tar.o pg_backup_directory.o \ @@ -25,13 +25,13 @@ OBJS= pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o \ all: pg_dump pg_restore pg_dumpall -pg_dump: pg_dump.o common.o pg_dump_sort.o $(OBJS) | submake-libpq submake-libpgport submake-libpgfeutils +pg_dump: pg_dump.o common.o pg_dump_sort.o $(OBJS) $(stlib_pgport) $(stlib_pgfeutils) | submake-libpq $(CC) $(CFLAGS) pg_dump.o common.o pg_dump_sort.o $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) -pg_restore: pg_restore.o $(OBJS) | submake-libpq submake-libpgport submake-libpgfeutils +pg_restore: pg_restore.o $(OBJS) $(stlib_pgport) $(stlib_pgfeutils) | submake-libpq $(CC) $(CFLAGS) pg_restore.o $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) -pg_dumpall: pg_dumpall.o dumputils.o | submake-libpq submake-libpgport submake-libpgfeutils +pg_dumpall: pg_dumpall.o dumputils.o $(stlib_pgport) $(stlib_pgfeutils) | submake-libpq $(CC) $(CFLAGS) pg_dumpall.o dumputils.o $(WIN32RES) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) install: all installdirs diff --git a/src/bin/pg_resetwal/Makefile b/src/bin/pg_resetwal/Makefile index 0f6e5da..82da592 100644 --- a/src/bin/pg_resetwal/Makefile +++ b/src/bin/pg_resetwal/Makefile @@ -19,7 +19,7 @@ OBJS= pg_resetwal.o $(WIN32RES) all: pg_resetwal -pg_resetwal: $(OBJS) | submake-libpgport +pg_resetwal: $(OBJS) $(stlib_pgport) $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) install: all installdirs diff --git a/src/bin/pg_rewind/Makefile b/src/bin/pg_rewind/Makefile index e64ad76..8a23041 100644 --- a/src/bin/pg_rewind/Makefile +++ b/src/bin/pg_rewind/Makefile @@ -26,7 +26,7 @@ EXTRA_CLEAN = xlogreader.c all: pg_rewind -pg_rewind: $(OBJS) | submake-libpq submake-libpgport +pg_rewind: $(OBJS) $(stlib_pgport) | submake-libpq $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) xlogreader.c: % : $(top_srcdir)/src/backend/access/transam/% diff --git a/src/bin/pg_test_fsync/Makefile b/src/bin/pg_test_fsync/Makefile index 90496df..ade9072 100644 --- a/src/bin/pg_test_fsync/Makefile +++ b/src/bin/pg_test_fsync/Makefile @@ -11,7 +11,7 @@ OBJS = pg_test_fsync.o $(WIN32RES) all: pg_test_fsync -pg_test_fsync: $(OBJS) | submake-libpgport +pg_test_fsync: $(OBJS) $(stlib_pgport) $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) install: all installdirs diff --git a/src/bin/pg_test_timing/Makefile b/src/bin/pg_test_timing/Makefile index d1f3595..ae144fb 100644 --- a/src/bin/pg_test_timing/Makefile +++ b/src/bin/pg_test_timing/Makefile @@ -11,7 +11,7 @@ OBJS = pg_test_timing.o $(WIN32RES) all: pg_test_timing -pg_test_timing: $(OBJS) | submake-libpgport +pg_test_timing: $(OBJS) $(stlib_pgport) $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) install: all installdirs diff --git a/src/bin/pg_upgrade/Makefile b/src/bin/pg_upgrade/Makefile index 1d6ee70..78024bb 100644 --- a/src/bin/pg_upgrade/Makefile +++ b/src/bin/pg_upgrade/Makefile @@ -12,12 +12,12 @@ OBJS = check.o controldata.o dump.o exec.o file.o function.o info.o \ tablespace.o util.o version.o $(WIN32RES) override CPPFLAGS := -DDLSUFFIX=\"$(DLSUFFIX)\" -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS) -override LDFLAGS := -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport) $(LDFLAGS) +override LDFLAGS := $(libpgfeutils) $(libpq_pgport) $(LDFLAGS) all: pg_upgrade -pg_upgrade: $(OBJS) | submake-libpq submake-libpgport submake-libpgfeutils +pg_upgrade: $(OBJS) $(stlib_pgport) $(stlib_pgfeutils) | submake-libpq $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) install: all installdirs diff --git a/src/bin/pg_waldump/Makefile b/src/bin/pg_waldump/Makefile index f5957bd..98ce844 100644 --- a/src/bin/pg_waldump/Makefile +++ b/src/bin/pg_waldump/Makefile @@ -18,7 +18,7 @@ RMGRDESCOBJS = $(patsubst %.c,%.o,$(RMGRDESCSOURCES)) all: pg_waldump -pg_waldump: $(OBJS) | submake-libpgport +pg_waldump: $(OBJS) $(stlib_pgport) $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) xlogreader.c: % : $(top_srcdir)/src/backend/access/transam/% diff --git a/src/bin/pgbench/Makefile b/src/bin/pgbench/Makefile index 8a8e516..6bd5940 100644 --- a/src/bin/pgbench/Makefile +++ b/src/bin/pgbench/Makefile @@ -10,7 +10,7 @@ include $(top_builddir)/src/Makefile.global OBJS = pgbench.o exprparse.o $(WIN32RES) override CPPFLAGS := -I. -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS) -override LDFLAGS := -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport) $(LDFLAGS) +override LDFLAGS := $(libpgfeutils) $(libpq_pgport) $(LDFLAGS) ifneq ($(PORTNAME), win32) override CFLAGS += $(PTHREAD_CFLAGS) @@ -20,7 +20,7 @@ LIBS += $(PTHREAD_LIBS) all: pgbench -pgbench: $(OBJS) | submake-libpq submake-libpgport submake-libpgfeutils +pgbench: $(OBJS) $(stlib_pgport) $(stlib_pgfeutils) | submake-libpq $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) # exprscan is compiled as part of exprparse diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile index cabfe15..b4d1e55 100644 --- a/src/bin/psql/Makefile +++ b/src/bin/psql/Makefile @@ -19,7 +19,7 @@ include $(top_builddir)/src/Makefile.global REFDOCDIR= $(top_srcdir)/doc/src/sgml/ref override CPPFLAGS := -I. -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS) -override LDFLAGS := -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport) $(LDFLAGS) +override LDFLAGS := $(libpgfeutils) $(libpq_pgport) $(LDFLAGS) OBJS= command.o common.o conditional.o copy.o crosstabview.o \ describe.o help.o input.o large_obj.o mainloop.o \ @@ -30,7 +30,7 @@ OBJS= command.o common.o conditional.o copy.o crosstabview.o \ all: psql -psql: $(OBJS) | submake-libpq submake-libpgport submake-libpgfeutils +psql: $(OBJS) $(stlib_pgport) $(stlib_pgfeutils) | submake-libpq $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) help.o: sql_help.h diff --git a/src/bin/scripts/Makefile b/src/bin/scripts/Makefile index a9c24a9..d0d7ab6 100644 --- a/src/bin/scripts/Makefile +++ b/src/bin/scripts/Makefile @@ -19,21 +19,21 @@ include $(top_builddir)/src/Makefile.global PROGRAMS = createdb createuser dropdb dropuser clusterdb vacuumdb reindexdb pg_isready override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) -override LDFLAGS := -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport) $(LDFLAGS) +override LDFLAGS := $(libpgfeutils) $(libpq_pgport) $(LDFLAGS) all: $(PROGRAMS) %: %.o $(WIN32RES) $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) -createdb: createdb.o common.o | submake-libpq submake-libpgport submake-libpgfeutils -createuser: createuser.o common.o | submake-libpq submake-libpgport submake-libpgfeutils -dropdb: dropdb.o common.o | submake-libpq submake-libpgport submake-libpgfeutils -dropuser: dropuser.o common.o | submake-libpq submake-libpgport submake-libpgfeutils -clusterdb: clusterdb.o common.o | submake-libpq submake-libpgport submake-libpgfeutils -vacuumdb: vacuumdb.o common.o | submake-libpq submake-libpgport submake-libpgfeutils -reindexdb: reindexdb.o common.o | submake-libpq submake-libpgport submake-libpgfeutils -pg_isready: pg_isready.o common.o | submake-libpq submake-libpgport submake-libpgfeutils +createdb: createdb.o common.o $(stlib_pgport) $(stlib_pgfeutils) | submake-libpq +createuser: createuser.o common.o $(stlib_pgport) $(stlib_pgfeutils) | submake-libpq +dropdb: dropdb.o common.o $(stlib_pgport) $(stlib_pgfeutils) | submake-libpq +dropuser: dropuser.o common.o $(stlib_pgport) $(stlib_pgfeutils) | submake-libpq +clusterdb: clusterdb.o common.o $(stlib_pgport) $(stlib_pgfeutils) | submake-libpq +vacuumdb: vacuumdb.o common.o $(stlib_pgport) $(stlib_pgfeutils) | submake-libpq +reindexdb: reindexdb.o common.o $(stlib_pgport) $(stlib_pgfeutils) | submake-libpq +pg_isready: pg_isready.o common.o $(stlib_pgport) $(stlib_pgfeutils) | submake-libpq install: all installdirs $(INSTALL_PROGRAM) createdb$(X) '$(DESTDIR)$(bindir)'/createdb$(X) diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile index 02a6e65..2e55b75 100644 --- a/src/interfaces/ecpg/preproc/Makefile +++ b/src/interfaces/ecpg/preproc/Makefile @@ -33,7 +33,7 @@ endif all: ecpg -ecpg: $(OBJS) | submake-libpgport +ecpg: $(OBJS) $(stlib_pgport) $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_EX) $^ $(LIBS) $(PTHREAD_LIBS) -o $@$(X) ../ecpglib/typename.o: ../ecpglib/typename.c diff --git a/src/test/isolation/Makefile b/src/test/isolation/Makefile index 8eb4969..27264b4 100644 --- a/src/test/isolation/Makefile +++ b/src/test/isolation/Makefile @@ -24,7 +24,7 @@ pg_regress.o: | submake-regress pg_isolation_regress$(X): isolation_main.o pg_regress.o $(WIN32RES) $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@ -isolationtester$(X): $(OBJS) | submake-libpq submake-libpgport +isolationtester$(X): $(OBJS) $(stlib_pgport) | submake-libpq $(CC) $(CFLAGS) $^ $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@ distprep: specparse.c specscanner.c diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile index 8b2d20c..a9f8738 100644 --- a/src/test/regress/GNUmakefile +++ b/src/test/regress/GNUmakefile @@ -36,7 +36,7 @@ EXTRADEFS = '-DHOST_TUPLE="$(host_tuple)"' \ all: pg_regress$(X) -pg_regress$(X): pg_regress.o pg_regress_main.o $(WIN32RES) | submake-libpgport +pg_regress$(X): pg_regress.o pg_regress_main.o $(WIN32RES) $(stlib_pgport) $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@ # dependencies ensure that path changes propagate @@ -107,7 +107,7 @@ $(top_builddir)/contrib/spi/refint$(DLSUFFIX): | submake-contrib-spi ; $(top_builddir)/contrib/spi/autoinc$(DLSUFFIX): | submake-contrib-spi ; -submake-contrib-spi: | submake-libpgport submake-generated-headers +submake-contrib-spi: $(stlib_pgport) | submake-generated-headers $(MAKE) -C $(top_builddir)/contrib/spi .PHONY: submake-contrib-spi diff --git a/src/timezone/Makefile b/src/timezone/Makefile index bed5727..4eee23a 100644 --- a/src/timezone/Makefile +++ b/src/timezone/Makefile @@ -49,7 +49,7 @@ ifeq (,$(ZIC)) ZIC= ./zic endif -zic: $(ZICOBJS) | submake-libpgport +zic: $(ZICOBJS) $(stlib_pgport) $(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) install: all installdirs diff --git a/src/tools/findoidjoins/Makefile b/src/tools/findoidjoins/Makefile index 5410d85..3bcea54 100644 --- a/src/tools/findoidjoins/Makefile +++ b/src/tools/findoidjoins/Makefile @@ -19,7 +19,7 @@ OBJS= findoidjoins.o all: findoidjoins -findoidjoins: findoidjoins.o | submake-libpq submake-libpgport +findoidjoins: findoidjoins.o $(stlib_pgport) | submake-libpq $(CC) $(CFLAGS) findoidjoins.o $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) clean distclean maintainer-clean: -- 2.7.4