Derived files that are shipped in the distribution used to be built in the

source directory even for out-of-tree builds.  They are now alsl built in
the build tree.  This should be more convenient for certain developers'
workflows, and shouldn't really break anything else.

5 files changed, 25 insertions, 29 deletions

diff --git a/src/backend/Makefile b/src/backend/Makefile
index 5ee3c4193dc..1621530e95e 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -5,7 +5,7 @@
 # Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/backend/Makefile,v 1.133 2009/08/26 22:24:43 petere Exp $
+# $PostgreSQL: pgsql/src/backend/Makefile,v 1.134 2009/08/28 20:26:18 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -118,7 +118,7 @@ postgres.o: $(OBJS)
 # the make files in our subdirectories. Note that it's important we
 # match the dependencies shown in the subdirectory makefiles!
 
-$(srcdir)/parser/gram.h: parser/gram.y
+parser/gram.h: parser/gram.y
 	$(MAKE) -C parser gram.h
 
 utils/fmgroids.h: utils/Gen_fmgrtab.sh $(top_srcdir)/src/include/catalog/pg_proc.h
@@ -131,7 +131,7 @@ utils/probes.h: utils/probes.d
 # we can cut down on the -I options. Also, a symlink is automatically
 # up to date when we update the base file.
 
-$(top_builddir)/src/include/parser/gram.h: $(srcdir)/parser/gram.h
+$(top_builddir)/src/include/parser/gram.h: parser/gram.h
 	prereqdir=`cd $(dir $<) >/dev/null && pwd` && \
 	  cd $(dir $@) && rm -f $(notdir $@) && \
 	  $(LN_S) "$$prereqdir/$(notdir $<)" .
@@ -252,12 +252,12 @@ distclean: clean
 	rm -f port/tas.s port/dynloader.c port/pg_sema.c port/pg_shmem.c
 
 maintainer-clean: distclean
-	rm -f $(srcdir)/bootstrap/bootparse.c \
-	      $(srcdir)/bootstrap/bootscanner.c \
-	      $(srcdir)/parser/gram.c \
-	      $(srcdir)/parser/scan.c \
-	      $(srcdir)/parser/gram.h \
-	      $(srcdir)/utils/misc/guc-file.c
+	rm -f bootstrap/bootparse.c \
+	      bootstrap/bootscanner.c \
+	      parser/gram.c \
+	      parser/scan.c \
+	      parser/gram.h \
+	      utils/misc/guc-file.c
 
 
 ##########################################################################
diff --git a/src/backend/bootstrap/Makefile b/src/backend/bootstrap/Makefile
index 3a68367aaee..53cc71285e5 100644
--- a/src/backend/bootstrap/Makefile
+++ b/src/backend/bootstrap/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for the bootstrap module
 #
-# $PostgreSQL: pgsql/src/backend/bootstrap/Makefile,v 1.37 2008/08/29 13:02:32 petere Exp $
+# $PostgreSQL: pgsql/src/backend/bootstrap/Makefile,v 1.38 2009/08/28 20:26:18 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -18,16 +18,16 @@ include $(top_srcdir)/src/backend/common.mk
 
 
 # bootscanner is compiled as part of bootparse
-bootparse.o: $(srcdir)/bootscanner.c
+bootparse.o: bootscanner.c
 
-$(srcdir)/bootparse.c: bootparse.y
+bootparse.c: bootparse.y
 ifdef BISON
 	$(BISON) $(BISONFLAGS) -o $@ $<
 else
 	@$(missing) bison $< $@
 endif
 
-$(srcdir)/bootscanner.c: bootscanner.l
+bootscanner.c: bootscanner.l
 ifdef FLEX
 	$(FLEX) $(FLEXFLAGS) -o'$@' $<
 else
diff --git a/src/backend/parser/Makefile b/src/backend/parser/Makefile
index 2d0db5e3078..1ef3bb24db1 100644
--- a/src/backend/parser/Makefile
+++ b/src/backend/parser/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for parser
 #
-# $PostgreSQL: pgsql/src/backend/parser/Makefile,v 1.50 2009/08/26 22:15:59 petere Exp $
+# $PostgreSQL: pgsql/src/backend/parser/Makefile,v 1.51 2009/08/28 20:26:19 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -22,7 +22,7 @@ include $(top_srcdir)/src/backend/common.mk
 
 
 # scan is compiled as part of gram
-gram.o: $(srcdir)/scan.c
+gram.o: scan.c
 
 # Latest flex causes warnings in this file.
 ifeq ($(GCC),yes)
@@ -37,9 +37,9 @@ endif
 # important, otherwise make will choose the built-in rule for
 # gram.y=>gram.c.
 
-$(srcdir)/gram.h: $(srcdir)/gram.c ;
+gram.h: gram.c ;
 
-$(srcdir)/gram.c: gram.y
+gram.c: gram.y
 ifdef BISON
 	$(BISON) -d $(BISONFLAGS) -o $@ $<
 else
@@ -47,7 +47,7 @@ else
 endif
 
 
-$(srcdir)/scan.c: scan.l
+scan.c: scan.l
 ifdef FLEX
 	$(FLEX) $(FLEXFLAGS) -o'$@' $<
 else
@@ -56,7 +56,7 @@ endif
 
 
 # Force these dependencies to be known even without dependency info built:
-gram.o keywords.o parser.o: $(srcdir)/gram.h
+gram.o keywords.o parser.o: gram.h
 
 
 # gram.c, gram.h, and scan.c are in the distribution tarball, so they
diff --git a/src/backend/snowball/Makefile b/src/backend/snowball/Makefile
index 1b3d5a5a3f6..698ef4f94f3 100644
--- a/src/backend/snowball/Makefile
+++ b/src/backend/snowball/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/backend/snowball
 #
-# $PostgreSQL: pgsql/src/backend/snowball/Makefile,v 1.7 2009/08/26 22:24:43 petere Exp $
+# $PostgreSQL: pgsql/src/backend/snowball/Makefile,v 1.8 2009/08/28 20:26:19 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -71,11 +71,7 @@ LANGUAGES=  \
 SQLSCRIPT= snowball_create.sql
 DICTDIR=tsearch_data
 
-ifdef VPATH
-override VPATH := $(srcdir)/libstemmer:$(VPATH)
-else
-VPATH = $(srcdir)/libstemmer
-endif
+VPATH += $(srcdir)/libstemmer
 
 NAME := dict_snowball
 rpath =
diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile
index 4b6068bbf96..d94530dca1f 100644
--- a/src/backend/utils/misc/Makefile
+++ b/src/backend/utils/misc/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for utils/misc
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/utils/misc/Makefile,v 1.28 2008/02/19 10:30:09 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/utils/misc/Makefile,v 1.29 2009/08/28 20:26:19 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -12,7 +12,7 @@ subdir = src/backend/utils/misc
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
+override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
 
 OBJS = guc.o help_config.o pg_rusage.o ps_status.o superuser.o tzparser.o
 
@@ -25,9 +25,9 @@ endif
 include $(top_srcdir)/src/backend/common.mk
 
 # guc-file is compiled as part of guc
-guc.o: $(srcdir)/guc-file.c
+guc.o: guc-file.c
 
-$(srcdir)/guc-file.c: guc-file.l
+guc-file.c: guc-file.l
 ifdef FLEX
 	$(FLEX) $(FLEXFLAGS) -o'$@' $<
 else