diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2012-11-01 19:48:58 -0400 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2012-11-01 19:48:58 -0400 |
commit | 2f5390aacc7b7ff297dcfeaeab40dae8bb3943c9 (patch) | |
tree | 14dfbe5db743ad0ac390c8541af2fdb3416e2614 /src | |
parent | ca2d6a6cef5740b29406980eb8d21d44da32634b (diff) | |
download | postgresql-2f5390aacc7b7ff297dcfeaeab40dae8bb3943c9.tar.gz postgresql-2f5390aacc7b7ff297dcfeaeab40dae8bb3943c9.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/Makefile | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/test/isolation/Makefile b/src/test/isolation/Makefile index 482ac3ecb94..46ea6f08032 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 |