mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
is done for the analogous files in the main distribution.
This commit is contained in:
Peter Eisentraut 2006-04-03 18:47:41 +00:00
parent c9a2b6d4ca
commit c8c864c261
6 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
GNUmakefile.in
View File

@ -1,7 +1,7 @@
# #
# PostgreSQL top level makefile # 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 = subdir =
@ -20,11 +20,17 @@ install:
$(MAKE) -C config $@ $(MAKE) -C config $@
@echo "PostgreSQL installation complete." @echo "PostgreSQL installation complete."
installdirs uninstall distprep: installdirs uninstall:
$(MAKE) -C doc $@ $(MAKE) -C doc $@
$(MAKE) -C src $@ $(MAKE) -C src $@
$(MAKE) -C config $@ $(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 # clean, distclean, etc should apply to contrib too, even though
# it's not built by default # it's not built by default
clean: clean:

4
contrib/Makefile
View File

@ -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 subdir = contrib
top_builddir = .. top_builddir = ..
@ -42,7 +42,7 @@ WANTED_DIRS = \
# xml2 \ (requires libxml installed) # 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 \ @for dir in $(WANTED_DIRS); do \
$(MAKE) -C $$dir $@ || exit; \ $(MAKE) -C $$dir $@ || exit; \
done done

3
contrib/cube/.cvsignore Normal file
View File

@ -0,0 +1,3 @@
cubeparse.c
cubeparse.h
cubescan.c

21
contrib/cube/Makefile
View File

@ -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 MODULE_big = cube
OBJS= cube.o cubeparse.o OBJS= cube.o cubeparse.o
@ -8,7 +8,7 @@ DATA = uninstall_cube.sql
DOCS = README.cube DOCS = README.cube
REGRESS = 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. PG_CPPFLAGS = -I.
@ -26,24 +26,29 @@ endif
# cubescan is compiled as part of cubeparse # 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 # 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 ifdef YACC
$(YACC) -d $(YFLAGS) $< $(YACC) -d $(YFLAGS) $<
mv -f y.tab.c cubeparse.c mv -f y.tab.c $(srcdir)/cubeparse.c
mv -f y.tab.h cubeparse.h mv -f y.tab.h $(srcdir)/cubeparse.h
else else
@$(missing) bison $< $@ @$(missing) bison $< $@
endif endif
cubescan.c: cubescan.l $(srcdir)/cubescan.c: cubescan.l
ifdef FLEX ifdef FLEX
$(FLEX) $(FLEXFLAGS) -o'$@' $< $(FLEX) $(FLEXFLAGS) -o'$@' $<
else else
@$(missing) flex $< $@ @$(missing) flex $< $@
endif endif
distprep: $(srcdir)/cubeparse.c $(srcdir)/cubeparse.h $(srcdir)/cubescan.c
maintainer-clean:
rm -f $(srcdir)/cubeparse.c $(srcdir)/cubeparse.h $(srcdir)/cubescan.c

3
contrib/seg/.cvsignore Normal file
View File

@ -0,0 +1,3 @@
segparse.c
segparse.h
segscan.c

21
contrib/seg/Makefile
View File

@ -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 MODULE_big = seg
OBJS = seg.o segparse.o OBJS = seg.o segparse.o
@ -7,7 +7,7 @@ DATA = uninstall_seg.sql
DOCS = README.seg DOCS = README.seg
REGRESS = 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. PG_CPPFLAGS = -I.
@ -23,24 +23,29 @@ endif
# segscan is compiled as part of segparse # 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 # 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 ifdef YACC
$(YACC) -d $(YFLAGS) $< $(YACC) -d $(YFLAGS) $<
mv -f y.tab.c segparse.c mv -f y.tab.c $(srcdir)/segparse.c
mv -f y.tab.h segparse.h mv -f y.tab.h $(srcdir)/segparse.h
else else
@$(missing) bison $< $@ @$(missing) bison $< $@
endif endif
segscan.c: segscan.l $(srcdir)/segscan.c: segscan.l
ifdef FLEX ifdef FLEX
$(FLEX) $(FLEXFLAGS) -o'$@' $< $(FLEX) $(FLEXFLAGS) -o'$@' $<
else else
@$(missing) flex $< $@ @$(missing) flex $< $@
endif endif
distprep: $(srcdir)/segparse.c $(srcdir)/segparse.h $(srcdir)/segscan.c
maintainer-clean:
rm -f $(srcdir)/segparse.c $(srcdir)/segparse.h $(srcdir)/segscan.c