diff options
| -rw-r--r-- | GNUmakefile.in | 10 | ||||
| -rw-r--r-- | contrib/Makefile | 4 | ||||
| -rw-r--r-- | contrib/cube/.cvsignore | 3 | ||||
| -rw-r--r-- | contrib/cube/Makefile | 21 | ||||
| -rw-r--r-- | contrib/seg/.cvsignore | 3 | ||||
| -rw-r--r-- | contrib/seg/Makefile | 21 |
6 files changed, 42 insertions, 20 deletions
diff --git a/GNUmakefile.in b/GNUmakefile.in index 62bbf57ba2..9065bc9864 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,7 +1,7 @@ # # PostgreSQL top level makefile # -# $PostgreSQL: pgsql/GNUmakefile.in,v 1.42 2005/05/01 06:15:51 neilc Exp $ +# $PostgreSQL: pgsql/GNUmakefile.in,v 1.43 2006/04/03 18:47:41 petere Exp $ # subdir = @@ -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 322cdeff78..c00568e32e 100644 --- a/contrib/Makefile +++ b/contrib/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/Makefile,v 1.63 2006/02/25 19:18:58 petere Exp $ +# $PostgreSQL: pgsql/contrib/Makefile,v 1.64 2006/04/03 18:47:41 petere Exp $ subdir = contrib top_builddir = .. @@ -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 0b43cfa240..9438dbb933 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 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 7c1c631a00..a0ccb97ec5 100644 --- a/contrib/seg/Makefile +++ b/contrib/seg/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/seg/Makefile,v 1.16 2006/03/07 01:03:12 tgl Exp $ +# $PostgreSQL: pgsql/contrib/seg/Makefile,v 1.17 2006/04/03 18:47:41 petere Exp $ MODULE_big = seg OBJS = seg.o segparse.o @@ -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 |