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

Commite1942f5

Browse files
committed
Clean up shared makefile install procedures.
Get the permissions right, don't overwrite real files with symlinks, etc.plpgsql and odbc still aren't fully up to speed, but at least they don't crash and burn...
1 parent14f4ca0 commite1942f5

File tree

9 files changed

+201
-109
lines changed

9 files changed

+201
-109
lines changed

‎src/interfaces/ecpg/lib/Makefile.in‎

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -72,24 +72,43 @@ ifeq ($(PORTNAME), unixware)
7272
CFLAGS +=$(CFLAGS_SL)
7373
endif
7474

75+
ifeq ($(PORTNAME), hpux)
76+
install-shlib-dep:= install-shlib
77+
shlib:= lib$(NAME).sl
78+
LDFLAGS_SL:= -b
79+
CFLAGS+=$(CFLAGS_SL)
80+
endif
81+
7582
all: lib$(NAME).a$(shlib)
7683

77-
$(shlib): ecpglib.sho.o typename.sho.o
78-
$(LD)$(LDFLAGS_SL) -o$@ ecpglib.sho.o typename.sho.o
84+
$(shlib): ecpglib.o typename.o
85+
$(LD)$(LDFLAGS_SL) -o$@ ecpglib.o typename.o
7986

8087
clean:
81-
rm -f*.o*.sho*.a core a.out*~$(shlib) lib$(NAME)$(DLSUFFIX)
88+
rm -f*.o*.a core a.out*~$(shlib) lib$(NAME)$(DLSUFFIX)
8289

8390
depdepend:
8491

85-
install: lib$(NAME).a$(shlib)$(install-shlib-dep)
86-
$(INSTALL)$(INSTLOPTS) lib$(NAME).a$(LIBDIR)
92+
.PHONY: install install-libecpg install-shlib
93+
94+
install: install-libecpg$(install-shlib-dep)
95+
96+
install-libecpg: lib$(NAME).a
97+
$(INSTALL)$(INSTL_LIB_OPTS) lib$(NAME).a$(LIBDIR)/lib$(NAME).a
98+
99+
install-shlib:$(shlib)
100+
$(INSTALL)$(INSTL_SHLIB_OPTS)$(shlib)$(LIBDIR)/$(shlib)
101+
if ["$(shlib)"!="lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)" ];then \
102+
cd$(LIBDIR);\
103+
rm -f lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION);\
104+
$(LN_S)$(shlib) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION);\
105+
fi
106+
if ["$(shlib)"!="lib$(NAME)$(DLSUFFIX)" ];then \
107+
cd$(LIBDIR);\
108+
rm -f lib$(NAME)$(DLSUFFIX);\
109+
$(LN_S)$(shlib) lib$(NAME)$(DLSUFFIX);\
110+
fi
87111

88-
install-shlib:
89-
$(INSTALL)$(INSTLOPTS)$(shlib)$(LIBDIR)
90-
cd$(LIBDIR)&&$(LN_S) -f$(shlib) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
91-
cd$(LIBDIR)&&$(LN_S) -f$(shlib) lib$(NAME)$(DLSUFFIX)
92-
93112

94113
uninstall::
95114
rm -f$(LIBDIR)/lib$(NAME).a$(LIBDIR)/$(shlib)
@@ -103,8 +122,3 @@ ecpglib.o : ecpglib.c ../include/ecpglib.h ../include/ecpgtype.h
103122
$(CC)$(CFLAGS) -I../include$(PQ_INCLUDE) -c$< -o$@
104123
typename.o : typename.c ../include/ecpgtype.h
105124
$(CC)$(CFLAGS) -I../include$(PQ_INCLUDE) -c$< -o$@
106-
107-
ecpglib.sho : ecpglib.c ../include/ecpglib.h ../include/ecpgtype.h
108-
$(CC)$(CFLAGS)$(CFLAGS_SL) -I../include$(PQ_INCLUDE) -c$< -o$@
109-
typename.sho : typename.c ../include/ecpgtype.h
110-
$(CC)$(CFLAGS)$(CFLAGS_SL) -I../include$(PQ_INCLUDE) -c$< -o$@

‎src/interfaces/libpgtcl/Makefile.in‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.31 1998/10/14 16:12:54thomas Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.32 1998/10/18 19:40:54tgl Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -130,7 +130,7 @@ $(shlib): $(OBJS)
130130
$(LD)$(LDFLAGS_SL) -o$@$(OBJS)$(LIBPQ)
131131

132132
.PHONY: beforeinstall-headers install-headers
133-
.PHONY: install install-libpgtcl
133+
.PHONY: install install-libpgtcl install-shlib
134134

135135
install: install-headers install-libpgtcl$(install-shlib-dep)
136136

@@ -144,14 +144,20 @@ install-libpgtcl: lib$(NAME).a
144144
$(INSTALL)$(INSTL_LIB_OPTS) lib$(NAME).a$(LIBDIR)/lib$(NAME).a
145145

146146
install-shlib:$(shlib)
147-
$(INSTALL)$(INSTL_SHLIB_OPTS)$(shlib)\
148-
$(LIBDIR)/$(shlib)
149-
rm -f$(LIBDIR)/lib$(NAME)$(DLSUFFIX)
150-
cd$(LIBDIR)&&$(LN_S) -f$(shlib) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
151-
cd$(LIBDIR)&&$(LN_S) -f$(shlib) lib$(NAME)$(DLSUFFIX)
147+
$(INSTALL)$(INSTL_SHLIB_OPTS)$(shlib)$(LIBDIR)/$(shlib)
148+
if ["$(shlib)"!="lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)" ];then \
149+
cd$(LIBDIR);\
150+
rm -f lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION);\
151+
$(LN_S)$(shlib) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION);\
152+
fi
153+
if ["$(shlib)"!="lib$(NAME)$(DLSUFFIX)" ];then \
154+
cd$(LIBDIR);\
155+
rm -f lib$(NAME)$(DLSUFFIX);\
156+
$(LN_S)$(shlib) lib$(NAME)$(DLSUFFIX);\
157+
fi
152158

153159
.PHONY: clean
154160
clean:
155-
rm -f$(OBJS)$(shlib) lib$(NAME).a lib$(NAME)$(DLSUFFIX)
161+
rm -f$(OBJS)$(shlib) lib$(NAME).a
156162

157163
depdepend:

‎src/interfaces/libpq++/Makefile.in‎

Lines changed: 97 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,23 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.8 1998/10/13 14:12:22 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.9 1998/10/18 19:40:55 tgl Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

14-
SRCDIR= ../..
14+
NAME= pq++
15+
SO_MAJOR_VERSION= 2
16+
SO_MINOR_VERSION= 0
17+
18+
SRCDIR= @top_srcdir@
1519
include$(SRCDIR)/Makefile.global
16-
SRCHEADERDIR =$(SRCDIR)/include
17-
LIBPQHEADERDIR =$(SRCHEADERDIR)/libpq
1820

19-
LIBNAME= libpq++
21+
PORTNAME=@PORTNAME@
2022

2123
CXX=@CXX@
2224

23-
PORTNAME=@PORTNAME@
25+
SRCHEADERDIR =$(SRCDIR)/include
26+
LIBPQHEADERDIR =$(SRCHEADERDIR)/libpq
2427

2528
# We have to override -Werror, which makes warnings, fatal, because we
2629
# inevitably get the warning, "abstract declarator used as declaration"
@@ -48,90 +51,119 @@ endif
4851
OBJS = pgenv.o pgconnection.o pgtransdb.o pgcursordb.o pglobject.o
4952

5053
# Shared library stuff
51-
SHLIB :=
52-
INSTALL-SHLIB-DEP :=
54+
shlib :=
55+
install-shlib-dep :=
56+
5357
ifeq ($(PORTNAME), linux)
54-
INSTALL-SHLIB-DEP := install-shlib
55-
SHLIB := libpq++.so.1
56-
LDFLAGS_SL = -shared -soname$(SHLIB)
57-
CFLAGS +=$(CFLAGS_SL)
58+
install-shlib-dep:= install-shlib
59+
shlib:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
60+
LDFLAGS_SL:= -shared -soname lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
61+
CFLAGS+=$(CFLAGS_SL)
62+
endif
63+
64+
ifeq ($(PORTNAME), bsd)
65+
ifdef BSD_SHLIB
66+
install-shlib-dep:= install-shlib
67+
shlib:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
68+
LDFLAGS_SL:= -x -Bshareable -Bforcearchive
69+
CFLAGS+=$(CFLAGS_SL)
70+
endif
71+
endif
72+
73+
ifeq ($(PORTNAME), bsdi)
74+
ifdef BSD_SHLIB
75+
ifeq ($(DLSUFFIX), .so)
76+
install-shlib-dep := install-shlib
77+
shlib:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
78+
LDFLAGS_SL+= -shared
79+
CFLAGS+=$(CFLAGS_SL)
80+
endif
81+
ifeq ($(DLSUFFIX), .o)
82+
install-shlib-dep:= install-shlib
83+
shlib:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
84+
LD:= shlicc
85+
LDFLAGS_SL += -O -r
86+
CFLAGS+=$(CFLAGS_SL)
87+
endif
88+
endif
5889
endif
5990

