mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Put shared libraries in main directory, not obj/

Browse Source
This commit is contained in:
Bryan Henderson 1996-11-12 11:41:27 +00:00
parent c8708c5f9b
commit 594525aec1
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/Makefile.global
View File

@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # 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 # NOTES
# This is seen by any Makefiles that include mk/postgres.mk. To # This is seen by any Makefiles that include mk/postgres.mk. To
@ -345,14 +345,14 @@ SLSUFF= .so
endif endif
%.so: %.o %.so: %.o
$(LD) -x -r -o $(objdir)/$(<F).obj $(objdir)/$(<F) $(LD) -x -r -o $<.obj $<
@echo building shared object $(objdir)/$(@F) @echo building shared object $@
@rm -f $(objdir)/$(@F).pic @rm -f $@.pic
@${AR} cq $(objdir)/$(@F).pic `lorder $(objdir)/$(<F).obj | tsort` @${AR} cq $@.pic `lorder $<.obj | tsort`
${RANLIB} $(objdir)/$(@F).pic ${RANLIB} $@.pic
@rm -f $(objdir)/$(@F) @rm -f $@
$(LD) -x -Bshareable -Bforcearchive \ $(LD) -x -Bshareable -Bforcearchive \
-o $(objdir)/$(@F) $(objdir)/$(@F).pic -o $@ $@.pic
endif endif
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------
@ -394,11 +394,11 @@ SLSUFF= .so
MKLDEXPORT=$(SRCDIR)/backend/port/aix/mkldexport.sh MKLDEXPORT=$(SRCDIR)/backend/port/aix/mkldexport.sh
%$(EXPSUFF): %.o %$(EXPSUFF): %.o
$(MKLDEXPORT) $(objdir)/$(<F) `pwd` > $(objdir)/$(@F) $(MKLDEXPORT) $< `pwd` > $@
%.so: %.o %$(EXPSUFF) %.so: %.o %$(EXPSUFF)
@echo The link stage here: @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) \ -bI:$(LIBDIR)/postgres$(EXPSUFF) -bE:$*$(EXPSUFF) \
$*.o -lm -lc 2>/dev/null $*.o -lm -lc 2>/dev/null
endif endif
@ -432,9 +432,8 @@ USE_REGEX= 1
# #
SLSUFF= .so SLSUFF= .so
# cd into objdir so that so_locations is also in obj
%.so: %.o %.so: %.o
cd $(objdir); $(LD) -shared -expect_unresolved '*' -o $(@F) $(<F) $(LD) -shared -expect_unresolved '*' -o $@ $<
CLEANFILES+= so_locations CLEANFILES+= so_locations
@ -491,7 +490,7 @@ SLSUFF= .so
CFLAGS_SL= -fpic CFLAGS_SL= -fpic
%.so: %.o %.so: %.o
cd $(objdir); $(CC) -shared -o $(@F) $(<F) $(CC) -shared -o $@ $<
# #
# for postgres.mk # for postgres.mk
@ -555,7 +554,7 @@ CFLAGS_SL= +z
SLSUFF= .sl SLSUFF= .sl
%.sl: %.o %.sl: %.o
$(LD) -b -o $(objdir)/$(@F) $(objdir)/$(<F) $(LD) -b -o $@ $<
DASH_N= '' DASH_N= ''
BACKSLASH_C= '\\\\c' BACKSLASH_C= '\\\\c'
@ -602,7 +601,7 @@ endif
SLSUFF= .so SLSUFF= .so
%.so: %.o %.so: %.o
$(LD) -G -Bdynamic -o $(objdir)/$(@F) $(objdir)/$(<F) $(LD) -G -Bdynamic -o $@ $<
DASH_N='' DASH_N=''
BACKSLASH_C='\\\\c' BACKSLASH_C='\\\\c'
@ -641,7 +640,7 @@ LD_ADD+= $(LDADD_BE)
SLSUFF= .so SLSUFF= .so
%.so: %.o %.so: %.o
$(LD) -G -Bdynamic -o $(objdir)/$(@F) $(objdir)/$(<F) $(LD) -G -Bdynamic -o $@ $<
DASH_N='' DASH_N=''
BACKSLASH_C='\\\\c' BACKSLASH_C='\\\\c'
@ -669,7 +668,7 @@ USE_REGEX= 1
# #
CFLAGS_SL= -fpic CFLAGS_SL= -fpic
%.so: %.o %.so: %.o
cd $(objdir); $(CC) -shared -o $(@F) $(<F) $(CC) -shared -o $@ $<
# #
# for postgres.mk # for postgres.mk
@ -707,7 +706,7 @@ endif
SLSUFF= .so SLSUFF= .so
%.so: %.o %.so: %.o
$(LD) -dc -dp -Bdynamic -o $(objdir)/$(@F) $(objdir)/$(<F) $(LD) -dc -dp -Bdynamic -o $@ $<
endif endif
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
@ -750,7 +749,7 @@ endif
SLSUFF= .so SLSUFF= .so
%.so: %.o %.so: %.o
$(LD) -G -Bdynamic -o $(objdir)/$(@F) $(objdir)/$(<F) $(LD) -G -Bdynamic -o $@ $<
DASH_N= '' DASH_N= ''
BACKSLASH_C= '\\\\c' BACKSLASH_C= '\\\\c'
@ -801,10 +800,8 @@ endif
SLSUFF= .so SLSUFF= .so
#%.so: %.o
# $(LD) -G $(LDFLAGS) -o $(objdir)/$(@F) $(objdir)/$(<F)
%.so: %.o %.so: %.o
$(LD) -G -Bdynamic -o $(objdir)/$(@F) $(objdir)/$(<F) $(LD) -G -Bdynamic -o $@ $<
DASH_N= '' DASH_N= ''
BACKSLASH_C= '\\\\c' BACKSLASH_C= '\\\\c'