8000 Put flex'ed and bison'ed files in contrib in the distribution tarball… · postgrespro/postgres_cluster@c8c864c · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit c8c864c

Browse files
peterepetere
committed
Put flex'ed and bison'ed files in contrib in the distribution tarball, as
is done for the analogous files in the main distribution.
1 parent c9a2b6d commit c8c864c

File tree

6 files changed

+42
-20
lines changed

6 files changed

+42
-20
lines changed

‎GNUmakefile.in

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# PostgreSQL top level makefile
33
#
4-
# $PostgreSQL: pgsql/GNUmakefile.in,v 1.42 2005/05/01 06:15:51 neilc Exp $
4+
# $PostgreSQL: pgsql/GNUmakefile.in,v 1.43 2006/04/03 18:47:41 petere Exp $
55
#
66

77
subdir =
@@ -20,11 +20,17 @@ install:
2020
$(MAKE) -C config $@
2121
@echo "PostgreSQL installation complete."
2222

23-
installdirs uninstall distprep:
23+
installdirs uninstall:
2424
$(MAKE) -C doc $@
2525
$(MAKE) -C src $@
2626
$(MAKE) -C config $@
2727

28+
distprep:
29+
$(MAKE) -C doc $@
30+
$(MAKE) -C src $@
31+
$(MAKE) -C config $@
32+
$(MAKE) -C contrib $@
33+
2834
# clean, distclean, etc should apply to contrib too, even though
2935
# it's not built by default
3036
clean:

‎contrib/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/contrib/Makefile,v 1.63 2006/02/25 19:18:58 petere Exp $
1+
# $PostgreSQL: pgsql/contrib/Makefile,v 1.64 2006/04/03 18:47:41 petere Exp $
22

33
subdir = contrib
44
top_builddir = ..
@@ -42,7 +42,7 @@ WANTED_DIRS = \
4242
# xml2 \ (requires libxml installed)
4343

4444

45-
all install installdirs uninstall clean distclean maintainer-clean:
45+
all install installdirs uninstall distprep clean distclean maintainer-clean:
4646
@for dir in $(WANTED_DIRS); do \
4747
$(MAKE) -C $$dir $@ || exit; \
4848
done

‎contrib/cube/.cvsignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
cubeparse.c
2+
cubeparse.h
3+
cubescan.c

‎contrib/cube/Makefile

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/contrib/cube/Makefile,v 1.17 2006/03/07 01:03:12 tgl Exp $
1+
# $PostgreSQL: pgsql/contrib/cube/Makefile,v 1.18 2006/04/03 18:47:41 petere Exp $
22

33
MODULE_big = cube
44
OBJS= cube.o cubeparse.o
@@ -8,7 +8,7 @@ DATA = uninstall_cube.sql
88
DOCS = README.cube
99
REGRESS = cube
1010

11-
EXTRA_CLEAN = cubeparse.c cubeparse.h cubescan.c y.tab.c y.tab.h
11+
EXTRA_CLEAN = y.tab.c y.tab.h
1212

1313
PG_CPPFLAGS = -I.
1414

@@ -26,24 +26,29 @@ endif
2626

2727

2828
# cubescan is compiled as part of cubeparse
29-
cubeparse.o: cubescan.c
29+
cubeparse.o: $(srcdir)/cubescan.c
3030

3131
# See notes in src/backend/parser/Makefile about the following two rules
3232

33-
cubeparse.c: cubeparse.h ;
33+
$(srcdir)/cubeparse.c: $(srcdir)/cubeparse.h ;
34 8000 34

35-
cubeparse.h: cubeparse.y
35+
$(srcdir)/cubeparse.h: cubeparse.y
3636
ifdef YACC
3737
$(YACC) -d $(YFLAGS) $<
38-
mv -f y.tab.c cubeparse.c
39-
mv -f y.tab.h cubeparse.h
38+
mv -f y.tab.c $(srcdir)/cubeparse.c
39+
mv -f y.tab.h $(srcdir)/cubeparse.h
4040
else
4141
@$(missing) bison $< $@
4242
endif
4343

44-
cubescan.c: cubescan.l
44+
$(srcdir)/cubescan.c: cubescan.l
4545
ifdef FLEX
4646
$(FLEX) $(FLEXFLAGS) -o'$@' $<
4747
else
4848
@$(missing) flex $< $@
4949
endif
50+
51+
distprep: $(srcdir)/cubeparse.c $(srcdir)/cubeparse.h $(srcdir)/cubescan.c
52+
53+
maintainer-clean:
54+
rm -f $(srcdir)/cubeparse.c $(srcdir)/cubeparse.h $(srcdir)/cubescan.c

‎contrib/seg/.cvsignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
segparse.c
2+
segparse.h
3+
segscan.c

‎contrib/seg/Makefile

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/contrib/seg/Makefile,v 1.16 2006/03/07 01:03:12 tgl Exp $
1+
# $PostgreSQL: pgsql/contrib/seg/Makefile,v 1.17 2006/04/03 18:47:41 petere Exp $
22

33
MODULE_big = seg
44
OBJS = seg.o segparse.o
@@ -7,7 +7,7 @@ DATA = uninstall_seg.sql
77
DOCS = README.seg
88
REGRESS = seg
99

10-
EXTRA_CLEAN = segparse.c segparse.h segscan.c y.tab.c y.tab.h
10+
EXTRA_CLEAN = y.tab.c y.tab.h
1111

1212
PG_CPPFLAGS = -I.
1313

@@ -23,24 +23,29 @@ endif
2323

2424

2525
# segscan is compiled as part of segparse
26-
segparse.o: segscan.c
26+
segparse.o: $(srcdir)/segscan.c
2727

2828
# See notes in src/backend/parser/Makefile about the following two rules
2929

30-
segparse.c: segparse.h ;
30+
$(srcdir)/segparse.c: $(srcdir)/segparse.h ;
3131

32-
segparse.h: segparse.y
32+
$(srcdir)/segparse.h: segparse.y
3333
ifdef YACC
3434
$(YACC) -d $(YFLAGS) $<
35-
mv -f y.tab.c segparse.c
36-
mv -f y.tab.h segparse.h
35+
mv -f y.tab.c $(srcdir)/segparse.c
36+
mv -f y.tab.h $(srcdir)/segparse.h
3737
else
3838
@$(missing) bison $< $@
3939
endif
4040

41-
segscan.c: segscan.l
41+
$(srcdir)/segscan.c: segscan.l
4242
ifdef FLEX
4343
$(FLEX) $(FLEXFLAGS) -o'$@' $<
4444
else
4545
@$(missing) flex $< $@
4646
endif
47+
48+
distprep: $(srcdir)/segparse.c $(srcdir)/segparse.h $(srcdir)/segscan.c
49+
50+
maintainer-clean:
51+
rm -f $(srcdir)/segparse.c $(srcdir)/segparse.h $(srcdir)/segscan.c

0 commit comments

Comments
 (0)
0