Put flex'ed and bison'ed files in contrib in the distribution tarball, as

is done for the analogous files in the main distribution.

6 files changed, 38 insertions, 16 deletions

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 1090dfcff2..ace56eed8f 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -20,11 +20,17 @@ install:
 	$(MAKE) -C config $@
 	@echo "PostgreSQL installation complete."
 
-installdirs uninstall distprep:
+installdirs uninstall:
 	$(MAKE) -C doc $@
 	$(MAKE) -C src $@
 	$(MAKE) -C config $@
 
+distprep:
+	$(MAKE) -C doc $@
+	$(MAKE) -C src $@
+	$(MAKE) -C config $@
+	$(MAKE) -C contrib $@
+
 # clean, distclean, etc should apply to contrib too, even though
 # it's not built by default
 clean:
diff --git a/contrib/Makefile b/contrib/Makefile
index 47bc558302..2eaf3a7ada 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -42,7 +42,7 @@ WANTED_DIRS = \
 #		xml2		\ (requires libxml installed)
 
 
-all install installdirs uninstall clean distclean maintainer-clean:
+all install installdirs uninstall distprep clean distclean maintainer-clean:
 	@for dir in $(WANTED_DIRS); do \
 		$(MAKE) -C $$dir $@ || exit; \
 	done
diff --git a/contrib/cube/.cvsignore b/contrib/cube/.cvsignore
new file mode 100644
index 0000000000..fe92b5e14f
--- /dev/null
+++ b/contrib/cube/.cvsignore
@@ -0,0 +1,3 @@
+cubeparse.c
+cubeparse.h
+cubescan.c
diff --git a/contrib/cube/Makefile b/contrib/cube/Makefile
index 95912ef226..9bcea49c07 100644
--- a/contrib/cube/Makefile
+++ b/contrib/cube/Makefile
@@ -8,7 +8,7 @@ DATA = uninstall_cube.sql
 DOCS = README.cube
 REGRESS = cube
 
-EXTRA_CLEAN = cubeparse.c cubeparse.h cubescan.c y.tab.c y.tab.h
+EXTRA_CLEAN = y.tab.c y.tab.h
 
 PG_CPPFLAGS = -I.
 
@@ -26,24 +26,29 @@ endif
 
 
 # cubescan is compiled as part of cubeparse
-cubeparse.o: cubescan.c
+cubeparse.o: $(srcdir)/cubescan.c
 
 # See notes in src/backend/parser/Makefile about the following two rules
 
-cubeparse.c: cubeparse.h ;
+$(srcdir)/cubeparse.c: $(srcdir)/cubeparse.h ;
 
-cubeparse.h: cubeparse.y
+$(srcdir)/cubeparse.h: cubeparse.y
 ifdef YACC
 	$(YACC) -d $(YFLAGS) $<
-	mv -f y.tab.c cubeparse.c
-	mv -f y.tab.h cubeparse.h
+	mv -f y.tab.c $(srcdir)/cubeparse.c
+	mv -f y.tab.h $(srcdir)/cubeparse.h
 else
 	@$(missing) bison $< $@
 endif
 
-cubescan.c: cubescan.l
+$(srcdir)/cubescan.c: cubescan.l
 ifdef FLEX
 	$(FLEX) $(FLEXFLAGS) -o'$@' $<
 else
 	@$(missing) flex $< $@
 endif
+
+distprep: $(srcdir)/cubeparse.c $(srcdir)/cubeparse.h $(srcdir)/cubescan.c
+
+maintainer-clean:
+	rm -f $(srcdir)/cubeparse.c $(srcdir)/cubeparse.h $(srcdir)/cubescan.c
diff --git a/contrib/seg/.cvsignore b/contrib/seg/.cvsignore
new file mode 100644
index 0000000000..e69a249aec
--- /dev/null
+++ b/contrib/seg/.cvsignore
@@ -0,0 +1,3 @@
+segparse.c
+segparse.h
+segscan.c
diff --git a/contrib/seg/Makefile b/contrib/seg/Makefile
index 968ecc13c4..77589251bd 100644
--- a/contrib/seg/Makefile
+++ b/contrib/seg/Makefile
@@ -7,7 +7,7 @@ DATA = uninstall_seg.sql
 DOCS = README.seg
 REGRESS = seg
 
-EXTRA_CLEAN = segparse.c segparse.h segscan.c y.tab.c y.tab.h
+EXTRA_CLEAN = y.tab.c y.tab.h
 
 PG_CPPFLAGS = -I.
 
@@ -23,24 +23,29 @@ endif
 
 
 # segscan is compiled as part of segparse
-segparse.o: segscan.c
+segparse.o: $(srcdir)/segscan.c
 
 # See notes in src/backend/parser/Makefile about the following two rules
 
-segparse.c: segparse.h ;
+$(srcdir)/segparse.c: $(srcdir)/segparse.h ;
 
-segparse.h: segparse.y
+$(srcdir)/segparse.h: segparse.y
 ifdef YACC
 	$(YACC) -d $(YFLAGS) $<
-	mv -f y.tab.c segparse.c
-	mv -f y.tab.h segparse.h
+	mv -f y.tab.c $(srcdir)/segparse.c
+	mv -f y.tab.h $(srcdir)/segparse.h
 else
 	@$(missing) bison $< $@
 endif
 
-segscan.c: segscan.l
+$(srcdir)/segscan.c: segscan.l
 ifdef FLEX
 	$(FLEX) $(FLEXFLAGS) -o'$@' $<
 else
 	@$(missing) flex $< $@
 endif
+
+distprep: $(srcdir)/segparse.c $(srcdir)/segparse.h $(srcdir)/segscan.c
+
+maintainer-clean:
+	rm -f $(srcdir)/segparse.c $(srcdir)/segparse.h $(srcdir)/segscan.c