Skip to content

Commit 3216309

Browse files
peterepetere
committed
Add distprep target to take some of the job of the release_prep script.
The latter updated accordingly. Also add `dist' and `distcheck' targets to play with, but caveat packager. Updated backend/bootstrap and backend/parser makefile to make them marginally builddir aware and fix the usual set of things. Add rule to automatically remake config.h dependent on config.h.in and config.status. (Adopted from Autoconf manual and about every other package.) On a good day we should now have a complete and accurate set of dependencies throughout everything.
1 parent 79e6648 commit 3216309

File tree

18 files changed

+205
-164
lines changed

18 files changed

+205
-164
lines changed

‎GNUmakefile.in

Lines changed: 72 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# PostgreSQL top level makefile
33
#
4-
# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.8 2000/07/17 22:31:56 petere Exp $
4+
# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.9 2000/07/19 16:29:41 petere Exp $
55
#
66

77
subdir =
@@ -18,7 +18,7 @@ install:
1818
$(MAKE) -C src install
1919
@cat $(srcdir)/register.txt
2020

21-
installdirs uninstall clean:
21+
installdirs uninstall clean distprep:
2222
$(MAKE) -C doc $@
2323
$(MAKE) -C src $@
2424

@@ -51,3 +51,73 @@ endif
5151
# aclocal.m4' or `make configure'.
5252
$(top_srcdir)/aclocal.m4: $(wildcard $(top_srcdir)/config/*.m4)
5353
cat $^ > $@
54+
55+
56+
##########################################################################
57+
58+
distdir := postgresql-$(VERSION)
59+
dummy := =install=
60+
garbage := =* "#"* ."#"* *~* *.orig *.rej core postgresql-*
61+
62+
63+
dist: $(distdir).tar.gz
64+
ifeq ($(split-dist), yes)
65+
dist: $(distdir).base.tar.gz $(distdir).docs.tar.gz $(distdir).support.tar.gz $(distdir).test.tar.gz
66+
endif
67+
dist:
68+
-rm -rf $(distdir)
69+
70+
$(distdir).tar: distdir
71+
$(TAR) chf $@ $(distdir)
72+
73+
$(distdir).base.tar: distdir
74+
$(TAR) -c $(addprefix --exclude $(distdir)/, doc src/test src/interfaces src/bin) \
75+
-f $@ $(distdir)
76+
77+
$(distdir).docs.tar: distdir
78+
$(TAR) cf $@ $(distdir)/doc
79+
80+
$(distdir).support.tar: distdir
81+
$(TAR) cf $@ $(distdir)/src/interfaces $(distdir)/src/bin
82+
83+
$(distdir).test.tar: distdir
84+
$(TAR) cf $@ $(distdir)/src/test
85+
86+
%.gz: %
87+
gzip -f --best $<
88+
@text="$@ is ready for distribution." ; \
89+
frame=`echo "$$text" | sed -e 's/./=/g'` ; \
90+
echo "$$frame" ; echo "$$text" ; echo "$$frame"
91+
92+
distdir: distprep
93+
-rm -rf $(distdir)* $(install)
94+
for x in `cd $(top_srcdir) && find . -name CVS -prune -o -print`; do \
95+
file=`expr $$x : '\./\(.*\)'`; \
96+
if test -d "$(top_srcdir)/$$file" ; then \
97+
mkdir "$(distdir)/$$file" && chmod 777 "$(distdir)/$$file"; \
98+
else \
99+
ln "$(top_srcdir)/$$file" "$(distdir)/$$file"; \
100+
fi || exit; \
101+
done
102+
$(MAKE) -C $(distdir) distclean
103+
104+
distcheck: dist
105+
-rm -rf $(dummy)
106+
mkdir $(dummy)
107+
gunzip -c $(distdir).tar.gz | $(TAR) xf -
108+
install_prefix=`cd $(dummy) && pwd`; \
109+
cd $(distdir) \
110+
&& ./configure --prefix="$$install_prefix"
111+
$(MAKE) -C $(distdir) -q distprep
112+
$(MAKE) -C $(distdir)
113+
$(MAKE) -C $(distdir) install
114+
$(MAKE) -C $(distdir) uninstall
115+
@echo "checking whether \`$(MAKE) uninstall' works"
116+
test `find $(dummy) -not -type d | wc -l` -eq 0
117+
$(MAKE) -C $(distdir) dist
118+
# Room for improvement: Check here whether this distribution tarball
119+
# is sufficiently similar to the original one.
120+
-rm -rf $(distdir) $(dummy)
121+
@echo "Distribution integrity checks out."
122+
123+
.PHONY: dist distdir distcheck

‎configure

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7850,11 +7850,12 @@ done
78507850
ac_given_srcdir=$srcdir
78517851
ac_given_INSTALL="$INSTALL"
78527852
7853-
trap 'rm -fr `echo "GNUmakefile
7854-
src/GNUmakefile
7855-
src/Makefile.global
7856-
src/backend/port/Makefile
7857-
src/test/regress/GNUmakefile
7853+
trap 'rm -fr `echo "
7854+
GNUmakefile
7855+
src/GNUmakefile
7856+
src/Makefile.global
7857+
src/backend/port/Makefile
7858+
src/test/regress/GNUmakefile
78587859
src/include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
78597860
EOF
78607861
cat >> $CONFIG_STATUS <<EOF
@@ -8011,10 +8012,10 @@ EOF
80118012
cat >> $CONFIG_STATUS <<EOF
80128013
80138014
CONFIG_FILES=\${CONFIG_FILES-"GNUmakefile
8014-
src/GNUmakefile
8015-
src/Makefile.global
8016-
src/backend/port/Makefile
8017-
src/test/regress/GNUmakefile
8015+
src/GNUmakefile
8016+
src/Makefile.global
8017+
src/backend/port/Makefile
8018+
src/test/regress/GNUmakefile
80188019
"}
80198020
EOF
80208021
cat >> $CONFIG_STATUS <<\EOF
@@ -8231,6 +8232,7 @@ cat >> $CONFIG_STATUS <<EOF
82318232
82328233
EOF
82338234
cat >> $CONFIG_STATUS <<\EOF
8235+
echo timestamp > src/include/stamp-h
82348236
82358237
exit 0
82368238
EOF

‎configure.in

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1277,9 +1277,12 @@ fi
12771277
dnl Finally ready to produce output files ...
12781278

12791279
AC_OUTPUT(
1280-
GNUmakefile
1281-
src/GNUmakefile
1282-
src/Makefile.global
1283-
src/backend/port/Makefile
1284-
src/test/regress/GNUmakefile
1280+
[
1281+
GNUmakefile
1282+
src/GNUmakefile
1283+
src/Makefile.global
1284+
src/backend/port/Makefile
1285+
src/test/regress/GNUmakefile
1286+
],
1287+
[echo timestamp > src/include/stamp-h]
12851288
)

‎src/GNUmakefile.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.57 2000/07/06 21:33:12 petere Exp $
7+
# $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.58 2000/07/19 16:29:42 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,7 +13,7 @@ top_builddir = ..
1313
include Makefile.global
1414

1515

16-
all install installdirs uninstall dep depend:
16+
all install installdirs uninstall dep depend distprep:
1717
$(MAKE) -C backend $@
1818
$(MAKE) -C include $@
1919
$(MAKE) -C interfaces $@

‎src/Makefile.global.in

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.88 2000/07/17 22:31:59 petere Exp $
10+
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.89 2000/07/19 16:29:42 petere Exp $
1111
#
1212
# NOTES
1313
# Essentially all Postgres make files include this file and use the
@@ -281,15 +281,34 @@ STRERROR2 = @STRERROR2@
281281
SNPRINTF = @SNPRINTF@
282282
STRDUP = @STRDUP@
283283

284-
.PHONY: all install installdirs uninstall dep depend clean distclean maintainer-clean
284+
.PHONY: all install installdirs uninstall dep depend clean distclean maintainer-clean distprep
285285
.SILENT: installdirs
286286

287287
# make `all' the default target
288288
all:
289289

290+
291+
# Remake Makefile.global from Makefile.global.in if the latter
292+
# changed. In order to trigger this rule, the including file must
293+
# write `include $(top_builddir)/src/Makefile.global', not some
294+
# shortcut thereof.
290295
$(top_builddir)/src/Makefile.global: $(top_srcdir)/src/Makefile.global.in $(top_builddir)/config.status
291296
cd $(top_builddir) && CONFIG_FILES=src/Makefile.global CONFIG_HEADERS= ./config.status
292297

298+
# Remake config.h from config.h.in if the latter changed.
299+
# config.status will not change the timestamp on config.h if it
300+
# doesn't change, so as to avoid recompiling the entire tree
301+
# unnecessarily. Therefore config.status will update a timestamp file
302+
# everytime it runs so that we don't trigger this rule everytime.
303+
#
304+
# Of course you need to turn on dependency tracking to get any
305+
# dependencies on config.h
306+
$(top_builddir)/src/include/config.h: $(top_builddir)/src/include/stamp-h
307+
$(top_builddir)/src/include/stamp-h: $(top_srcdir)/src/include/config.h.in $(top_builddir)/config.status
308+
cd $(top_builddir) && CONFIG_FILES= CONFIG_HEADERS=src/include/config.h ./config.status
309+
310+
# When configure changes, rerun configure with the same options as
311+
# last time. To change configure, you need to run autoconf manually.
293312
$(top_builddir)/config.status: $(top_srcdir)/configure
294313
cd $(top_builddir) && ./config.status --recheck
295314

‎src/backend/Makefile

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.62 2000/07/16 14:50:44 petere Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.63 2000/07/19 16:29:44 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -106,6 +106,14 @@ $(top_builddir)/src/include/utils/fmgroids.h: utils/fmgroids.h
106106
$(LN_S) ../../../$(subdir)/utils/fmgroids.h .
107107

108108

109+
##########################################################################
110+
111+
distprep:
112+
$(MAKE) -C parser gram.c parse.h scan.c
113+
$(MAKE) -C bootstrap bootparse.c bootstrap_tokens.h bootscanner.c
114+
$(MAKE) -C utils/misc guc-file.c
115+
116+
109117
##########################################################################
110118

111119
install: all installdirs install-bin
@@ -122,15 +130,15 @@ endif
122130
installdirs:
123131
$(mkinstalldirs) $(bindir) $(libdir) $(datadir)
124132

125-
install-bin:
133+
install-bin: postgres $(POSTGRES_IMP) installdirs
126134
$(INSTALL_PROGRAM) postgres$(X) $(bindir)/postgres$(X)
127135
@rm -f $(bindir)/postmaster
128136
ln -s postgres$(X) $(bindir)/postmaster
129137
ifeq ($(MAKE_EXPORTS), true)
130138
$(INSTALL_DATA) $(POSTGRES_IMP) $(libdir)/$(POSTGRES_IMP)
131139
endif
132140

133-
.PHONY: install installdirs install-bin
141+
.PHONY: install-bin
134142

135143
##########################################################################
136144

‎src/backend/bootstrap/Makefile

Lines changed: 29 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,62 @@
11
#-------------------------------------------------------------------------
22
#
3-
# Makefile--
4-
# Makefile for the bootstrap module
3+
# Makefile for the bootstrap module
54
#
6-
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.23 2000/06/07 16:26:37 petere Exp $
8-
#
9-
#
10-
# We must build bootparse.c and bootscanner.c with yacc and lex and sed,
11-
# but bootstrap.c is part of the distribution.
12-
#
13-
# Another kinda weird Makefile cause we need two
14-
# scanner/parsers in the backend and most yaccs and lexs
15-
# don't have the prefix option.
16-
#
17-
# sed files are HACK CITY! - redo...
5+
# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.24 2000/07/19 16:29:47 petere Exp $
186
#
197
#-------------------------------------------------------------------------
208

21-
SRCDIR= ../..
22-
include $(SRCDIR)/Makefile.global
9+
subdir = src/backend/bootstrap
10+
top_builddir = ../../..
11+
include $(top_builddir)/src/Makefile.global
2312

24-
ifeq ($(CC), gcc)
13+
ifeq ($(GCC), yes)
2514
CFLAGS+= -Wno-error
2615
endif
2716

28-
BOOTYACCS= bootstrap_tokens.h bootparse.c
29-
17+
# qnx4's wlink currently crashes with bootstrap.o
3018
ifneq ($(PORTNAME), qnx4)
3119
OBJS= bootparse.o bootscanner.o bootstrap.o
3220
else
33-
# qnx4's wlink currently crashes with bootstrap.o
3421
OBJS= bootparse.o bootscanner.o
3522
endif
3623

24+
3725
# make sure bootstrap.o is built even on qnx4
3826
all: SUBSYS.o bootstrap.o
3927

4028
SUBSYS.o: $(OBJS)
41-
$(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
29+
$(LD) $(LDREL) $(LDOUT) $@ $^
30+
4231

43-
# bootstrap.o's dependency on bootstrap_tokens.h is computed by the
44-
# make depend, but we state it here explicitly anyway because
45-
# bootstrap_tokens.h doesn't even exist at first and if user fails to
46-
# do make depend, we still want the build to succeed.
32+
bootstrap.o bootscanner.c: $(srcdir)/bootstrap_tokens.h
4733

48-
bootstrap.o: bootstrap_tokens.h
4934

50-
bootstrap_tokens.h bootparse.c: bootparse.y
35+
# `sed' rules to remove conflicts between bootstrap scanner and parser
36+
# and the SQL scanner and parser. For correctness' sake the rules that
37+
# use this must depend on this Makefile.
38+
define sed-magic
39+
sed -e 's/^yy/Int_yy/g' \
40+
-e 's/\([^a-zA-Z0-9_]\)yy/\1Int_yy/g'
41+
endef
42+
43+
44+
$(srcdir)/bootparse.c $(srcdir)/bootstrap_tokens.h: bootparse.y Makefile
5145
$(YACC) -d $(YFLAGS) $<
52-
grep -v "^#" boot.sed > sedfile
53-
sed -f sedfile < y.tab.c > bootparse.c
54-
mv y.tab.h bootstrap_tokens.h
55-
rm -f y.tab.c sedfile
46+
$(sed-magic) < y.tab.c > $(srcdir)/bootparse.c
47+
$(sed-magic) < y.tab.h > $(srcdir)/bootstrap_tokens.h
48+
rm -f y.tab.c y.tab.h
5649

57-
bootscanner.c: bootscanner.l
50+
$(srcdir)/bootscanner.c: bootscanner.l Makefile
5851
$(LEX) $(LFLAGS) $<
59-
grep -v "^#" boot.sed > sedfile
60-
sed -f sedfile < lex.yy.c > bootscanner.c
61-
rm -f lex.yy.c sedfile
52+
$(sed-magic) < lex.yy.c > $@
53+
rm -f lex.yy.c
6254

6355
clean:
6456
rm -f SUBSYS.o $(OBJS) bootstrap.o
6557
# And the garbage that might have been left behind by partial build:
66-
rm -f y.tab.h y.tab.c y.output lex.yy.c
58+
@rm -f y.tab.h y.tab.c y.output lex.yy.c
59+
6760

6861
# This is unusual: We actually have to build some of the parts before
6962
# we know what the header file dependencies are.

0 commit comments

Comments
 (0)