mirror of
https://github.com/postgres/postgres.git
synced 2025-11-15 03:41:20 +03:00
Add support for VPATH builds, that is, building somewhere else than in the
source directory. This involves mostly makefiles using $(srcdir) when they might have used ".". (Regression tests don't work with this, yet.) Sort out usage of CPPFLAGS, CFLAGS (and CXXFLAGS). Add "override" keyword in most places, to preserve necessary flags even when the user overrode the flags.
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# Makefile for utils/adt
|
||||
#
|
||||
# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.47 2000/09/29 17:17:33 petere Exp $
|
||||
# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.48 2000/10/20 21:03:52 petere Exp $
|
||||
#
|
||||
|
||||
subdir = src/backend/utils/adt
|
||||
@@ -11,7 +11,7 @@ include $(top_builddir)/src/Makefile.global
|
||||
# seems to be required for some date/time stuff 1999/07/22 bjm
|
||||
ifeq "$(findstring alpha,$(host_cpu))" "alpha"
|
||||
ifeq "$(GCC)" "yes"
|
||||
CFLAGS+= -mieee
|
||||
override CFLAGS+= -mieee
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
# Makefile for utils/mb
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/backend/utils/mb/Makefile,v 1.11 2000/10/12 06:06:49 ishii Exp $
|
||||
# $Header: /cvsroot/pgsql/src/backend/utils/mb/Makefile,v 1.12 2000/10/20 21:03:53 petere Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
@@ -20,48 +20,22 @@ all: SUBSYS.o
|
||||
SUBSYS.o: $(OBJS)
|
||||
$(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
|
||||
|
||||
palloc.o: palloc.c
|
||||
$(CC) -c $(CFLAGS) palloc.c
|
||||
|
||||
sjistest.o: sjistest.c
|
||||
$(CC) -c $(CFLAGS) sjistest.c
|
||||
|
||||
liketest.o: liketest.c
|
||||
$(CC) -c $(CFLAGS) liketest.c
|
||||
|
||||
uconv.o: uconv.c
|
||||
$(CC) -c $(CFLAGS) uconv.c
|
||||
|
||||
uconv2.o: uconv2.c
|
||||
$(CC) -c $(CFLAGS) uconv2.c
|
||||
|
||||
utftest.o: utftest.c conv.c wchar.c mbutils.c
|
||||
$(CC) -c $(CFLAGS) utftest.c
|
||||
|
||||
sjistest: $(OBJS) sjistest.o palloc.o
|
||||
$(CC) -o sjistest sjistest.o palloc.o \
|
||||
common.o mbutils.o wchar.o wstrcmp.o wstrncmp.o variable.o \
|
||||
big5.o $(LDFLAGS)
|
||||
sjistest: sjistest.o palloc.o common.o mbutils.o wchar.o wstrcmp.o wstrncmp.o variable.o big5.o
|
||||
$(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
|
||||
|
||||
liketest: $(OBJS) liketest.o palloc.o
|
||||
$(CC) -o liketest liketest.o palloc.o conv.o \
|
||||
common.o mbutils.o wchar.o wstrcmp.o wstrncmp.o variable.o \
|
||||
big5.o $(LDFLAGS)
|
||||
liketest: liketest.o palloc.o $(OBJS)
|
||||
$(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
|
||||
|
||||
utftest: $(OBJS) utftest.o palloc.o
|
||||
$(CC) -o utftest utftest.o palloc.o \
|
||||
common.o wstrcmp.o wstrncmp.o variable.o \
|
||||
big5.o $(LDFLAGS)
|
||||
utftest: utftest.o palloc.o common.o wstrcmp.o wstrncmp.o variable.o big5.o
|
||||
$(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
|
||||
|
||||
uconv: uconv.o palloc.o
|
||||
$(CC) -o uconv uconv.o palloc.o \
|
||||
common.o conv.o wchar.o \
|
||||
big5.o mbutils.o $(LDFLAGS)
|
||||
uconv: uconv.o palloc.o common.o conv.o wchar.o big5.o mbutils.o
|
||||
$(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
|
||||
|
||||
uconv2: uconv2.o palloc.o
|
||||
$(CC) -o uconv2 uconv2.o palloc.o \
|
||||
common.o conv.o wchar.o \
|
||||
big5.o mbutils.o $(LDFLAGS)
|
||||
uconv2: uconv2.o palloc.o common.o conv.o wchar.o big5.o mbutils.o
|
||||
$(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
|
||||
|
||||
depend dep:
|
||||
$(CC) -MM $(CFLAGS) *.c >depend
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.18 2000/08/28 11:53:20 petere Exp $
|
||||
# $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.19 2000/10/20 21:03:55 petere Exp $
|
||||
|
||||
subdir = src/backend/utils/misc
|
||||
top_builddir = ../../../..
|
||||
@@ -9,7 +9,7 @@ OBJS = database.o superuser.o guc.o guc-file.o ps_status.o
|
||||
# This location might depend on the installation directories. Therefore
|
||||
# we can't subsitute it into config.h.
|
||||
ifdef krb_srvtab
|
||||
CPPFLAGS += -DPG_KRB_SRVTAB='"$(krb_srvtab)"'
|
||||
override CPPFLAGS += -DPG_KRB_SRVTAB='"$(krb_srvtab)"'
|
||||
endif
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ all: SUBSYS.o
|
||||
SUBSYS.o: $(OBJS)
|
||||
$(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
|
||||
|
||||
guc-file.c: guc-file.l
|
||||
$(srcdir)/guc-file.c: guc-file.l
|
||||
ifdef FLEX
|
||||
$(FLEX) $(FLEXFLAGS) $<
|
||||
sed -e 's/^yy/GUC_yy/g' -e 's/\([^a-zA-Z0-9_]\)yy/\1GUC_yy/g' lex.yy.c > $@
|
||||
|
||||
Reference in New Issue
Block a user