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

is done for the analogous files in the main distribution.

2 files changed, 16 insertions, 8 deletions

diff --git a/contrib/cube/.cvsignore b/contrib/cube/.cvsignore
new file mode 100644
index 00000000000..fe92b5e14fd
--- /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 0b43cfa2400..9438dbb9336 100644
--- a/contrib/cube/Makefile
+++ b/contrib/cube/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/cube/Makefile,v 1.17 2006/03/07 01:03:12 tgl Exp $
+# $PostgreSQL: pgsql/contrib/cube/Makefile,v 1.18 2006/04/03 18:47:41 petere Exp $
 
 MODULE_big = cube
 OBJS= cube.o cubeparse.o
@@ -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