No need to link libpq into these programs ...

tglsfdc · tglsfdc · commit 94a67cce7e34 · 2004-02-10T23:24:13.000Z
diff --git a/src/bin/pg_controldata/Makefile b/src/bin/pg_controldata/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1998-2002, PostgreSQL Global Development Group
 #
-# $PostgreSQL: pgsql/src/bin/pg_controldata/Makefile,v 1.4 2003/11/29 19:52:04 pgsql Exp $
+# $PostgreSQL: pgsql/src/bin/pg_controldata/Makefile,v 1.5 2004/02/10 23:24:13 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -17,7 +17,7 @@ OBJS= pg_controldata.o pg_crc.o
 all: submake-libpgport pg_controldata
 
 pg_controldata: $(OBJS)
-	$(CC) $(CFLAGS) $^ $(libpq) $(LDFLAGS) $(LIBS) -o $@
+	$(CC) $(CFLAGS) $^ $(LDFLAGS) $(LIBS) -o $@
 
 pg_crc.c: $(top_srcdir)/src/backend/utils/hash/pg_crc.c
 	rm -f $@ && $(LN_S) $< .
diff --git a/src/bin/pg_resetxlog/Makefile b/src/bin/pg_resetxlog/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1998-2002, PostgreSQL Global Development Group
 #
-# $PostgreSQL: pgsql/src/bin/pg_resetxlog/Makefile,v 1.4 2004/02/02 17:21:08 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/pg_resetxlog/Makefile,v 1.5 2004/02/10 23:24:13 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -20,7 +20,7 @@ OBJS= pg_resetxlog.o pg_crc.o \
 all: submake-libpgport pg_resetxlog
 
 pg_resetxlog: $(OBJS)
-	$(CC) $(CFLAGS) $^ $(libpq) $(LDFLAGS) $(LIBS) -o $@
+	$(CC) $(CFLAGS) $^ $(LDFLAGS) $(LIBS) -o $@
 
 dirmod.c: % : $(top_srcdir)/src/port/%
 	rm -f $@ && $(LN_S) $< .

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# Copyright (c) 1998-2002, PostgreSQL Global Development Group`
`6`	`6`	`#`
`7`		`-# $PostgreSQL: pgsql/src/bin/pg_controldata/Makefile,v 1.4 2003/11/29 19:52:04 pgsql Exp $`
	`7`	`+# $PostgreSQL: pgsql/src/bin/pg_controldata/Makefile,v 1.5 2004/02/10 23:24:13 tgl Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -17,7 +17,7 @@ OBJS= pg_controldata.o pg_crc.o`
`17`	`17`	`all: submake-libpgport pg_controldata`
`18`	`18`
`19`	`19`	`pg_controldata: $(OBJS)`
`20`		`- $(CC) $(CFLAGS) $^ $(libpq) $(LDFLAGS) $(LIBS) -o $@`
	`20`	`+ $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LIBS) -o $@`
`21`	`21`
`22`	`22`	`pg_crc.c: $(top_srcdir)/src/backend/utils/hash/pg_crc.c`
`23`	`23`	`rm -f $@ && $(LN_S) $< .`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# Copyright (c) 1998-2002, PostgreSQL Global Development Group`
`6`	`6`	`#`
`7`		`-# $PostgreSQL: pgsql/src/bin/pg_resetxlog/Makefile,v 1.4 2004/02/02 17:21:08 momjian Exp $`
	`7`	`+# $PostgreSQL: pgsql/src/bin/pg_resetxlog/Makefile,v 1.5 2004/02/10 23:24:13 tgl Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -20,7 +20,7 @@ OBJS= pg_resetxlog.o pg_crc.o \`
`20`	`20`	`all: submake-libpgport pg_resetxlog`
`21`	`21`
`22`	`22`	`pg_resetxlog: $(OBJS)`
`23`		`- $(CC) $(CFLAGS) $^ $(libpq) $(LDFLAGS) $(LIBS) -o $@`
	`23`	`+ $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LIBS) -o $@`
`24`	`24`
`25`	`25`	`dirmod.c: % : $(top_srcdir)/src/port/%`
`26`	`26`	`rm -f $@ && $(LN_S) $< .`