Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit594525a

Browse files
author
Bryan Henderson
committed
Put shared libraries in main directory, not obj/
1 parentc8708c5 commit594525a

File tree

1 file changed

+19
-22
lines changed

1 file changed

+19
-22
lines changed

‎src/Makefile.global

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.62 1996/11/11 13:24:43 bryanh Exp $
10+
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.63 1996/11/12 11:41:27 bryanh Exp $
1111
#
1212
# NOTES
1313
# This is seen by any Makefiles that include mk/postgres.mk. To
@@ -345,14 +345,14 @@ SLSUFF=.so
345345
endif
346346

347347
%.so: %.o
348-
$(LD) -x -r -o $(objdir)/$(<F).obj $(objdir)/$(<F)
349-
@echo building shared object $(objdir)/$(@F)
350-
@rm -f $(objdir)/$(@F).pic
351-
@${AR} cq $(objdir)/$(@F).pic `lorder $(objdir)/$(<F).obj | tsort`
352-
${RANLIB} $(objdir)/$(@F).pic
353-
@rm -f $(objdir)/$(@F)
348+
$(LD) -x -r -o $<.obj $<
349+
@echo building shared object $@
350+
@rm -f $@.pic
351+
@${AR} cq $@.pic `lorder $<.obj | tsort`
352+
${RANLIB} $@.pic
353+
@rm -f $@
354354
$(LD) -x -Bshareable -Bforcearchive \
355-
-o $(objdir)/$(@F) $(objdir)/$(@F).pic
355+
-o $@ $@.pic
356356
endif
357357

358358
#--------------------------------------------------------------------------
@@ -394,11 +394,11 @@ SLSUFF=.so
394394
MKLDEXPORT=$(SRCDIR)/backend/port/aix/mkldexport.sh
395395

396396
%$(EXPSUFF): %.o
397-
$(MKLDEXPORT) $(objdir)/$(<F) `pwd` > $(objdir)/$(@F)
397+
$(MKLDEXPORT) $< `pwd` > $@
398398

399399
%.so: %.o %$(EXPSUFF)
400400
@echo The link stage here:
401-
$(LD) -H512 -T512 -o $(objdir)/$(@F) -e _nostart \
401+
$(LD) -H512 -T512 -o $@ -e _nostart \
402402
-bI:$(LIBDIR)/postgres$(EXPSUFF) -bE:$*$(EXPSUFF) \
403403
$*.o -lm -lc 2>/dev/null
404404
endif
@@ -432,9 +432,8 @@ USE_REGEX= 1
432432
#
433433
SLSUFF= .so
434434

435-
# cd into objdir so that so_locations is also in obj
436435
%.so: %.o
437-
cd $(objdir); $(LD) -shared -expect_unresolved '*' -o $(@F) $(<F)
436+
$(LD) -shared -expect_unresolved '*' -o $@ $<
438437

439438
CLEANFILES+= so_locations
440439

@@ -491,7 +490,7 @@ SLSUFF=.so
491490

492491
CFLAGS_SL= -fpic
493492
%.so: %.o
494-
cd $(objdir); $(CC) -shared -o $(@F) $(<F)
493+
$(CC) -shared -o $@ $<
495494

496495
#
497496
# for postgres.mk
@@ -555,7 +554,7 @@ CFLAGS_SL= +z
555554
SLSUFF= .sl
556555

557556
%.sl: %.o
558-
$(LD) -b -o $(objdir)/$(@F) $(objdir)/$(<F)
557+
$(LD) -b -o $@ $<
559558

560559
DASH_N= ''
561560
BACKSLASH_C= '\\\\c'
@@ -602,7 +601,7 @@ endif
602601
SLSUFF=.so
603602

604603
%.so: %.o
605-
$(LD) -G -Bdynamic -o $(objdir)/$(@F) $(objdir)/$(<F)
604+
$(LD) -G -Bdynamic -o $@ $<
606605

607606
DASH_N=''
608607
BACKSLASH_C='\\\\c'
@@ -641,7 +640,7 @@ LD_ADD+= $(LDADD_BE)
641640
SLSUFF= .so
642641

643642
%.so: %.o
644-
$(LD) -G -Bdynamic -o $(objdir)/$(@F) $(objdir)/$(<F)
643+
$(LD) -G -Bdynamic -o $@ $<
645644

646645
DASH_N=''
647646
BACKSLASH_C='\\\\c'
@@ -669,7 +668,7 @@ USE_REGEX= 1
669668
#
670669
CFLAGS_SL= -fpic
671670
%.so: %.o
672-
cd $(objdir); $(CC) -shared -o $(@F) $(<F)
671+
$(CC) -shared -o $@ $<
673672

674673
#
675674
# for postgres.mk
@@ -707,7 +706,7 @@ endif
707706
SLSUFF= .so
708707

709708
%.so: %.o
710-
$(LD) -dc -dp -Bdynamic -o $(objdir)/$(@F) $(objdir)/$(<F)
709+
$(LD) -dc -dp -Bdynamic -o $@ $<
711710
endif
712711

713712
#----------------------------------------------------------------------------
@@ -750,7 +749,7 @@ endif
750749
SLSUFF= .so
751750

752751
%.so: %.o
753-
$(LD) -G -Bdynamic -o $(objdir)/$(@F) $(objdir)/$(<F)
752+
$(LD) -G -Bdynamic -o $@ $<
754753

755754
DASH_N= ''
756755
BACKSLASH_C= '\\\\c'
@@ -801,10 +800,8 @@ endif
801800

802801
SLSUFF= .so
803802

804-
#%.so: %.o
805-
#$(LD) -G $(LDFLAGS) -o $(objdir)/$(@F) $(objdir)/$(<F)
806803
%.so: %.o
807-
$(LD) -G -Bdynamic -o $(objdir)/$(@F) $(objdir)/$(<F)
804+
$(LD) -G -Bdynamic -o $@ $<
808805

809806
DASH_N= ''
810807
BACKSLASH_C= '\\\\c'

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp