diff --git a/src/backend/Makefile b/src/backend/Makefile
index 6c27cdc11889dd051153a27ba1b884f5332dc4b0..ae90a17b0427924ce738624daf59e02f095a9656 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -34,7 +34,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.46 2000/04/08 19:38:00 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.47 2000/05/11 17:46:28 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -80,7 +80,7 @@ all: postgres $(POSTGRES_IMP) global1.bki.source local1_template1.bki.source \
 
 ifneq ($(PORTNAME), win)
 postgres: fmgr.h $(OBJS) $(VERSIONOBJ)
-	$(CC) -o postgres $(OBJS) $(OBJS1) $(VERSIONOBJ) $(LDFLAGS)
+	$(CC) $(CFLAGS) -o postgres $(OBJS) $(OBJS1) $(VERSIONOBJ) $(LDFLAGS)
 else
 postgres: $(DLLOBJS) $(SRCDIR)/utils/dllinit.o postgres.def libpostgres.a
 	dlltool --dllname $@$(X) --output-exp $@.exp --def postgres.def
diff --git a/src/backend/port/Makefile.in b/src/backend/port/Makefile.in
index 24e53cedc488173adfa45186f82a5a7ec161dafa..ccae5e1ec2c962aead7be1d5438f43fbbaae6569 100644
--- a/src/backend/port/Makefile.in
+++ b/src/backend/port/Makefile.in
@@ -13,7 +13,7 @@
 # be converted to Method 2.  
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.20 1999/12/16 01:25:02 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.21 2000/05/11 17:46:31 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -38,6 +38,9 @@ qnx4/SUBSYS.o: qnx4.dir
 qnx4.dir:
 	$(MAKE) -C qnx4 all
 
+tas.o: tas.s
+	$(CC) $(CFLAGS) -c tas.o tas.s $(LDFLAGS)
+
 .PHONY: clean dep
 
 distclean clean:
diff --git a/src/bin/pg_dump/Makefile.in b/src/bin/pg_dump/Makefile.in
index 752b4af1a6f2b28c718014d19b3e1cc5a63cf09c..dddc006b8bd600e244ae795ed0f48872204b540b 100644
--- a/src/bin/pg_dump/Makefile.in
+++ b/src/bin/pg_dump/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/Makefile.in,v 1.12 2000/03/08 01:58:19 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/Makefile.in,v 1.13 2000/05/11 17:46:32 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -29,7 +29,7 @@ endif
 all: submake pg_dump
 
 pg_dump: $(OBJS) $(LIBPQDIR)/libpq.a
-	$(CC) -o pg_dump $(OBJS) $(LIBPQ) $(LDFLAGS)
+	$(CC) $(CFLAGS) -o pg_dump $(OBJS) $(LIBPQ) $(LDFLAGS)
 
 ../../utils/strdup.o:
 	$(MAKE) -C ../../utils strdup.o
diff --git a/src/bin/pg_passwd/Makefile b/src/bin/pg_passwd/Makefile
index e4ceb5c7136b24f589da0f2af27ac36ddfad4684..f6c15053c9ac216dd68df80fbabdd954bfd433cb 100644
--- a/src/bin/pg_passwd/Makefile
+++ b/src/bin/pg_passwd/Makefile
@@ -12,7 +12,7 @@ OBJS= pg_passwd.o
 all: pg_passwd
 
 pg_passwd: $(OBJS)
-	$(CC) -o pg_passwd $(OBJS) $(LDFLAGS)
+	$(CC) $(CFLAGS) -o pg_passwd $(OBJS) $(LDFLAGS)
 
 install: pg_passwd
 	$(INSTALL) $(INSTL_EXE_OPTS) pg_passwd$(X) $(BINDIR)/pg_passwd$(X)
diff --git a/src/bin/pg_version/Makefile.in b/src/bin/pg_version/Makefile.in
index 90271536bade62daf74d444da2b3dd05767cfc9d..64e0a2673a99e7c207ba3f9932d6fb5db669e675 100644
--- a/src/bin/pg_version/Makefile.in
+++ b/src/bin/pg_version/Makefile.in
@@ -7,7 +7,7 @@
 # Portions Copyright (c) 1994, Regents of the University of California
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/Makefile.in,v 1.7 2000/02/27 01:33:43 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/Makefile.in,v 1.8 2000/05/11 17:46:35 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -21,7 +21,7 @@ OBJS= pg_version.o $(SRCDIR)/utils/version.o @STRERROR2@
 all: pg_version
 
 pg_version: $(OBJS)
-	$(CC) -o pg_version $(OBJS) $(LDFLAGS)
+	$(CC) $(CFLAGS) -o pg_version $(OBJS) $(LDFLAGS)
 
 $(SRCDIR)/utils/version.o: $(SRCDIR)/utils/version.c $(SRCDIR)/include/version.h
 	$(MAKE) -C $(SRCDIR)/utils version.o
diff --git a/src/bin/psql/Makefile.in b/src/bin/psql/Makefile.in
index 49600c8ccb503fc8476325e3adb1dbc6cf3f69c4..4fa6a4f13717cabfb2a170e70a80f24fe1bade7c 100644
--- a/src/bin/psql/Makefile.in
+++ b/src/bin/psql/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.23 2000/04/16 18:07:22 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.24 2000/05/11 17:46:35 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -58,7 +58,7 @@ endif
 # End of hacks for picking up backend 'port' modules
 
 psql: $(OBJS) $(LIBPQDIR)/libpq.a
-	$(CC) -o psql $(OBJS) $(LIBPQ) $(LDFLAGS)
+	$(CC) $(CFLAGS) -o psql $(OBJS) $(LIBPQ) $(LDFLAGS)
 
 help.o: sql_help.h