Skip to content
Snippets Groups Projects
Commit 0ae841a9 authored by Noah Misch's avatar Noah Misch
Browse files

Make pqsignal() available to pg_regress of ECPG and isolation suites.

Commit 453a5d91 made it available to the
src/test/regress build of pg_regress, but all pg_regress builds need the
same treatment.  Patch 9.2 through 8.4; in 9.3 and later, pg_regress
gets pqsignal() via libpgport.
parent 453a5d91
No related branches found
No related tags found
No related merge requests found
...@@ -47,10 +47,10 @@ clean distclean maintainer-clean: ...@@ -47,10 +47,10 @@ clean distclean maintainer-clean:
all: pg_regress$(X) all: pg_regress$(X)
pg_regress$(X): pg_regress_ecpg.o $(top_builddir)/src/test/regress/pg_regress.o pg_regress$(X): pg_regress_ecpg.o $(top_builddir)/src/test/regress/pg_regress.o $(top_builddir)/src/test/regress/pqsignal.o
$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_EX) $^ $(LIBS) -o $@ $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_EX) $^ $(LIBS) -o $@
$(top_builddir)/src/test/regress/pg_regress.o: $(top_builddir)/src/test/regress/pg_regress.o $(top_builddir)/src/test/regress/pqsignal.o:
$(MAKE) -C $(dir $@) $(notdir $@) $(MAKE) -C $(dir $@) $(notdir $@)
# dependencies ensure that path changes propagate # dependencies ensure that path changes propagate
......
...@@ -15,13 +15,15 @@ OBJS = specparse.o isolationtester.o ...@@ -15,13 +15,15 @@ OBJS = specparse.o isolationtester.o
all: isolationtester$(X) pg_isolation_regress$(X) all: isolationtester$(X) pg_isolation_regress$(X)
submake-regress: pg_regress.o:
$(MAKE) -C $(top_builddir)/src/test/regress pg_regress.o $(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 . rm -f $@ && $(LN_S) $(top_builddir)/src/test/regress/pg_regress.o .
pg_isolation_regress$(X): isolation_main.o pg_regress.o pqsignal.o:
$(MAKE) -C $(top_builddir)/src/test/regress pqsignal.o
rm -f $@ && $(LN_S) $(top_builddir)/src/test/regress/pqsignal.o .
pg_isolation_regress$(X): isolation_main.o pg_regress.o pqsignal.o
$(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@ $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@
isolationtester$(X): $(OBJS) | submake-libpq submake-libpgport isolationtester$(X): $(OBJS) | submake-libpq submake-libpgport
...@@ -59,7 +61,7 @@ endif ...@@ -59,7 +61,7 @@ endif
# so do not clean them here # so do not clean them here
clean distclean: clean distclean:
rm -f isolationtester$(X) pg_isolation_regress$(X) $(OBJS) isolation_main.o rm -f isolationtester$(X) pg_isolation_regress$(X) $(OBJS) isolation_main.o
rm -f pg_regress.o rm -f pg_regress.o pqsignal.o
rm -rf $(pg_regress_clean_files) rm -rf $(pg_regress_clean_files)
maintainer-clean: distclean maintainer-clean: distclean
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment