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

Commit 9b895d0

Browse files
author
Thomas G. Lockhart
committed
Clean up library names and installation paths.
Include soft links in the installation directory for major version number. Use the existing $(DLSUFFIX) parameter to name shared library.
1 parent bbf4dae commit 9b895d0

File tree

3 files changed

+105
-96
lines changed

3 files changed

+105
-96
lines changed

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

+26-21
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
SRCDIR= ../../..
1+
NAME= ecpg
2+
SO_MAJOR_VERSION= 2
3+
SO_MINOR_VERSION= 6
4+
SO_PATCHLEVEL= 2
5+
6+
SRCDIR= @top_srcdir@
7+
28
include $(SRCDIR)/Makefile.global
39

410
PQ_INCLUDE=-I$(SRCDIR)/interfaces/libpq
511

6-
SO_MAJOR_VERSION=2
7-
SO_MINOR_VERSION=6
8-
SO_PATCHLEVEL=2
9-
1012
PORTNAME=@PORTNAME@
1113

1214
ifdef KRBVERS
@@ -21,78 +23,81 @@ ifeq ($(PORTNAME), linux)
2123
LINUX_ELF=@LINUX_ELF@
2224
ifdef LINUX_ELF
2325
install-shlib-dep := install-shlib
24-
shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION).$(SO_PATCHLEVEL)
25-
LDFLAGS_SL = -shared -soname libecpg.so.$(SO_MAJOR_VERSION)
26+
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION).$(SO_PATCHLEVEL)
27+
LDFLAGS_SL = -shared -soname lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
2628
endif
2729
endif
2830

2931
ifeq ($(PORTNAME), bsd)
3032
ifdef BSD_SHLIB
3133
install-shlib-dep := install-shlib
32-
shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION).$(SO_PATCHLEVEL)
34+
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION).$(SO_PATCHLEVEL)
3335
LDFLAGS_SL = -x -Bshareable -Bforcearchive
3436
CFLAGS += $(CFLAGS_SL)
3537
endif
3638
endif
3739

3840
ifeq ($(PORTNAME), solaris_sparc)
3941
install-shlib-dep := install-shlib
40-
shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION).$(SO_PATCHLEVEL)
42+
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION).$(SO_PATCHLEVEL)
4143
LDFLAGS_SL = -G
4244
CFLAGS += $(CFLAGS_SL)
4345
endif
4446

4547
ifeq ($(PORTNAME), solaris_i386)
4648
install-shlib-dep := install-shlib
47-
shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION).$(SO_PATCHLEVEL)
49+
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION).$(SO_PATCHLEVEL)
4850
LDFLAGS_SL = -G
4951
CFLAGS += $(CFLAGS_SL)
5052
endif
5153

5254
ifeq ($(PORTNAME), svr4)
5355
install-shlib-dep := install-shlib
54-
shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION).$(SO_PATCHLEVEL)
56+
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION).$(SO_PATCHLEVEL)
5557
LDFLAGS_SL = -G
5658
CFLAGS += $(CFLAGS_SL)
5759
endif
5860

5961
ifeq ($(PORTNAME), univel)
6062
install-shlib-dep := install-shlib
61-
shlib := libecpg.so.1
63+
shlib := lib$(NAME)$(DLSUFFIX).1
6264
LDFLAGS_SL = -G -z text
6365
CFLAGS += $(CFLAGS_SL)
6466
endif
6567

6668
ifeq ($(PORTNAME), unixware)
6769
install-shlib-dep := install-shlib
68-
shlib := libecpg.so.1
70+
shlib := lib$(NAME)$(DLSUFFIX).1
6971
LDFLAGS_SL = -G -z text
7072
CFLAGS += $(CFLAGS_SL)
7173
endif
7274

73-
all: libecpg.a $(shlib)
75+
all: lib$(NAME).a $(shlib)
7476

7577
$(shlib): ecpglib.sho typename.sho
7678
$(LD) $(LDFLAGS_SL) -o $@ ecpglib.sho typename.sho
77-
$(LN_S) -f $@ libecpg.so
7879

7980
clean:
80-
rm -f *.o *.sho *.a core a.out *~ $(shlib) libecpg.so
81+
rm -f *.o *.sho *.a core a.out *~ $(shlib) lib$(NAME)$(DLSUFFIX)
8182

8283
dep depend:
8384

84-
install: libecpg.a $(shlib) $(install-shlib-dep)
85-
$(INSTALL) $(INSTLOPTS) libecpg.a $(LIBDIR)
85+
install: lib$(NAME).a $(shlib) $(install-shlib-dep)
86+
$(INSTALL) $(INSTLOPTS) lib$(NAME).a $(LIBDIR)
8687

8788
install-shlib:
8889
$(INSTALL) $(INSTLOPTS) $(shlib) $(LIBDIR)
89-
$(LN_S) -f $(shlib) $(LIBDIR)/libecpg.so
90+
cd $(LIBDIR) && $(LN_S) -f $(shlib) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
91+
cd $(LIBDIR) && $(LN_S) -f $(shlib) lib$(NAME)$(DLSUFFIX)
92+
9093

9194
uninstall::
92-
rm -f $(LIBDIR)/libecpg.a $(LIBDIR)/$(shlib)
95+
rm -f $(LIBDIR)/lib$(NAME).a $(LIBDIR)/$(shlib)
96+
rm -f $(LIBDIR)/lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
97+
rm -f $(LIBDIR)/lib$(NAME)$(DLSUFFIX)
9398

9499
# Rules that do something
95-
libecpg.a : libecpg.a(ecpglib.o) libecpg.a(typename.o)
100+
lib$(NAME).a : lib$(NAME).a(ecpglib.o) lib$(NAME).a(typename.o)
96101

97102
ecpglib.o : ecpglib.c ../include/ecpglib.h ../include/ecpgtype.h
98103
$(CC) $(CFLAGS) -I../include $(PQ_INCLUDE) -c $< -o $@

‎src/interfaces/libpgtcl/Makefile.in

+41-40
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.30 1998/10/12 02:40:59 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.31 1998/10/14 16:12:54 thomas Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

14-
SO_MAJOR_VERSION=2
15-
SO_MINOR_VERSION=0
14+
NAME= pgtcl
15+
SO_MAJOR_VERSION= 2
16+
SO_MINOR_VERSION= 0
1617

17-
SRCDIR= ../..
18+
SRCDIR= @top_srcdir@
1819
include $(SRCDIR)/Makefile.global
1920

2021
INCLUDE_OPT= \
@@ -34,100 +35,99 @@ endif
3435
install-shlib-dep :=
3536
shlib :=
3637

37-
LIBPQ = -L$(SRCDIR)/interfaces/libpq -lpq
38+
LIBPQ= -L$(SRCDIR)/interfaces/libpq -lpq
3839

3940
ifeq ($(PORTNAME), linux)
4041
install-shlib-dep := install-shlib
41-
shlib := libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
42-
CFLAGS += $(CFLAGS_SL)
42+
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
43+
CFLAGS += $(CFLAGS_SL)
4344
LDFLAGS_SL = -shared
4445
endif
4546

4647
ifeq ($(PORTNAME), bsd)
4748
ifdef BSD_SHLIB
4849
install-shlib-dep := install-shlib
49-
shlib := libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
50-
LDFLAGS_SL = -x -Bshareable -Bforcearchive
51-
CFLAGS += $(CFLAGS_SL)
50+
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
51+
LDFLAGS_SL = -x -Bshareable -Bforcearchive
52+
CFLAGS += $(CFLAGS_SL)
5253
endif
5354
endif
5455

5556
ifeq ($(PORTNAME), bsdi)
5657
ifdef BSD_SHLIB
5758
ifeq ($(DLSUFFIX), .so)
5859
install-shlib-dep := install-shlib
59-
shlib := libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
60-
LDFLAGS_SL += -shared
61-
CFLAGS += $(CFLAGS_SL)
60+
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
61+
LDFLAGS_SL += -shared
62+
CFLAGS += $(CFLAGS_SL)
6263
endif
6364
ifeq ($(DLSUFFIX), .o)
6465
install-shlib-dep := install-shlib
65-
shlib := libpgtcl.o.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
66-
LD := shlicc
67-
LDFLAGS_SL += -O -r
68-
CFLAGS += $(CFLAGS_SL)
66+
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
67+
LD := shlicc
68+
LDFLAGS_SL += -O -r
69+
CFLAGS += $(CFLAGS_SL)
6970
endif
7071
endif
7172
endif
7273

7374
ifeq ($(PORTNAME), solaris_sparc)
7475
install-shlib-dep := install-shlib
75-
shlib := libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
76+
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
7677
LDFLAGS_SL := -G
77-
CFLAGS += $(CFLAGS_SL)
78+
CFLAGS += $(CFLAGS_SL)
7879
endif
7980

8081
ifeq ($(PORTNAME), solaris_i386)
8182
install-shlib-dep := install-shlib
82-
shlib := libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
83+
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
8384
LDFLAGS_SL := -G
84-
CFLAGS += $(CFLAGS_SL)
85+
CFLAGS += $(CFLAGS_SL)
8586
endif
8687

8788
ifeq ($(PORTNAME), svr4)
8889
install-shlib-dep := install-shlib
89-
shlib := libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
90+
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
9091
LDFLAGS_SL := -G
91-
CFLAGS += $(CFLAGS_SL)
92+
CFLAGS += $(CFLAGS_SL)
9293
endif
9394

9495
ifeq ($(PORTNAME), unixware)
9596
install-shlib-dep := install-shlib
96-
shlib := libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
97+
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
9798
LDFLAGS_SL := -G -z text
98-
CFLAGS += $(CFLAGS_SL)
99+
CFLAGS += $(CFLAGS_SL)
99100
endif
100101

101102
ifeq ($(PORTNAME), univel)
102103
install-shlib-dep := install-shlib
103-
shlib := libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
104+
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
104105
LDFLAGS_SL := -G -z text
105-
CFLAGS += $(CFLAGS_SL)
106+
CFLAGS += $(CFLAGS_SL)
106107
endif
107108

108109
ifeq ($(PORTNAME), hpux)
109110
install-shlib-dep := install-shlib
110-
shlib := libpgtcl.sl
111+
shlib := lib$(NAME)$(DLSUFFIX)
111112
LDFLAGS_SL := -b
112-
CFLAGS += $(CFLAGS_SL)
113+
CFLAGS += $(CFLAGS_SL)
113114
endif
114115

115116
OBJS= pgtcl.o pgtclCmds.o pgtclId.o
116117

117118

118-
all: libpgtcl.a $(shlib)
119+
all: lib$(NAME).a $(shlib)
119120

120-
libpgtcl.a: $(OBJS)
121+
lib$(NAME).a: $(OBJS)
121122
ifdef MK_NO_LORDER
122-
$(AR) $(AROPT) libpgtcl.a $(OBJS)
123+
$(AR) $(AROPT) lib$(NAME).a $(OBJS)
123124
else
124-
$(AR) $(AROPT) libpgtcl.a `lorder $(OBJS) | tsort`
125+
$(AR) $(AROPT) lib$(NAME).a `lorder $(OBJS) | tsort`
125126
endif
126-
$(RANLIB) libpgtcl.a
127+
$(RANLIB) lib$(NAME).a
127128

128129
$(shlib): $(OBJS)
129130
$(LD) $(LDFLAGS_SL) -o $@ $(OBJS) $(LIBPQ)
130-
$(LN_S) -f $@ libpgtcl.so
131131

132132
.PHONY: beforeinstall-headers install-headers
133133
.PHONY: install install-libpgtcl
@@ -140,17 +140,18 @@ install-headers: beforeinstall-headers libpgtcl.h
140140
beforeinstall-headers:
141141
@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
142142

143-
install-libpgtcl: libpgtcl.a
144-
$(INSTALL) $(INSTL_LIB_OPTS) libpgtcl.a $(LIBDIR)/libpgtcl.a
143+
install-libpgtcl: lib$(NAME).a
144+
$(INSTALL) $(INSTL_LIB_OPTS) lib$(NAME).a $(LIBDIR)/lib$(NAME).a
145145

146146
install-shlib: $(shlib)
147147
$(INSTALL) $(INSTL_SHLIB_OPTS) $(shlib) \
148148
$(LIBDIR)/$(shlib)
149-
rm -f $(LIBDIR)/libpgtcl.so
150-
$(LN_S) -f $(shlib) $(LIBDIR)/libpgtcl.so
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)
151152

152153
.PHONY: clean
153154
clean:
154-
rm -f $(OBJS) $(shlib) libpgtcl.a libpgtcl.so
155+
rm -f $(OBJS) $(shlib) lib$(NAME).a lib$(NAME)$(DLSUFFIX)
155156

156157
dep depend:

0 commit comments

Comments
 (0)