mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-15 08:20:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate MKDIR, srcdir, objdir. Centralize setting of LIBPQDIR.

Browse Source
This commit is contained in:
Bryan Henderson 1996-11-13 10:36:36 +00:00
parent fdc1cf2434
commit b20766ccc4
12 changed files with 35 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Makefile
View File

@ -7,15 +7,12 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/Makefile,v 1.10 1996/11/11 13:51:20 bryanh Exp $ # $Header: /cvsroot/pgsql/src/Makefile,v 1.11 1996/11/13 10:34:58 bryanh Exp $
#
# NOTES
# objdir - location of the objects and generated files (eg. obj)
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
MKDIR=./mk SRCDIR= .
-include $(MKDIR)/../Makefile.global include Makefile.global
FIND = find FIND = find
# assuming gnu tar and split here # assuming gnu tar and split here
@ -41,7 +38,7 @@ ifeq ($(USE_TCL), true)
$(MAKE) -C libpgtcl $@ $(MAKE) -C libpgtcl $@
endif endif
$(MAKE) -C bin $@ $(MAKE) -C bin $@
ifneq ($(wildcard $(MKDIR)/../../doc), ) ifneq ($(wildcard ../doc), )
$(MAKE) -C ../doc $@ $(MAKE) -C ../doc $@
endif endif
@if test $@. = all. -o $@. = .; then \ @if test $@. = all. -o $@. = .; then \

43
src/Makefile.global
View File

