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>
This commit is contained in:
parent
a721c91ade
commit
ca5db6cab1
20
src/Makefile
20
src/Makefile
@ -7,7 +7,7 @@
|
||||
#
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/Makefile,v 1.3 1996/08/01 19:46:46 scrappy Exp $
|
||||
# $Header: /cvsroot/pgsql/src/Makefile,v 1.4 1996/08/13 07:47:43 scrappy Exp $
|
||||
#
|
||||
# NOTES
|
||||
# objdir - location of the objects and generated files (eg. obj)
|
||||
@ -17,14 +17,6 @@
|
||||
MKDIR=./mk
|
||||
-include $(MKDIR)/../Makefile.global
|
||||
|
||||
SUBDIR= backend libpq
|
||||
|
||||
ifeq ($(USE_TCL), true)
|
||||
SUBDIR += libpgtcl
|
||||
endif
|
||||
|
||||
SUBDIR+= bin ../doc
|
||||
|
||||
FIND = find
|
||||
# assuming gnu tar and split here
|
||||
TAR = tar
|
||||
@ -33,7 +25,15 @@ SPLIT = split
|
||||
ETAGS = etags
|
||||
XARGS = xargs
|
||||
|
||||
include mk/postgres.subdir.mk
|
||||
.DEFAULT all:
|
||||
$(MAKE) -C backend $@
|
||||
$(MAKE) -C libpq $@
|
||||
ifeq ($(USE_TCL), true)
|
||||
$(MAKE) -C libpgtcl $@
|
||||
endif
|
||||
$(MAKE) -C bin $@
|
||||
$(MAKE) -C ../doc $@
|
||||
@echo All of Postgres95 is successfully made. Ready to install.
|
||||
|
||||
TAGS:
|
||||
rm -f TAGS; \
|
||||
|
@ -7,29 +7,33 @@
|
||||
#
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.3 1996/07/25 06:54:26 scrappy Exp $
|
||||
# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.4 1996/08/13 07:48:15 scrappy Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
MKDIR=../mk
|
||||
-include $(MKDIR)/../Makefile.global
|
||||
|
||||
.DEFAULT all:
|
||||
#
|
||||
# C programs
|
||||
#
|
||||
SUBDIR= pg_id pg_version psql pg_dump
|
||||
|
||||
$(MAKE) -C pg_id $@
|
||||
$(MAKE) -C pg_version $@
|
||||
$(MAKE) -C psql $@
|
||||
$(MAKE) -C pg_dump $@
|
||||
#
|
||||
# Shell scripts
|
||||
#
|
||||
SUBDIR+= cleardbdir createdb createuser destroydb destroyuser initdb
|
||||
|
||||
$(MAKE) -C cleardbdir $@
|
||||
$(MAKE) -C createdb $@
|
||||
$(MAKE) -C createuser $@
|
||||
$(MAKE) -C destroydb $@
|
||||
$(MAKE) -C destroyuser $@
|
||||
$(MAKE) -C initdb $@
|
||||
#
|
||||
# TCL/TK programs
|
||||
#
|
||||
ifeq ($(USE_TCL), true)
|
||||
SUBDIR += pgtclsh
|
||||
$(MAKE) -C pgtclsh $@
|
||||
endif
|
||||
|
||||
include $(MKDIR)/postgres.subdir.mk
|
||||
|
||||
|
@ -11,7 +11,7 @@
|
||||
#
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/mk/Attic/postgres.lib.mk,v 1.1.1.1 1996/07/09 06:22:19 scrappy Exp $
|
||||
# $Header: /cvsroot/pgsql/src/mk/Attic/postgres.lib.mk,v 1.2 1996/08/13 07:48:29 scrappy Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
@ -34,7 +34,7 @@ endif
|
||||
|
||||
$(shlib): $(addprefix $(objdir)/,$(LIBOBJS))
|
||||
@rm -f $(objdir)/$(shlib)
|
||||
cd $(objdir); $(CC) -shared $(LIBOBJS) -o $(shlib)
|
||||
cd $(objdir); $(CC) $(LDFLAGS) -shared $(LIBOBJS) -o $(shlib)
|
||||
|
||||
CLEANFILES+= $(LIBOBJS) $(lib) $(shlib)
|
||||
|
||||
|
@ -10,14 +10,14 @@
|
||||
#
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/mk/Attic/postgres.prog.mk,v 1.1.1.1 1996/07/09 06:22:19 scrappy Exp $
|
||||
# $Header: /cvsroot/pgsql/src/mk/Attic/postgres.prog.mk,v 1.2 1996/08/13 07:48:33 scrappy Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
PROGOBJS:= $(SRCS:%.c=%.o)
|
||||
|
||||
$(PROG): $(addprefix $(objdir)/,$(PROGOBJS))
|
||||
$(CC) $(CDEBUG) -o $(objdir)/$(@F) $(addprefix $(objdir)/,$(PROGOBJS)) $(LD_ADD)
|
||||
$(CC) $(LDFLAGS) -o $(objdir)/$(@F) $(addprefix $(objdir)/,$(PROGOBJS)) $(LD_ADD)
|
||||
|
||||
CLEANFILES+= $(PROGOBJS) $(PROG)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user