Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf0b4ae6

Browse files
committed
Backend makefile cleanup. make maintainer-clean is now completely
functional.Handle include file installation in src/include/Makefilegenbki.sh improvements: Don't substitute anything by config.status,instead pass in AWK and CPP through environment. Change callingconvention to support named output files, so we get to see errormessages on stderr.Rename bootstrap template files and install them into PREFIX/share.Update initdb to that effect and other readability improvementsin initdb.
1 parentb027ad9 commitf0b4ae6

File tree

13 files changed

+851
-1086
lines changed

13 files changed

+851
-1086
lines changed

‎configure

Lines changed: 384 additions & 494 deletions
Large diffs are not rendered by default.

‎configure.in

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ if test ! -f "src/template/$TEMPLATE"; then
133133
echo ""
134134
echo "Available Templates (select one using --with-template):"
135135
echo ""
136-
ls template
136+
lssrc/template
137137
echo ""
138138
exit
139139
fi
@@ -680,9 +680,6 @@ AC_PROG_LN_S
680680
AC_PROG_RANLIB
681681
AC_PATH_PROG(find, find)
682682
AC_PATH_PROG(tar, tar)
683-
AC_PATH_PROG(split, split)
684-
AC_PATH_PROG(etags, etags)
685-
AC_PATH_PROG(xargs, xargs)
686683
AC_PATH_PROGS(GZCAT, gzcat zcat, gzcat)
687684
AC_CHECK_PROGS(PERL, perl,)
688685
AC_PROG_YACC
@@ -1203,6 +1200,5 @@ AC_OUTPUT(
12031200
src/GNUmakefile
12041201
src/Makefile.global
12051202
src/backend/port/Makefile
1206-
src/backend/catalog/genbki.sh
12071203
src/test/regress/GNUmakefile
12081204
)

‎src/GNUmakefile.in

Lines changed: 20 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,41 @@
11
#-------------------------------------------------------------------------
22
#
3-
# Makefile.inc--
4-
# Build and install postgres.
3+
# Makefile for src
54
#
65
# Copyright (c) 1994, Regents of the University of California
76
#
8-
#
9-
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.56 2000/07/02 15:20:41 petere Exp $
7+
# $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.57 2000/07/06 21:33:12 petere Exp $
118
#
129
#-------------------------------------------------------------------------
1310

14-
SRCDIR= .
11+
subdir = src
12+
top_builddir = ..
1513
include Makefile.global
1614

17-
FIND = @find@
18-
19-
# assuming gnu tar and split here
20-
TAR = @tar@
21-
SPLIT = @split@
22-
23-
ETAGS = @etags@
24-
XARGS = @xargs@
2515

26-
all:
27-
$(MAKE) -C backend all
28-
$(MAKE) -C interfaces all
29-
$(MAKE) -C bin all
30-
$(MAKE) -C pl all
31-
32-
install: installdirs
33-
$(MAKE) -C backend install
34-
$(MAKE) -C interfaces install
35-
$(MAKE) -C bin install
36-
$(MAKE) -C pl install
37-
38-
installdirs:
39-
../config/mkinstalldirs $(BINDIR) $(LIBDIR) $(INCLUDEDIR)
16+
all install installdirs uninstall dep depend:
17+
$(MAKE) -C backend $@
18+
$(MAKE) -C include $@
19+
$(MAKE) -C interfaces $@
20+
$(MAKE) -C bin $@
21+
$(MAKE) -C pl $@
4022

4123
clean:
42-
$(MAKE) -C utils clean
43-
$(MAKE) -C backend clean
44-
$(MAKE) -C interfaces clean
45-
$(MAKE) -C bin clean
46-
$(MAKE) -C pl clean
24+
$(MAKE) -C backend $@
25+
$(MAKE) -C include $@
26+
$(MAKE) -C interfaces $@
27+
$(MAKE) -C bin $@
28+
$(MAKE) -C pl $@
29+
$(MAKE) -C utils $@
4730
$(MAKE) -C test clean
48-
$(MAKE) -C ../contrib/spi clean
4931

50-
# Not all subdirectories have a make distclean target yet
5132
distclean maintainer-clean:
52-
-$(MAKE) -C utils clean
53-
-$(MAKE) -C backend clean
54-
rm -f backend/port/Makefile backend/catalog/genbki.sh \
55-
backend/port/tas.s backend/port/dynloader.c
33+
-$(MAKE) -C utils $@
34+
-$(MAKE) -C backend $@
35+
-$(MAKE) -C include $@
5636
-$(MAKE) -C interfaces $@
5737
-$(MAKE) -C bin $@
5838
-$(MAKE) -C pl $@
5939
-$(MAKE) -C test clean
6040
rm -f test/regress/GNUmakefile
61-
-$(MAKE) -C ../contrib/spi clean
62-
rm -f Makefile.port \
63-
include/config.h include/dynloader.h \
64-
include/os.h include/version.h \
65-
Makefile.global \
66-
GNUmakefile
67-
68-
.DEFAULT:
69-
$(MAKE) -C utils $@
70-
$(MAKE) -C backend $@
71-
$(MAKE) -C interfaces $@
72-
$(MAKE) -C bin $@
73-
$(MAKE) -C pl $@
74-
75-
TAGS:
76-
rm -f TAGS; \
77-
for i in backend interfaces/libpq bin; do \
78-
$(FIND) $$i -name '*.[chyl]' -print | $(XARGS) $(ETAGS) -a ; \
79-
done
80-
81-
# target to generate a backup tar file and split files that can be
82-
# saved to 1.44M floppy
83-
BACKUP:
84-
rm -f BACKUP.filelist BACKUP.tgz; \
85-
$(FIND) . -not -path '*obj/*' -not -path '*data/*' -type f -print > BACKUP.filelist; \
86-
$(TAR) --files-from BACKUP.filelist -c -z -v -f BACKUP.tgz
87-
$(SPLIT) --bytes=1400k BACKUP.tgz pgBACKUP.
88-
89-
.PHONY: TAGS
90-
.PHONY: BACKUP
41+
rm -f Makefile.port Makefile.global GNUmakefile

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp