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

Commitca5db6c

Browse files
committed
I have attached a minor update for the Postgres make files. This update
does 2 things:1) Make it hard to not notice the make failed. (As you recall, someone on the mailing list had this problem. I've had it to some extent myself). The 1.02 make files continue with the next subdirectory when a make in a subdirectory fails. The patch makes the make stop in the conventional way when a submake fails. It also adds a reassuring message when the make succeeds and adds a note to the INSTALL file to expect it.2) Include loader flags on all invocations of the linker. The 1.02 make files omit the $(LDFLAGS) on some of the linker invocations. On my system, I need one of those flags just to make it invoke the proper version of the compiler/linker, so LDFLAGS has to be everywhere.Submitted by: Bryan Henderson <bryanh@giraffe.netgate.net>
1 parenta721c91 commitca5db6c

File tree

4 files changed

+27
-23
lines changed

4 files changed

+27
-23
lines changed

‎src/Makefile‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Makefile,v 1.3 1996/08/01 19:46:46 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/Makefile,v 1.4 1996/08/13 07:47:43 scrappy Exp $
1111
#
1212
# NOTES
1313
#objdir- location of the objects and generated files (eg. obj)
@@ -17,14 +17,6 @@
1717
MKDIR=./mk
1818
-include$(MKDIR)/../Makefile.global
1919

20-
SUBDIR= backend libpq
21-
22-
ifeq ($(USE_TCL), true)
23-
SUBDIR += libpgtcl
24-
endif
25-
26-
SUBDIR+= bin ../doc
27-
2820
FIND = find
2921
# assuming gnu tar and split here
3022
TAR = tar
@@ -33,7 +25,15 @@ SPLIT = split
3325
ETAGS = etags
3426
XARGS = xargs
3527

36-
include mk/postgres.subdir.mk
28+
.DEFAULTall:
29+
$(MAKE) -C backend$@
30+
$(MAKE) -C libpq$@
31+
ifeq ($(USE_TCL), true)
32+
$(MAKE) -C libpgtcl $@
33+
endif
34+
$(MAKE) -C bin $@
35+
$(MAKE) -C ../doc $@
36+
@echo All of Postgres95 is successfully made. Ready to install.
3737

3838
TAGS:
3939
rm -f TAGS;\

‎src/bin/Makefile‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,33 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.3 1996/07/25 06:54:26 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.4 1996/08/13 07:48:15 scrappy Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

1414
MKDIR=../mk
1515
-include$(MKDIR)/../Makefile.global
1616

17+
.DEFAULTall:
1718
#
1819
# C programs
1920
#
20-
SUBDIR= pg_id pg_version psql pg_dump
21-
21+
$(MAKE) -C pg_id $@
22+
$(MAKE) -C pg_version $@
23+
$(MAKE) -C psql $@
24+
$(MAKE) -C pg_dump $@
2225
#
2326
# Shell scripts
2427
#
25-
SUBDIR+= cleardbdir createdb createuser destroydb destroyuser initdb
26-
28+
$(MAKE) -C cleardbdir $@
29+
$(MAKE) -C createdb $@
30+
$(MAKE) -C createuser $@
31+
$(MAKE) -C destroydb $@
32+
$(MAKE) -C destroyuser $@
33+
$(MAKE) -C initdb $@
2734
#
2835
# TCL/TK programs
2936
#
3037
ifeq ($(USE_TCL), true)
31-
SUBDIR += pgtclsh
38+
$(MAKE) -C pgtclsh $@
3239
endif
33-
34-
include$(MKDIR)/postgres.subdir.mk
35-

‎src/mk/postgres.lib.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#
1212
#
1313
# IDENTIFICATION
14-
# $Header: /cvsroot/pgsql/src/mk/Attic/postgres.lib.mk,v 1.1.1.1 1996/07/09 06:22:19 scrappy Exp $
14+
# $Header: /cvsroot/pgsql/src/mk/Attic/postgres.lib.mk,v 1.2 1996/08/13 07:48:29 scrappy Exp $
1515
#
1616
#-------------------------------------------------------------------------
1717

@@ -34,7 +34,7 @@ endif
3434

3535
$(shlib):$(addprefix$(objdir)/,$(LIBOBJS))
3636
@rm -f$(objdir)/$(shlib)
37-
cd$(objdir);$(CC) -shared$(LIBOBJS) -o$(shlib)
37+
cd$(objdir);$(CC)$(LDFLAGS)-shared$(LIBOBJS) -o$(shlib)
3838

3939
CLEANFILES+=$(LIBOBJS)$(lib)$(shlib)
4040

‎src/mk/postgres.prog.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
#
1111
#
1212
# IDENTIFICATION
13-
# $Header: /cvsroot/pgsql/src/mk/Attic/postgres.prog.mk,v 1.1.1.1 1996/07/09 06:22:19 scrappy Exp $
13+
# $Header: /cvsroot/pgsql/src/mk/Attic/postgres.prog.mk,v 1.2 1996/08/13 07:48:33 scrappy Exp $
1414
#
1515
#-------------------------------------------------------------------------
1616

1717
PROGOBJS:=$(SRCS:%.c=%.o)
1818

1919
$(PROG):$(addprefix$(objdir)/,$(PROGOBJS))
20-
$(CC)$(CDEBUG) -o$(objdir)/$(@F)$(addprefix$(objdir)/,$(PROGOBJS))$(LD_ADD)
20+
$(CC)$(LDFLAGS) -o$(objdir)/$(@F)$(addprefix$(objdir)/,$(PROGOBJS))$(LD_ADD)
2121

2222
CLEANFILES+=$(PROGOBJS)$(PROG)
2323

0 commit comments

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