@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.64 1996/11/13 08:36:31 bryanh Exp $ # $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.65 1996/11/13 10:35:00 bryanh Exp $
# #
# NOTES # NOTES
# Essentially all Postgres make files include this file and use the # Essentially all Postgres make files include this file and use the
@ -68,14 +68,6 @@ PORTNAME= UNDEFINED
# library), set LINUX_ELF to null in Makefile.custom. # library), set LINUX_ELF to null in Makefile.custom.
LINUX_ELF= 1 LINUX_ELF= 1
# SRCDIR specifies where the source files are. It should be defined before
# we are included, but for transition purposes, we put this default here.
ifdef SRCDIR
MKDIR:= $(SRCDIR)/mk
else
SRCDIR:= $(MKDIR)/..
endif
LIBPQDIR:= $(SRCDIR)/libpq LIBPQDIR:= $(SRCDIR)/libpq
# For convenience, POSTGRESDIR is where DATADIR, BINDIR, and LIBDIR # For convenience, POSTGRESDIR is where DATADIR, BINDIR, and LIBDIR
@ -83,13 +75,6 @@ LIBPQDIR:= $(SRCDIR)/libpq
# changable separately. # changable separately.
POSTGRESDIR= /usr/local/pgsql POSTGRESDIR= /usr/local/pgsql
# POSTGRESLOGIN is the login name of the user who gets special
# privileges within the database. By default it is "postgres", but
# you can change it to any existing login name (such as your own
# login if you are compiling a private version or don't have root
# access).
POSTGRESLOGIN= postgres
# DATADIR specifies where the postmaster expects to find its database. # DATADIR specifies where the postmaster expects to find its database.
# This may be overridden by command line options or the PGDATA environment # This may be overridden by command line options or the PGDATA environment
# variable. # variable.
@ -268,8 +253,6 @@ DASH_N= -n
BACKSLASH_C= BACKSLASH_C=
objdir= obj
############################################################################## ##############################################################################
# #
# Customization. # Customization.
@ -277,8 +260,8 @@ objdir= obj
# This includes your local customizations if Makefile.custom exists # This includes your local customizations if Makefile.custom exists
# in the source directory. This file doesn't exist in the original # in the source directory. This file doesn't exist in the original
# distribution so that it doesn't get overwritten when you upgrade. # distribution so that it doesn't get overwritten when you upgrade.
ifneq ($(wildcard $(MKDIR)/../Makefile.custom), ) ifneq ($(wildcard $(SRCDIR/Makefile.custom), )
include $(MKDIR)/../Makefile.custom include $(SRCDIR)/Makefile.custom
endif endif
############################################################################# #############################################################################
@ -304,10 +287,9 @@ endif
# HISTORY: Before October 1996, this file included the following line: # HISTORY: Before October 1996, this file included the following line:
# -include $(MKDIR)/port/postgres.mk.$(PORTNAME) # -include $(MKDIR)/port/postgres.mk.$(PORTNAME)
# Now, we instead have all the former contents of those .mk files inline # Now, we instead have all the former contents of those .mk files inline
# with ifeq ($(PORTNAME) ...). This makes it a little bit easier to use # with ifeq ($(PORTNAME) ...). This makes it easier to read the make
# Makefile.global because you don't have to set MKDIR too. It also makes # files and to make certain updates. It should also help with the migration
# it easier to read the make files. Finally, it should help with # to autoconf. -Bryan
# migration to autoconf. - Bryan
# Since there are no longer separate files for each platform, much of the # Since there are no longer separate files for each platform, much of the
# commonality among the platforms ought to be factored out of the following. # commonality among the platforms ought to be factored out of the following.
@ -548,7 +530,7 @@ INSTALL= /usr/ucb/install
# everything to compile. :-/ # everything to compile. :-/
# #
# The extra -I flag is to scoop up extra BSD-emulating headers. # The extra -I flag is to scoop up extra BSD-emulating headers.
CFLAGS_BE+= -DSYSV_DIRENT -I$(POSTGRESDIR)/src/backend/port/sparc_solaris CFLAGS_BE+= -DSYSV_DIRENT -I$(SRCDIR)/backend/port/sparc_solaris
LDADD_BE+= -lsocket -lnsl LDADD_BE+= -lsocket -lnsl
LD_ADD+= $(LDADD_BE) LD_ADD+= $(LDADD_BE)
@ -715,7 +697,7 @@ INSTALL= /home/tools/bin/install
# everything to compile. :-/ # everything to compile. :-/
# #
# The extra -I flag is to scoop up extra BSD-emulating headers. # The extra -I flag is to scoop up extra BSD-emulating headers.
CFLAGS_BE+= -DSYSV_DIRENT -I$(POSTGRESDIR)/src/backend/port/svr4 CFLAGS_BE+= -DSYSV_DIRENT -I$(SRCDIR)/backend/port/svr4
LDADD_BE+= -lsocket -lnsl -lc /usr/ucblib/libucb.a LDADD_BE+= -lsocket -lnsl -lc /usr/ucblib/libucb.a
LD_ADD+= $(LDADD_BE) LD_ADD+= $(LDADD_BE)
@ -755,15 +737,6 @@ endif
##############################################################################
#
# Miscellaneous configuration
#
srcdir= $(SRCDIR)
includedir= $(HEADERDIR)
# This goes here so that customization in Makefile.custom is effective # This goes here so that customization in Makefile.custom is effective
############################################################################## ##############################################################################
# #

4
src/bin/Makefile
View File

@ -7,12 +7,12 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.5 1996/11/11 13:39:09 bryanh Exp $ # $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.6 1996/11/13 10:35:20 bryanh Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
SRCDIR=.. SRCDIR=..
include $(SRCDIR)/Makefile.global include ../Makefile.global
.DEFAULT all: .DEFAULT all:
# #

29
src/bin/psql/Makefile
View File

@ -7,46 +7,45 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.12 1996/11/12 06:11:52 bryanh Exp $ # $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.13 1996/11/13 10:35:26 bryanh Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
SRCDIR = ../.. SRCDIR= ../..
LIBPQDIR = $(SRCDIR)/libpq
include ../../Makefile.global include ../../Makefile.global
INCLUDE_OPT := \ INCLUDE_OPT:= \
-I$(LIBPQDIR) \ -I$(LIBPQDIR) \
-I$(SRCDIR)/include -I../../include
CFLAGS += $(INCLUDE_OPT) CFLAGS+= $(INCLUDE_OPT)
# #
#USE_READLINE is set in Makefile.global #USE_READLINE is set in Makefile.global
# #
ifeq ($(USE_READLINE), true) ifeq ($(USE_READLINE), true)
CFLAGS += $(READLINE_INC) $(HISTORY_INC) CFLAGS+= $(READLINE_INC) $(HISTORY_INC)
LIBCURSES= -lcurses LIBCURSES= -lcurses
LD_ADD += $(READLINE_LIB) $(HISTORY_LIB) $(LIBCURSES) LD_ADD+= $(READLINE_LIB) $(HISTORY_LIB) $(LIBCURSES)
ifeq ($(PORTNAME), ultrix4) ifeq ($(PORTNAME), ultrix4)
LD_ADD += -ltermcap LD_ADD+= -ltermcap
else else
ifeq ($(PORTNAME), sparc) ifeq ($(PORTNAME), sparc)
LD_ADD += -ltermcap LD_ADD+= -ltermcap
else else
ifeq ($(PORTNAME), linux) ifeq ($(PORTNAME), linux)
LD_ADD += -ltermcap LD_ADD+= -ltermcap
else else
ifeq ($(PORTNAME), next) ifeq ($(PORTNAME), next)
LD_ADD += -ltermcap LD_ADD+= -ltermcap
else else
ifeq ($(PORTNAME), bsdi) ifeq ($(PORTNAME), bsdi)
LD_ADD += -ltermcap LD_ADD+= -ltermcap
else else
ifeq ($(PORTNAME), BSD44_derived) ifeq ($(PORTNAME), BSD44_derived)
LD_ADD += -ltermcap LD_ADD+= -ltermcap
endif endif
endif endif
endif endif
@ -54,7 +53,7 @@ ifeq ($(USE_READLINE), true)
endif endif
endif endif
else else
CFLAGS += -DNOREADLINE CFLAGS+= -DNOREADLINE
endif endif
OBJS= psql.o stringutils.o OBJS= psql.o stringutils.o

5
src/interfaces/libpgtcl/Makefile
View File

@ -7,12 +7,11 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.5 1996/11/12 11:42:09 bryanh Exp $ # $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.6 1996/11/13 10:35:31 bryanh Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
SRCDIR= .. SRCDIR= ..
LIBPQDIR= $(SRCDIR)/libpq
include ../Makefile.global include ../Makefile.global
INCLUDE_OPT= \ INCLUDE_OPT= \
@ -58,4 +57,4 @@ install-libpgtcl: libpgtcl.a
.PHONY: clean .PHONY: clean
clean: clean:
rm -f $(OBJS) rm -f $(OBJS)

5
src/interfaces/libpq++/Makefile
View File

@ -7,12 +7,11 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.2 1996/11/12 11:42:24 bryanh Exp $ # $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.3 1996/11/13 10:35:39 bryanh Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
SRCDIR= .. SRCDIR= ..
LIBPQDIR= $(SRCDIR)/libpq
include ../Makefile.global include ../Makefile.global
CXXFLAGS= $(CFLAGS) CXXFLAGS= $(CFLAGS)
@ -63,4 +62,4 @@ doc:
clean: clean:
rm libpq++.a $(OBJS) rm libpq++.a $(OBJS)
$(MAKE) -C examples clean $(MAKE) -C examples clean

1
src/interfaces/libpq++/examples/Makefile
View File

@ -3,7 +3,6 @@
# #
SRCDIR= ../.. SRCDIR= ../..
LIBPQDIR= $(SRCDIR)/libpq
include ../../Makefile.global include ../../Makefile.global
CXXFLAGS= $(CFLAGS) CXXFLAGS= $(CFLAGS)

3
src/test/bench/Makefile
View File

@ -7,12 +7,11 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/test/bench/Attic/Makefile,v 1.2 1996/11/12 11:42:49 bryanh Exp $ # $Header: /cvsroot/pgsql/src/test/bench/Attic/Makefile,v 1.3 1996/11/13 10:35:59 bryanh Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
SRCDIR= ../.. SRCDIR= ../..
LIBPQDIR= $(SRCDIR)/libpq
include ../../Makefile.global include ../../Makefile.global
CREATEFILES= create.sql bench.sql CREATEFILES= create.sql bench.sql

1
src/test/examples/Makefile
View File

@ -3,7 +3,6 @@
# #
SRCDIR= ../.. SRCDIR= ../..
LIBPQDIR= $(SRCDIR)/libpq
include ../../Makefile.global include ../../Makefile.global
CFLAGS+= -I$(LIBPQDIR) CFLAGS+= -I$(LIBPQDIR)

3
src/test/regress/Makefile
View File

@ -7,12 +7,11 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/test/regress/Makefile,v 1.8 1996/11/12 11:43:05 bryanh Exp $ # $Header: /cvsroot/pgsql/src/test/regress/Makefile,v 1.9 1996/11/13 10:36:17 bryanh Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
SRCDIR= ../.. SRCDIR= ../..
LIBPQDIR= $(SRCDIR)/libpq
include ../../Makefile.global include ../../Makefile.global
CFLAGS+= -I$(LIBPQDIR) -I../../include CFLAGS+= -I$(LIBPQDIR) -I../../include

1
src/tutorial/C-code/Makefile
View File

@ -1,5 +1,4 @@
SRCDIR= ../.. SRCDIR= ../..
LIBPQDIR= $(SRCDIR)/libpq
include ../../Makefile.global include ../../Makefile.global
CFLAGS+= -I../../include -I$(LIBPQDIR) CFLAGS+= -I../../include -I$(LIBPQDIR)

3
src/tutorial/Makefile
View File

@ -4,12 +4,11 @@
# Makefile for tutorial # Makefile for tutorial
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/tutorial/Makefile,v 1.2 1996/11/12 11:43:20 bryanh Exp $ # $Header: /cvsroot/pgsql/src/tutorial/Makefile,v 1.3 1996/11/13 10:36:24 bryanh Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
SRCDIR= .. SRCDIR= ..
LIBPQDIR= $(SRCDIR)/libpq
include ../Makefile.global include ../Makefile.global
CFLAGS+= -I$(LIBPQDIR) -I../../include CFLAGS+= -I$(LIBPQDIR) -I../../include