3 files changed, 6 insertions, 31 deletions
diff --git a/src/backend/Makefile b/src/backend/Makefile
index b3d96da5d42..37a4a7bae9d 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -34,7 +34,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.54 2000/06/05 07:16:12 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.55 2000/06/17 00:09:34 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -59,13 +59,6 @@ endif
 
 VERSIONOBJ = $(SRCDIR)/utils/version.o
 
-# kerberos flags
-
-ifdef KRBVERS
-CFLAGS+= $(KRBFLAGS)
-LDFLAGS+= $(KRBLIBS)
-endif
-
 ifeq ($(MAKE_DLL), true)
 DLLOBJS= $(OBJS) $(VERSIONOBJ)
 DLLLIBS= -L/usr/local/lib -lcygipc -lcrypt -lcygwin -lkernel32
@@ -303,5 +296,5 @@ $(IDFILE):
 #	make foo.C
 #
 %.cpp:	%.c
-	$(CC) -E $(CFLAGS) $(<:.C=.c) | cat -s | cb | tr -s '\012*' '\012' \
+	$(CC) -E $(CPPFLAGS) $(<:.C=.c) | cat -s | cb | tr -s '\012*' '\012' \
 	    > $(@F)
diff --git a/src/backend/libpq/Makefile b/src/backend/libpq/Makefile
index b1366f0ba65..a527915e5a1 100644
--- a/src/backend/libpq/Makefile
+++ b/src/backend/libpq/Makefile
@@ -4,19 +4,13 @@
 #    Makefile for libpq subsystem (backend half of libpq interface)
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.19 2000/05/29 05:44:46 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.20 2000/06/17 00:09:40 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR = ../..
 include ../../Makefile.global
 
-# kerberos flags
-ifdef KRBVERS
-CFLAGS+= $(KRBFLAGS)
-LDFLAGS+= $(KRBLIBS)
-endif
-
 OBJS = be-dumpdata.o be-fsstubs.o be-pqexec.o portal.o portalbuf.o \
 	auth.o hba.o crypt.o password.o \
 	pqcomm.o pqformat.o pqpacket.o pqsignal.o util.o
diff --git a/src/backend/utils/Makefile b/src/backend/utils/Makefile
index eef11361bb5..5d230f94e28 100644
--- a/src/backend/utils/Makefile
+++ b/src/backend/utils/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for utils
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.14 2000/06/09 02:38:36 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.15 2000/06/17 00:09:43 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -32,25 +32,13 @@ SUBSYS.o: $(OBJS)
 submake:
 	for i in $(DIRS); do $(MAKE) -C $$i SUBSYS.o; done
 
-# Gen_fmgrtab.sh will not change the timestamp of its output files
-# if they already exist and would not be changed. This is to avoid
-# unnecessary recompilations. In order to avoid re-running it all
-# the time we update a stamp file instead. (Idea stolen from
-# autoconf and autoheader.)
 
-fmgroids.h fmgrtab.c: fmgrstamp-h
-
-fmgrstamp-h: Gen_fmgrtab.sh $(SRCDIR)/include/catalog/pg_proc.h
+fmgroids.h fmgrtab.c: Gen_fmgrtab.sh $(SRCDIR)/include/catalog/pg_proc.h
 	$(SHELL) $(SHOPTS) Gen_fmgrtab.sh $(SRCDIR)/include/catalog/pg_proc.h
-	date > fmgrstamp-h
 
-# don't clean fmgroids.h and fmgrtab.c, but do clean fmgrstamp-h
-# (we don't really want to put that much trust in timestamps in
-# distribution files and CVS pulls, so force at least one run of
-# Gen_fmgrtab.sh after a make clean)
 
 clean:
-	rm -f SUBSYS.o fmgrtab.o fmgrstamp-h
+	rm -f SUBSYS.o fmgrtab.o fmgroids.h fmgrtab.c
 	for i in $(DIRS); do $(MAKE) -C $$i clean; done
 
 dep depend: fmgroids.h fmgrtab.c