Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 5c410fa

Browse files
author
Bryan Henderson
committed
First pass at getting shared libraries on AIX properly built.
1 parent 45f1d32 commit 5c410fa

File tree

2 files changed

+34
-18
lines changed

2 files changed

+34
-18
lines changed

src/Makefile.global

Lines changed: 9 additions & 4 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.73 1996/11/18 16:32:53 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.74 1996/11/23 09:50:34 bryanh Exp $
1111
#
1212
# NOTES
1313
# Essentially all Postgres make files include this file and use the
@@ -342,15 +342,20 @@ CFLAGS_BE= -qchars=signed -qmaxmem=4000
342342

343343
EXPSUFF= .exp
344344

345+
POSTGRES_EXP= $(SRCDIR)/backend/postgres$(EXPSUFF)
346+
345347
MKLDEXPORT=$(SRCDIR)/backend/port/aix/mkldexport.sh
346348

347349
%$(EXPSUFF): %.o
348350
$(MKLDEXPORT) $< `pwd` > $@
349351

350-
%.so: %.o %$(EXPSUFF)
351-
@echo The link stage here:
352+
$(POSTGRES_EXP):
353+
$(MAKE) -C $(SRCDIR)/backend postgres.exp
354+
355+
%.so: %.o %$(EXPSUFF) $(POSTGRES_EXP)
356+
@echo Making share library $@ from $*.o, $*$(EXPSUFF), and postgres.exp
352357
$(LD) -H512 -T512 -o $@ -e _nostart \
353-
-bI:$(LIBDIR)/postgres$(EXPSUFF) -bE:$*$(EXPSUFF) \
358+
-bI:$(POSTGRES_EXP) -bE:$*$(EXPSUFF) \
354359
$*.o -lm -lc 2>/dev/null
355360
endif
356361

src/backend/Makefile

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#
3535
#
3636
# IDENTIFICATION
37-
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.16 1996/11/18 02:23:41 bryanh Exp $
37+
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.17 1996/11/23 09:51:57 bryanh Exp $
3838
#
3939
#-------------------------------------------------------------------------
4040

@@ -53,7 +53,13 @@ ifdef TIOGA
5353
OBJS += tioga/SUBSYS.o
5454
endif
5555

56-
all: postgres global1.bki.source local1_template1.bki.source
56+
ifeq ($(MAKE_EXPORTS), true)
57+
EXP = postgres$(EXPSUFF)
58+
else
59+
EXP =
60+
endif
61+
62+
all: postgres $(EXP) global1.bki.source local1_template1.bki.source
5763

5864
postgres: postgres_group1 postgres_group2 postgres_group3 postgres_group4
5965
$(CC) $(LDFLAGS) -o postgres $(OBJS) $(LDADD)
@@ -89,6 +95,11 @@ global1.bki.source local1_template1.bki.source:
8995
$(MAKE) -C catalog $@
9096
cp catalog/$@ .
9197

98+
# The postgres.o target is needed by the rule in Makefile.global that
99+
# creates the exports file when MAKE_EXPORTS = true.
100+
postgres.o: $(OBJS)
101+
$(CC) $(LDFLAGS) -r -o postgres.o $(OBJS) $(LDADD)
102+
92103

93104
############################################################################
94105
# The following targets are specified in make commands that appear in the
@@ -168,25 +179,25 @@ endif
168179
# and (2) the parameters of a database system should be set at initdb time,
169180
# not at postgres build time.
170181

171-
D_LIBDIR = $(DESTDIR)$(LIBDIR)
172-
D_BINDIR = $(DESTDIR)$(BINDIR)
173-
174-
install: $(D_LIBDIR) $(D_BINDIR) $(HEADERDIR) postgres fmgr.h\
182+
install: $(LIBDIR) $(BINDIR) $(HEADERDIR) postgres $(EXP) fmgr.h\
175183
global1.bki.source local1_template1.bki.source \
176-
libpq/pg_hba.conf.sample
184+
libpq/pg_hba.conf.sample
177185

178-
$(INSTALL) $(INSTL_EXE_OPTS) postgres $(D_BINDIR)/postgres
179-
@rm -f $(D_BINDIR)/postmaster
180-
cd $(D_BINDIR); ln -s postgres postmaster
186+
$(INSTALL) $(INSTL_EXE_OPTS) postgres $(BINDIR)/postgres
187+
ifeq ($(MAKE_EXPORTS), true)
188+
$(INSTALL) $(INSTLOPTS) postgres$(EXPSUFF) $(LIBDIR)/postgres$(EXPSUFF)
189+
endif
190+
@rm -f $(BINDIR)/postmaster
191+
cd $(BINDIR); ln -s postgres postmaster
181192
$(INSTALL) $(INSTLOPTS) fmgr.h $(HEADERDIR)/fmgr.h
182193
$(INSTALL) $(INSTLOPTS) global1.bki.source \
183-
$(D_LIBDIR)/global1.bki.source
194+
$(LIBDIR)/global1.bki.source
184195
$(INSTALL) $(INSTLOPTS) local1_template1.bki.source \
185-
$(D_LIBDIR)/local1_template1.bki.source
196+
$(LIBDIR)/local1_template1.bki.source
186197
$(INSTALL) $(INSTLOPTS) libpq/pg_hba.conf.sample \
187-
$(D_LIBDIR)/pg_hba.conf.sample
198+
$(LIBDIR)/pg_hba.conf.sample
188199

189-
$(D_BINDIR) $(D_LIBDIR) $(HEADERDIR):
200+
$(BINDIR) $(LIBDIR) $(HEADERDIR):
190201
mkdir $@
191202

192203
#############################################################################

0 commit comments

Comments
 (0)