mirror of
https://git.postgresql.org/git/postgresql.git
synced 2025-01-12 15:39:35 +08:00
Build needed things in src/test/regress/ first. And some build rules
normalization.
This commit is contained in:
parent
e72187d789
commit
cbb1358b18
@ -1,9 +1,18 @@
|
|||||||
# $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.76 2009/01/05 09:54:13 petere Exp $
|
# $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.77 2009/01/15 09:30:20 petere Exp $
|
||||||
|
|
||||||
subdir = src/interfaces/ecpg/test
|
subdir = src/interfaces/ecpg/test
|
||||||
top_builddir = ../../../..
|
top_builddir = ../../../..
|
||||||
include $(top_builddir)/src/Makefile.global
|
include $(top_builddir)/src/Makefile.global
|
||||||
|
|
||||||
|
override CPPFLAGS := \
|
||||||
|
-I$(top_builddir)/src/port \
|
||||||
|
-I$(top_srcdir)/src/test/regress \
|
||||||
|
'-DHOST_TUPLE="$(host_tuple)"' \
|
||||||
|
'-DMAKEPROG="$(MAKE)"' \
|
||||||
|
'-DSHELLPROG="$(SHELL)"' \
|
||||||
|
'-DDLSUFFIX="$(DLSUFFIX)"' \
|
||||||
|
$(CPPFLAGS)
|
||||||
|
|
||||||
# where to find psql for testing an existing installation
|
# where to find psql for testing an existing installation
|
||||||
PSQLDIR = $(bindir)
|
PSQLDIR = $(bindir)
|
||||||
|
|
||||||
@ -22,15 +31,6 @@ else
|
|||||||
abs_builddir := $(shell pwd -W)
|
abs_builddir := $(shell pwd -W)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# stuff to pass into build of pg_regress
|
|
||||||
EXTRADEFS = '-DHOST_TUPLE="$(host_tuple)"' \
|
|
||||||
'-DMAKEPROG="$(MAKE)"' \
|
|
||||||
'-DSHELLPROG="$(SHELL)"' \
|
|
||||||
'-DDLSUFFIX="$(DLSUFFIX)"'
|
|
||||||
|
|
||||||
REGRESSINCLUDES = "-I$(top_srcdir)/src/test/regress"
|
|
||||||
REGRESSDRIVER = "$(top_builddir)/src/test/regress/pg_regress.o"
|
|
||||||
|
|
||||||
all install installdirs uninstall distprep:
|
all install installdirs uninstall distprep:
|
||||||
$(MAKE) -C connect $@
|
$(MAKE) -C connect $@
|
||||||
$(MAKE) -C sql $@
|
$(MAKE) -C sql $@
|
||||||
@ -53,12 +53,14 @@ clean distclean maintainer-clean:
|
|||||||
|
|
||||||
all: pg_regress$(X)
|
all: pg_regress$(X)
|
||||||
|
|
||||||
pg_regress$(X): pg_regress_ecpg.o
|
pg_regress$(X): pg_regress_ecpg.o $(top_builddir)/src/test/regress/pg_regress.o
|
||||||
$(CC) $(CFLAGS) $^ $(REGRESSDRIVER) $(REGRESSINCLUDES) $(LDFLAGS) $(LIBS) -o $@
|
$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@
|
||||||
|
|
||||||
|
$(top_builddir)/src/test/regress/pg_regress.o:
|
||||||
|
$(MAKE) -C $(dir $@) $(notdir $@)
|
||||||
|
|
||||||
# dependencies ensure that path changes propagate
|
# dependencies ensure that path changes propagate
|
||||||
pg_regress_ecpg.o: pg_regress_ecpg.c $(top_builddir)/src/port/pg_config_paths.h
|
pg_regress_ecpg.o: pg_regress_ecpg.c $(top_builddir)/src/port/pg_config_paths.h
|
||||||
$(CC) $(CFLAGS) $(CPPFLAGS) -I$(top_builddir)/src/port $(REGRESSINCLUDES) $(EXTRADEFS) -c -o $@ $<
|
|
||||||
|
|
||||||
$(top_builddir)/src/port/pg_config_paths.h: $(top_builddir)/src/Makefile.global
|
$(top_builddir)/src/port/pg_config_paths.h: $(top_builddir)/src/Makefile.global
|
||||||
$(MAKE) -C $(top_builddir)/src/port pg_config_paths.h
|
$(MAKE) -C $(top_builddir)/src/port pg_config_paths.h
|
||||||
|
Loading…
Reference in New Issue
Block a user