4 files changed, 12 insertions, 26 deletions
diff --git a/contrib/cube/.cvsignore b/contrib/cube/.cvsignore
index fe92b5e14fd..19ecc85b586 100644
--- a/contrib/cube/.cvsignore
+++ b/contrib/cube/.cvsignore
@@ -1,3 +1,2 @@
 cubeparse.c
-cubeparse.h
 cubescan.c
diff --git a/contrib/cube/Makefile b/contrib/cube/Makefile
index a1610fe91aa..7f91b14c64d 100644
--- a/contrib/cube/Makefile
+++ b/contrib/cube/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/cube/Makefile,v 1.21 2007/11/10 23:59:50 momjian Exp $
+# $PostgreSQL: pgsql/contrib/cube/Makefile,v 1.22 2008/08/29 13:02:32 petere Exp $
 
 MODULE_big = cube
 OBJS= cube.o cubeparse.o
@@ -26,15 +26,9 @@ endif
 # cubescan is compiled as part of cubeparse
 cubeparse.o: $(srcdir)/cubescan.c
 
-# See notes in src/backend/parser/Makefile about the following two rules
-
-$(srcdir)/cubeparse.c: $(srcdir)/cubeparse.h ;
-
-$(srcdir)/cubeparse.h: cubeparse.y
-ifdef YACC
-	$(YACC) -d $(YFLAGS) $<
-	mv -f y.tab.c $(srcdir)/cubeparse.c
-	mv -f y.tab.h $(srcdir)/cubeparse.h
+$(srcdir)/cubeparse.c: cubeparse.y
+ifdef BISON
+	$(BISON) $(BISONFLAGS) -o $@ $<
 else
 	@$(missing) bison $< $@
 endif
@@ -46,7 +40,7 @@ else
 	@$(missing) flex $< $@
 endif
 
-distprep: $(srcdir)/cubeparse.c $(srcdir)/cubeparse.h $(srcdir)/cubescan.c
+distprep: $(srcdir)/cubeparse.c $(srcdir)/cubescan.c
 
 maintainer-clean:
-	rm -f $(srcdir)/cubeparse.c $(srcdir)/cubeparse.h $(srcdir)/cubescan.c
+	rm -f $(srcdir)/cubeparse.c $(srcdir)/cubescan.c
diff --git a/contrib/seg/.cvsignore b/contrib/seg/.cvsignore
index e69a249aecb..aa740d3474e 100644
--- a/contrib/seg/.cvsignore
+++ b/contrib/seg/.cvsignore
@@ -1,3 +1,2 @@
 segparse.c
-segparse.h
 segscan.c
diff --git a/contrib/seg/Makefile b/contrib/seg/Makefile
index 25c55932417..31012da3441 100644
--- a/contrib/seg/Makefile
+++ b/contrib/seg/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/seg/Makefile,v 1.20 2007/11/10 23:59:51 momjian Exp $
+# $PostgreSQL: pgsql/contrib/seg/Makefile,v 1.21 2008/08/29 13:02:32 petere Exp $
 
 MODULE_big = seg
 OBJS = seg.o segparse.o
@@ -23,15 +23,9 @@ endif
 # segscan is compiled as part of segparse
 segparse.o: $(srcdir)/segscan.c
 
-# See notes in src/backend/parser/Makefile about the following two rules
-
-$(srcdir)/segparse.c: $(srcdir)/segparse.h ;
-
-$(srcdir)/segparse.h: segparse.y
-ifdef YACC
-	$(YACC) -d $(YFLAGS) $<
-	mv -f y.tab.c $(srcdir)/segparse.c
-	mv -f y.tab.h $(srcdir)/segparse.h
+$(srcdir)/segparse.c: segparse.y
+ifdef BISON
+	$(BISON) $(BISONFLAGS) -o $@ $<
 else
 	@$(missing) bison $< $@
 endif
@@ -43,7 +37,7 @@ else
 	@$(missing) flex $< $@
 endif
 
-distprep: $(srcdir)/segparse.c $(srcdir)/segparse.h $(srcdir)/segscan.c
+distprep: $(srcdir)/segparse.c $(srcdir)/segscan.c
 
 maintainer-clean:
-	rm -f $(srcdir)/segparse.c $(srcdir)/segparse.h $(srcdir)/segscan.c
+	rm -f $(srcdir)/segparse.c $(srcdir)/segscan.c