diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-07-28 04:32:32 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-07-28 04:32:32 +0000 |
| commit | 39850313e2e02a47dcfe834e6720d1235778f0aa (patch) | |
| tree | 17f1e8a92b83756f859704fc96ef6c47bce312bf /src/test | |
| parent | a7f8ae32dece2da37f43c52ca46410259986e689 (diff) | |
Remove no-longer-needed hack to add pgsleep.c to regress.so.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/regress/GNUmakefile | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile index 329d8c35fd9..09780b19736 100644 --- a/src/test/regress/GNUmakefile +++ b/src/test/regress/GNUmakefile @@ -6,7 +6,7 @@ # Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.51 2005/07/25 00:58:27 tgl Exp $ +# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.52 2005/07/28 04:32:32 tgl Exp $ # #------------------------------------------------------------------------- @@ -56,7 +56,7 @@ pg_regress: pg_regress.sh GNUmakefile $(top_builddir)/src/Makefile.global NAME = regress SO_MAJOR_VERSION= 0 SO_MINOR_VERSION= 0 -OBJS = regress.o pgsleep.o +OBJS = regress.o SHLIB_LINK = $(BE_DLLLIBS) include $(top_srcdir)/src/Makefile.shlib @@ -67,16 +67,6 @@ $(NAME)$(DLSUFFIX): $(shlib) rm -f $(NAME)$(DLSUFFIX) $(LN_S) $(shlib) $(NAME)$(DLSUFFIX) -# regress.so needs pg_usleep, which on some platforms can't be linked -# from the main backend (though I'd sure like to know why not). -# We can't incorporate libpgport directly either, since it's not built -# with appropriate options to build a shared lib. Instead, -# symlink the source file in here and build our own object file. - -pgsleep.c: % : $(top_srcdir)/src/port/% - rm -f $@ && $(LN_S) $< . - - # Build test input and expected files file_list := copy create_function_1 create_function_2 misc constraints tablespace @@ -174,7 +164,7 @@ bigcheck: clean distclean maintainer-clean: clean-lib # things built by `all' target - rm -f $(NAME)$(DLSUFFIX) $(OBJS) pgsleep.c + rm -f $(NAME)$(DLSUFFIX) $(OBJS) $(MAKE) -C $(contribdir)/spi clean rm -f $(output_files) $(input_files) pg_regress # things created by various check targets |