diff options
| author | Noah Misch <noah@leadboat.com> | 2014-08-18 22:59:53 -0400 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2014-08-18 22:59:53 -0400 |
| commit | ee9569e4df1c3bdb6858f4f65d0770783c32a84d (patch) | |
| tree | 4abc544d89e41c6bccbc01eb578919411fcd1461 /src/test | |
| parent | fb2aece8ae4e6f23310d7c87c7da3fec6f5df3a1 (diff) | |
| download | postgresql-ee9569e4df1c3bdb6858f4f65d0770783c32a84d.tar.gz | |
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')
| -rw-r--r-- | src/test/isolation/Makefile | 7 | ||||
| -rw-r--r-- | src/test/regress/GNUmakefile | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/test/isolation/Makefile b/src/test/isolation/Makefile index 26bcf22392..a88257a562 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 diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile index b084e0a831..b40b37c0b7 100644 --- a/src/test/regress/GNUmakefile +++ b/src/test/regress/GNUmakefile @@ -10,6 +10,9 @@ # #------------------------------------------------------------------------- +PGFILEDESC = "pg_regress - test driver" +PGAPPICON = win32 + subdir = src/test/regress top_builddir = ../../.. include $(top_builddir)/src/Makefile.global @@ -43,7 +46,7 @@ EXTRADEFS = '-DHOST_TUPLE="$(host_tuple)"' \ all: pg_regress$(X) -pg_regress$(X): pg_regress.o pg_regress_main.o | submake-libpgport +pg_regress$(X): pg_regress.o pg_regress_main.o $(WIN32RES) | submake-libpgport $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@ # dependencies ensure that path changes propagate @@ -66,7 +69,7 @@ uninstall: # Build dynamically-loaded object file for CREATE FUNCTION ... LANGUAGE C. NAME = regress -OBJS = regress.o +OBJS = $(WIN32RES) regress.o include $(top_srcdir)/src/Makefile.shlib |