6091
ifeq ($(PORTNAME), solaris_sparc)
61-
INSTALL-SHLIB-DEP:= install-shlib
62-
SHLIB:=libpq++.so.1
63-
LDFLAGS_SL= -G -shared
64-
CFLAGS+=$(CFLAGS_SL)
92+
install-shlib-dep:= install-shlib
93+
shlib:=lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
94+
LDFLAGS_SL:= -G
95+
CFLAGS+=$(CFLAGS_SL)
6596
endif
6697

6798
ifeq ($(PORTNAME), solaris_i386)
68-
INSTALL-SHLIB-DEP:= install-shlib
69-
SHLIB:=libpq++.so.1
70-
LDFLAGS_SL= -G -shared
71-
CFLAGS+=$(CFLAGS_SL)
99+
install-shlib-dep:= install-shlib
100+
shlib:=lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
101+
LDFLAGS_SL:= -G
102+
CFLAGS+=$(CFLAGS_SL)
72103
endif
73104

74105
ifeq ($(PORTNAME), svr4)
75-
INSTALL-SHLIB-DEP:= install-shlib
76-
SHLIB:=libpq++.so.1
77-
LDFLAGS_SL= -G -shared -soname$(SHLIB)
78-
CFLAGS+=$(CFLAGS_SL)
106+
install-shlib-dep:= install-shlib
107+
shlib:=lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
108+
LDFLAGS_SL:= -G
109+
CFLAGS+=$(CFLAGS_SL)
79110
endif
80111

81112
ifeq ($(PORTNAME), unixware)
82-
install-shlib-dep:= install-shlib
83-
shlib:=libpq.so.1
84-
LDFLAGS_SL= -G -z text
85-
CFLAGS+=$(CFLAGS_SL)
113+
install-shlib-dep:= install-shlib
114+
shlib:=lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
115+
LDFLAGS_SL:= -G -z text
116+
CFLAGS+=$(CFLAGS_SL)
86117
ifeq ($(CXX), CC)
87118
CXXFLAGS += -Xw
88119
COMPILE.cc =$(CXX)$(CXXFLAGS:ll,alloca=ll)$(CPPFLAGS)$(TARGET_ARCH) -c
89120
endif
90121
endif
91122

92123
ifeq ($(PORTNAME), univel)
93-
install-shlib-dep:= install-shlib
94-
shlib:=libpq.so.1
95-
LDFLAGS_SL= -G -z text
96-
CFLAGS+=$(CFLAGS_SL)
124+
install-shlib-dep:= install-shlib
125+
shlib:=lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
126+
LDFLAGS_SL:= -G -z text
127+
CFLAGS+=$(CFLAGS_SL)
97128
ifeq ($(CXX), CC)
98129
CXXFLAGS += -Xw
99130
COMPILE.cc =$(CXX)$(CXXFLAGS:ll,alloca=ll)$(CPPFLAGS)$(TARGET_ARCH) -c
100131
endif
101132
endif
102133

103134
ifeq ($(PORTNAME), hpux)
104-
install-shlib-dep:= install-shlib
105-
shlib:=libpq.sl
106-
LDFLAGS_SL= -b
107-
CFLAGS+=$(CFLAGS_SL)
135+
install-shlib-dep:= install-shlib
136+
shlib:=lib$(NAME).sl
137+
LDFLAGS_SL:= -b
138+
CFLAGS+=$(CFLAGS_SL)
108139
endif
109140

110-
all:$(LIBNAME).a$(SHLIB)
111141

112-
$(LIBNAME).a:$(OBJS)
142+
all: libpq++.a$(shlib)
143+
144+
libpq++.a:$(OBJS)
113145
ifdefMK_NO_LORDER
114-
$(AR) $(AROPT)$(LIBNAME).a $(OBJS)
146+
$(AR) $(AROPT)libpq++.a $(OBJS)
115147
else
116-
$(AR) $(AROPT)$(LIBNAME).a `lorder $(OBJS) | tsort`
148+
$(AR) $(AROPT)libpq++.a `lorder $(OBJS) | tsort`
117149
endif
118-
$(RANLIB)$(LIBNAME).a
150+
$(RANLIB)libpq++.a
119151

120-
$(SHLIB):$(OBJS)
121-
$(LD)$(LDFLAGS)$(LDFLAGS_SL) -o$@$(OBJS)
152+
$(shlib):$(OBJS)
153+
$(LD)$(LDFLAGS_SL) -o$@$(OBJS)
122154

123155
.PHONY: examples
124156
examples:
125157
$(MAKE) -C examples all
126158

127159
.PHONY: beforeinstall-headers install-headers
128-
.PHONY: install beforeinstall-lib install-$(LIBNAME)
160+
.PHONY: install beforeinstall-lib install-libpq++ install-shlib
129161

130-
install: install-headers install-$(LIBNAME)$(INSTALL-SHLIB-DEP)
162+
install: install-headers install-libpq++$(install-shlib-dep)
131163

