aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2012-11-01 19:48:53 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2012-11-01 19:48:53 -0400
commitef28e05ac50a557b6c1214171c93b576a6709802 (patch)
treeaf44f5d13a1ce7d17ce17aa9f5e33bb90455f089 /src
parent19e36477b383c62009361b2221cb51e9f63132d9 (diff)
downloadpostgresql-ef28e05ac50a557b6c1214171c93b576a6709802.tar.gz
postgresql-ef28e05ac50a557b6c1214171c93b576a6709802.zip
Fix bogus handling of $(X) (i.e., ".exe") in isolationtester Makefile.
I'm not sure why commit 1eb1dde049ccfffc42c80c2bcec14155c58bcc1f seems to have made this start to fail on Cygwin when it never did before --- but nonetheless, the coding was pretty bogus, and unlike the way we handle $(X) anywhere else. Per buildfarm.
Diffstat (limited to 'src')
-rw-r--r--src/test/isolation/Makefile14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/test/isolation/Makefile b/src/test/isolation/Makefile
index 6579be148c1..5e5c9bb74ee 100644
--- a/src/test/isolation/Makefile
+++ b/src/test/isolation/Makefile
@@ -13,19 +13,19 @@ override CPPFLAGS := -I$(srcdir) -I$(libpq_srcdir) -I$(srcdir)/../regress $(CPPF
OBJS = specparse.o isolationtester.o
+all: isolationtester$(X) pg_isolation_regress$(X)
+
submake-regress:
$(MAKE) -C $(top_builddir)/src/test/regress pg_regress.o
pg_regress.o: | submake-regress
rm -f $@ && $(LN_S) $(top_builddir)/src/test/regress/pg_regress.o .
-pg_isolation_regress: isolation_main.o pg_regress.o
- $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
-
-all: isolationtester pg_isolation_regress
+pg_isolation_regress$(X): isolation_main.o pg_regress.o
+ $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@
-isolationtester: $(OBJS) | submake-libpq submake-libpgport
- $(CC) $(CFLAGS) $^ $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
+isolationtester$(X): $(OBJS) | submake-libpq submake-libpgport
+ $(CC) $(CFLAGS) $^ $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@
distprep: specparse.c specscanner.c
@@ -36,8 +36,6 @@ distprep: specparse.c specscanner.c
# important, otherwise make will choose the built-in rule for
# gram.y=>gram.c.
-all: isolationtester$(X) pg_isolation_regress$(X)
-
specparse.h: specparse.c ;
# specscanner is compiled as part of specparse