From e5f36902495d0c8d5dee9a5f43fb45d44540f795 Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Tue, 3 Mar 2015 10:32:08 -0500 Subject: [PATCH] pgbench: Fix mistakes in Makefile. My commit 878fdcb843e087cc1cdeadc987d6ef55202ddd04 was not quite right. Tom Lane pointed out one of the mistakes fixed here, and I noticed the other myself while reviewing what I'd committed. --- contrib/pgbench/Makefile | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/contrib/pgbench/Makefile b/contrib/pgbench/Makefile index 6d132228dd..a18130b1dc 100644 --- a/contrib/pgbench/Makefile +++ b/contrib/pgbench/Makefile @@ -6,8 +6,6 @@ PGAPPICON = win32 PROGRAM = pgbench OBJS = pgbench.o exprparse.o $(WIN32RES) -EXTRA_CLEAN = exprparse.c exprscan.c - PG_CPPFLAGS = -I$(libpq_srcdir) PG_LIBS = $(libpq_pgport) $(PTHREAD_LIBS) @@ -28,13 +26,8 @@ ifneq ($(PORTNAME), win32) override CFLAGS += $(PTHREAD_CFLAGS) endif -# There is no correct way to write a rule that generates two files. -# Rules with two targets don't have that meaning, they are merely -# shorthand for two otherwise separate rules. To be safe for parallel -# make, we must chain the dependencies like this. The semicolon is -# important; otherwise, make will choose the built-in rule. - -exprparse.h: exprparse.c ; - # exprscan is compiled as part of exprparse exprparse.o: exprscan.c + +maintainer-clean: + rm -f exprparse.c exprscan.c