132-
LIBPGXXDIR =$(LIBNAME)
164+
LIBPGXXDIR =libpq++
133165
LIBPGXXHEADERDIR =$(HEADERDIR)/$(LIBPGXXDIR)
134-
MAINHEADER =$(LIBNAME).h
166+
MAINHEADER =libpq++.h
135167
LIBPGXXHEADERS = pgenv.h\
136168
pgconnection.h\
137169
pgdatabase.h\
@@ -153,16 +185,25 @@ beforeinstall-headers:
153185
beforeinstall-lib:
154186
@if [!-d$(LIBDIR) ];then mkdir$(LIBDIR);fi
155187

156-
install-$(LIBNAME):$(LIBNAME).a beforeinstall-lib
157-
$(INSTALL)$(INSTL_LIB_OPTS)$(LIBNAME).a$(LIBDIR)/$(LIBNAME).a
158-
159-
install-shlib:$(SHLIBNAME) beforeinstall-lib
160-
$(INSTALL)$(INSTL_SHLIB_OPTS)$(SHLIB)$(LIBDIR)/$(SHLIB)
161-
rm -f$(LIBDIR)/libpq++.so
162-
$(LN_S) -f$(SHLIB)$(LIBDIR)/libpq++.so
163-
188+
install-libpq++: libpq++.a beforeinstall-lib
189+
$(INSTALL)$(INSTL_LIB_OPTS) libpq++.a$(LIBDIR)/libpq++.a
190+
191+
install-shlib:$(shlib)
192+
$(INSTALL)$(INSTL_SHLIB_OPTS)$(shlib)$(LIBDIR)/$(shlib)
193+
if ["$(shlib)"!="lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)" ];then \
194+
cd$(LIBDIR);\
195+
rm -f lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION);\
196+
$(LN_S)$(shlib) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION);\
197+
fi
198+
if ["$(shlib)"!="lib$(NAME)$(DLSUFFIX)" ];then \
199+
cd$(LIBDIR);\
200+
rm -f lib$(NAME)$(DLSUFFIX);\
201+
$(LN_S)$(shlib) lib$(NAME)$(DLSUFFIX);\
202+
fi
203+
204+
.PHONY: clean
164205
clean:
165-
rm -f$(LIBNAME).a$(OBJS)
206+
rm -flibpq++.a$(shlib)$(OBJS)
166207
$(MAKE) -C examples clean
167208

168209
depdepend:

‎src/interfaces/libpq/Makefile.in‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.38 1998/10/14 16:13:03 thomas Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.39 1998/10/18 19:40:55 tgl Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -117,6 +117,7 @@ ifeq ($(PORTNAME), hpux)
117117
CFLAGS+=$(CFLAGS_SL)
118118
endif
119119

120+
120121
all: libpq.a$(shlib)
121122

122123
libpq.a:$(OBJS)
@@ -158,7 +159,7 @@ $(shlib): $(OBJS)
158159

159160

160161
.PHONY: beforeinstall-headers install-headers
161-
.PHONY: install install-libpq install-shlib-dep
162+
.PHONY: install install-libpq install-shlib
162163

163164
install: install-headers install-libpq$(install-shlib-dep)
164165

@@ -228,20 +229,26 @@ install-libpq: libpq.a
228229

229230
install-shlib:$(shlib)
230231
$(INSTALL)$(INSTL_SHLIB_OPTS)$(shlib)$(LIBDIR)/$(shlib)
231-
rm -f$(LIBDIR)/lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
232-
rm -f$(LIBDIR)/lib$(NAME)$(DLSUFFIX)
233-
cd$(LIBDIR)&&$(LN_S) -f$(shlib) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
234-
cd$(LIBDIR)&&$(LN_S) -f$(shlib) lib$(NAME)$(DLSUFFIX)
235-
232+
if ["$(shlib)"!="lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)" ];then \
233+
cd$(LIBDIR);\
234+
rm -f lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION);\
235+
$(LN_S)$(shlib) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION);\
236+
fi
237+
if ["$(shlib)"!="lib$(NAME)$(DLSUFFIX)" ];then \
238+
cd$(LIBDIR);\
239+
rm -f lib$(NAME)$(DLSUFFIX);\
240+
$(LN_S)$(shlib) lib$(NAME)$(DLSUFFIX);\
241+
fi
236242

237-
dependdep:
238-
$(CC) -MM$(CFLAGS)*.c>depend
239243

240244
.PHONY: clean
241245
clean:
242246
rm -f libpq.a$(shlib)$(OBJS)
243247
rm -f dllist.c common.c wchar.c conv.c
244248

249+
dependdep:
250+
$(CC) -MM$(CFLAGS)*.c>depend
251+
245252
ifeq (depend,$(wildcard depend))
246253
include depend
247254
endif

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp