From 594525aec1a879743cd023503744918d51483149 Mon Sep 17 00:00:00 2001 From: Bryan Henderson Date: Tue, 12 Nov 1996 11:41:27 +0000 Subject: [PATCH] Put shared libraries in main directory, not obj/ --- src/Makefile.global | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/src/Makefile.global b/src/Makefile.global index 88c4fd1d3f..39f7c49f65 100644 --- a/src/Makefile.global +++ b/src/Makefile.global @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.62 1996/11/11 13:24:43 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.63 1996/11/12 11:41:27 bryanh Exp $ # # NOTES # This is seen by any Makefiles that include mk/postgres.mk. To @@ -345,14 +345,14 @@ SLSUFF= .so endif %.so: %.o - $(LD) -x -r -o $(objdir)/$( $(objdir)/$(@F) + $(MKLDEXPORT) $< `pwd` > $@ %.so: %.o %$(EXPSUFF) @echo The link stage here: - $(LD) -H512 -T512 -o $(objdir)/$(@F) -e _nostart \ + $(LD) -H512 -T512 -o $@ -e _nostart \ -bI:$(LIBDIR)/postgres$(EXPSUFF) -bE:$*$(EXPSUFF) \ $*.o -lm -lc 2>/dev/null endif @@ -432,9 +432,8 @@ USE_REGEX= 1 # SLSUFF= .so -# cd into objdir so that so_locations is also in obj %.so: %.o - cd $(objdir); $(LD) -shared -expect_unresolved '*' -o $(@F) $(