database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-12-10 14:22:35 +03:00
Code Activity

Fix relative path references so that make knowns which dependencies refer

Browse Source 
to one another. Sort out builddir vs srcdir variable namings. Remove some
now obsoleted make variables.
This commit is contained in:
Peter Eisentraut
2000-08-31 16:12:35 +00:00
parent d4266620e1
commit 424f0edcb8
102 changed files with 384 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/test/bench/Makefile
View File

@@ -7,17 +7,18 @@
#
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/test/bench/Attic/Makefile,v 1.6 2000/06/17 00:10:28 petere Exp $
# $Header: /cvsroot/pgsql/src/test/bench/Attic/Makefile,v 1.7 2000/08/31 16:12:20 petere Exp $
#
#-------------------------------------------------------------------------
SRCDIR= ../..
include ../../Makefile.global
subdir = src/test/bench
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
CREATEFILES= create.sql bench.sql
OUTFILES= bench.out bench.out.perquery
CFLAGS+= -I$(LIBPQDIR) $(CFLAGS_SL)
CFLAGS+= -I$(libpq_srcdir) $(CFLAGS_SL)
all: $(CREATEFILES)

9
src/test/examples/Makefile
View File

@@ -2,12 +2,13 @@
# Makefile for example programs
#
SRCDIR= ../..
include ../../Makefile.global
subdir = src/test/examples
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
CFLAGS+= -I$(LIBPQDIR)
CPPFLAGS+= -I$(libpq_srcdir)
LDFLAGS+= -L$(LIBPQDIR) -lpq
LDFLAGS+= $(libpq)
# PROGS= testlibpq0 testlibpq1 testlibpq2 testlibpq3 testlibpq4 testlo

13
src/test/locale/Makefile
View File

@@ -1,9 +1,8 @@
#
# Makefile for example programs
#
# $Header: /cvsroot/pgsql/src/test/locale/Makefile,v 1.5 2000/08/31 16:12:25 petere Exp $
SRCDIR= ../..
include ../../Makefile.global
subdir = src/test/locale
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
PROGS = test-pgsql-locale test-ctype
@@ -17,9 +16,7 @@ $(PROGS): % : %.c
clean:
rm -f $(PROGS) *.out
for d in $(DIRS); do \
cd $$d; \
$(MAKE) clean; \
cd ..; \
$(MAKE) -C $$d clean
done
test-%: all

6
src/test/regress/GNUmakefile
View File

@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.22 2000/07/23 13:01:10 petere Exp $
# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.23 2000/08/31 16:12:26 petere Exp $
#
#-------------------------------------------------------------------------
@@ -19,9 +19,9 @@ CONTRIB= $(top_builddir)/contrib
HOST := $(shell $(top_srcdir)/config/config.guess)
CFLAGS+= -I$(LIBPQDIR) $(CFLAGS_SL)
CFLAGS+= -I$(libpq_srcdir) $(CFLAGS_SL)
LDADD+= -L$(LIBPQDIR) -lpq
LDADD+= $(libpq)
#
# DLOBJS is the dynamically-loaded object file. The regression test uses

9
src/test/regress/input/Makefile
View File

@@ -7,12 +7,13 @@
#
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/test/regress/input/Attic/Makefile,v 1.8 2000/01/09 19:34:40 tgl Exp $
# $Header: /cvsroot/pgsql/src/test/regress/input/Attic/Makefile,v 1.9 2000/08/31 16:12:28 petere Exp $
#
#-------------------------------------------------------------------------
SRCDIR= ../../..
include ../../../Makefile.global
subdir = src/test/regress/input
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
#
# ... plus test query inputs
@@ -34,5 +35,5 @@ all: $(INFILES)
OBJ=`pwd`; \
sed -e "s:_OBJWD_:$$OBJ/\.\.:g" \
-e "s:_DLSUFFIX_:$(DLSUFFIX):g" \
-e "s:_LIBDIR_:$(LIBDIR):g" \
-e "s:_LIBDIR_:$(libdir):g" \
-e "s/_USER_/$$USER/g" < $< > ../sql/$@

10
src/test/regress/output/Makefile
View File

@@ -7,12 +7,13 @@
#
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/test/regress/output/Attic/Makefile,v 1.10 2000/01/09 19:34:40 tgl Exp $
# $Header: /cvsroot/pgsql/src/test/regress/output/Attic/Makefile,v 1.11 2000/08/31 16:12:30 petere Exp $
#
#-------------------------------------------------------------------------
SRCDIR= ../../..
include ../../../Makefile.global
subdir = src/test/regress/output
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
#
# ... plus test query inputs
@@ -34,7 +35,6 @@ all: $(INFILES)
OBJ=`pwd`; \
sed -e "s:_OBJWD_:$$OBJ/\.\.:g" \
-e "s:_DLSUFFIX_:$(DLSUFFIX):g" \
-e "s:_LIBDIR_:$(LIBDIR):g" \
-e "s:_LIBDIR_:$(libdir):g" \
-e "s/_USER_/$$USER/g" < $< | \
sed -e "s:output/\.\.:input/\.\.:g" > ../expected/$@