From: Tom Lane Date: Thu, 1 Nov 2012 23:48:53 +0000 (-0400) Subject: Fix bogus handling of $(X) (i.e., ".exe") in isolationtester Makefile. X-Git-Tag: REL9_3_BETA1~742 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ef28e05ac50a557b6c1214171c93b576a6709802;p=postgresql 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. --- diff --git a/src/test/isolation/Makefile b/src/test/isolation/Makefile index 6579be148c..5e5c9bb74e 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