Commit 41857f3c authored by Vadim B. Mikheev's avatar Vadim B. Mikheev

Additional fixes for shared library (BSD44_Derived port).

parent f91b26a5
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.24 1997/01/06 00:24:24 scrappy Exp $ # $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.25 1997/01/10 04:01:09 vadim Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -29,8 +29,11 @@ VPATH:= $(VPATH):../backend/lib ...@@ -29,8 +29,11 @@ VPATH:= $(VPATH):../backend/lib
OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-lobj.o \ OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-lobj.o \
../backend/lib/dllist.o pqsignal.o ../backend/lib/dllist.o pqsignal.o
shlib := shlib :=
install-shlib-dep :=
ifdef LINUX_ELF ifdef LINUX_ELF
install-shlib-dep := install-shlib
ifeq ($(PORTNAME), linux) ifeq ($(PORTNAME), linux)
shlib := libpq.so.1 shlib := libpq.so.1
endif endif
...@@ -62,7 +65,7 @@ fe-lobj.o: ../backend/fmgr.h ...@@ -62,7 +65,7 @@ fe-lobj.o: ../backend/fmgr.h
../backend/lib/dllist.o: ../backend/lib/dllist.o:
$(MAKE) -C ../backend/lib dllist.o $(MAKE) -C ../backend/lib dllist.o
libpq.so.1: $(OBJS) $(shlib): $(OBJS)
$(LD) $(LDFLAGS) -shared $(OBJS) -o $(shlib) $(LD) $(LDFLAGS) -shared $(OBJS) -o $(shlib)
c.h: ../include/c.h c.h: ../include/c.h
...@@ -127,16 +130,10 @@ beforeinstall-headers: ...@@ -127,16 +130,10 @@ beforeinstall-headers:
@if [ ! -d $(HEADERDIR)/access ]; \ @if [ ! -d $(HEADERDIR)/access ]; \
then mkdir $(HEADERDIR)/access; fi then mkdir $(HEADERDIR)/access; fi
ifdef LINUX_ELF
install-shlib-dep := install-shlib
else
install-shlib-dep :=
endif
install-libpq: libpq.a install-libpq: libpq.a
$(INSTALL) $(INSTL_LIB_OPTS) libpq.a $(DESTDIR)$(LIBDIR)/libpq.a $(INSTALL) $(INSTL_LIB_OPTS) libpq.a $(DESTDIR)$(LIBDIR)/libpq.a
install-shlib: libpq.so.1 install-shlib: $(shlib)
$(INSTALL) $(INSTL_LIB_OPTS) $(shlib) $(DESTDIR)$(LIBDIR)/$(shlib) $(INSTALL) $(INSTL_LIB_OPTS) $(shlib) $(DESTDIR)$(LIBDIR)/$(shlib)
depend dep: depend dep:
...@@ -144,7 +141,7 @@ depend dep: ...@@ -144,7 +141,7 @@ depend dep:
.PHONY: clean .PHONY: clean
clean: clean:
rm -f libpq.a libpq.so.1 $(OBJS) c.h rm -f libpq.a $(shlib) $(OBJS) c.h
ifeq (depend,$(wildcard depend)) ifeq (depend,$(wildcard depend))
include depend include depend
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment