Clean up failure to remove exec.o on 'make clean'.

diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile
index 51f97ac88b485d45be10063f234396cc21ecbc1f..ae5533bba35f5a6fe905de144322ff383da1d32f 100644 (file)
--- a/src/bin/pg_dump/Makefile
+++ b/src/bin/pg_dump/Makefile
@@ -5,7 +5,7 @@
 # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.49 2004/05/19 17:15:20 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.50 2004/05/22 02:14:28 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -13,17 +13,15 @@ subdir = src/bin/pg_dump
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-override CPPFLAGS += -DFRONTEND
+override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) -DFRONTEND
 
 OBJS=  pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o \
        pg_backup_files.o pg_backup_null.o pg_backup_tar.o \
        dumputils.o
-PG_DUMPALL_OBJS =      $(filter exec.o, $(LIBOBJS))
+PG_DUMPALL_OBJS = $(filter exec.o, $(LIBOBJS))
 
 EXTRA_OBJS = $(top_builddir)/src/backend/parser/keywords.o
 
-override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
-
 
 all: submake-libpq submake-libpgport submake-backend pg_dump pg_restore pg_dumpall
 
@@ -36,6 +34,7 @@ pg_restore: pg_restore.o $(OBJS) $(libpq_builddir)/libpq.a
 pg_dumpall: pg_dumpall.o dumputils.o $(PG_DUMPALL_OBJS) $(libpq_builddir)/libpq.a
        $(CC) $(CFLAGS) pg_dumpall.o dumputils.o $(PG_DUMPALL_OBJS) $(EXTRA_OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@$(X)
 
+# We need our own build of exec.c so it gets made with -DFRONTEND
 exec.c: % : $(top_srcdir)/src/port/%
        rm -f $@ && $(LN_S) $< .
 
@@ -56,4 +55,4 @@ uninstall:
        rm -f $(addprefix $(DESTDIR)$(bindir)/, pg_dump$(X) pg_restore$(X) pg_dumpall$(X))
 
 clean distclean maintainer-clean:
-       rm -f pg_dump$(X) pg_restore$(X) pg_dumpall$(X) $(OBJS) pg_dump.o common.o pg_dump_sort.o pg_restore.o pg_dumpall.o exec.c
+       rm -f pg_dump$(X) pg_restore$(X) pg_dumpall$(X) $(OBJS) $(PG_DUMPALL_OBJS) pg_dump.o common.o pg_dump_sort.o pg_restore.o pg_dumpall.o exec.c