summaryrefslogtreecommitdiff
path: root/src/test/isolation
diff options
context:
space:
mode:
authorNoah Misch2014-08-19 02:59:53 +0000
committerNoah Misch2014-08-19 02:59:53 +0000
commitee9569e4df1c3bdb6858f4f65d0770783c32a84d (patch)
tree4abc544d89e41c6bccbc01eb578919411fcd1461 /src/test/isolation
parentfb2aece8ae4e6f23310d7c87c7da3fec6f5df3a1 (diff)
Finish adding file version information to installed Windows binaries.
In support of this, have the MSVC build follow GNU make in preferring GNUmakefile over Makefile when a directory contains both. Michael Paquier, reviewed by MauMau.
Diffstat (limited to 'src/test/isolation')
-rw-r--r--src/test/isolation/Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/test/isolation/Makefile b/src/test/isolation/Makefile
index 26bcf22392a..a88257a562c 100644
--- a/src/test/isolation/Makefile
+++ b/src/test/isolation/Makefile
@@ -2,6 +2,9 @@
# Makefile for isolation tests
#
+PGFILEDESC = "pg_isolation_regress/isolationtester - multi-client test driver"
+PGAPPICON = win32
+
subdir = src/test/isolation
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
@@ -11,7 +14,7 @@ PSQLDIR = $(bindir)
override CPPFLAGS := -I$(srcdir) -I$(libpq_srcdir) -I$(srcdir)/../regress $(CPPFLAGS)
-OBJS = specparse.o isolationtester.o
+OBJS = specparse.o isolationtester.o $(WIN32RES)
all: isolationtester$(X) pg_isolation_regress$(X)
@@ -21,7 +24,7 @@ submake-regress:
pg_regress.o: | submake-regress
rm -f $@ && $(LN_S) $(top_builddir)/src/test/regress/pg_regress.o .
-pg_isolation_regress$(X): isolation_main.o pg_regress.o
+pg_isolation_regress$(X): isolation_main.o pg_regress.o $(WIN32RES)
$(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@
isolationtester$(X): $(OBJS) | submake-libpq submake-libpgport