diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2012-03-01 20:50:36 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2012-03-01 20:51:59 +0200 |
| commit | 36a1a8c33d0d400b246dec8395990725b98801b7 (patch) | |
| tree | f320e2963f7db09843f97afc5ddd0aeaecd7d1c3 /src | |
| parent | 89c2f573a392e3995fffc619d4faed23f8649269 (diff) | |
| download | postgresql-36a1a8c33d0d400b246dec8395990725b98801b7.tar.gz postgresql-36a1a8c33d0d400b246dec8395990725b98801b7.zip | |
Don't link pg_isolation_regress with libpq
It's not necessary and can only create confusion about which libpq
installation should be used.
Also remove some dead code from the makefile that was apparently
copied from elsewhere.
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/isolation/Makefile | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/test/isolation/Makefile b/src/test/isolation/Makefile index 80a8a25bb3f..0278ecb21fd 100644 --- a/src/test/isolation/Makefile +++ b/src/test/isolation/Makefile @@ -9,12 +9,7 @@ include $(top_builddir)/src/Makefile.global # where to find psql for testing an existing installation PSQLDIR = $(bindir) -ifeq ($(PORTNAME), win32) -LDLIBS += -lws2_32 -endif - override CPPFLAGS := -I$(srcdir) -I$(libpq_srcdir) -I$(srcdir)/../regress $(CPPFLAGS) -override LDLIBS := $(libpq_pgport) $(LDLIBS) OBJS = specparse.o isolationtester.o @@ -25,12 +20,12 @@ 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) $^ $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) + $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) all: isolationtester pg_isolation_regress isolationtester: $(OBJS) | submake-libpq submake-libpgport - $(CC) $(CFLAGS) $(OBJS) $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) + $(CC) $(CFLAGS) $^ $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) distprep: specparse.c specscanner.c |