]> granicus.if.org Git - postgresql/blobdiff - src/Makefile.shlib
Replace the BufMgrLock with separate locks on the lookup hashtable and
[postgresql] / src / Makefile.shlib
index 300d8854470438c7a8511e130944080781b6bc35..002071e06cc1afe9b3a6bc8f14adadd20cd17ef1 100644 (file)
@@ -6,7 +6,7 @@
 # Copyright (c) 1998, Regents of the University of California
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/Makefile.shlib,v 1.76 2004/05/19 21:37:43 momjian Exp $
+#    $PostgreSQL: pgsql/src/Makefile.shlib,v 1.90 2004/11/20 21:13:04 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -31,6 +31,8 @@
 # DLLTOOL_DEFFLAGS      Additional flags when creating the dll .def file
 # DLLTOOL_LIBFLAGS      Additional flags when creating the lib<module>.a file
 # DLLWRAP_FLAGS         Additional flags to dllwrap
+# DLL_DEFFILE           Use pre-existing .def file instead of auto-generating
+#                       one with all exports in it (win32 only).
 #
 # The module Makefile must also include
 # $(top_builddir)/src/Makefile.global before including this file.
@@ -71,8 +73,14 @@ LINK.static = $(AR) $(AROPT)
 
 ifeq ($(enable_shared), yes)
 
+# Default shlib naming convention used by the majority of platforms
+shlib          = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+shlib_major    = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
+shlib_bare     = lib$(NAME)$(DLSUFFIX)
+
 # For each platform we support shared libraries on, set shlib to the
-# name of the library, LINK.shared to the command to link the library,
+# name of the library (if default above is not right), set
+# LINK.shared to the command to link the library,
 # and adjust SHLIB_LINK if necessary.
 
 # Try to keep the sections in some kind of order, folks...
@@ -82,17 +90,28 @@ override CFLAGS += $(CFLAGS_SL)
 soname = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
 
 ifeq ($(PORTNAME), aix)
-  shlib                        := lib$(NAME)$(DLSUFFIX)
+  shlib                        = lib$(NAME)$(DLSUFFIX)
 #   SHLIB_LINK         += -lc
 endif
 
 ifeq ($(PORTNAME), darwin)
-  shlib                        := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
-  LINK.shared          = $(COMPILER) -bundle
+  ifneq ($(SO_MAJOR_VERSION), 0)
+    version_link       := -compatibility_version $(SO_MAJOR_VERSION) -current_version $(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+  endif
+  ifeq ($(DLTYPE), library)
+    # linkable library
+    DLSUFFIX           := .dylib
+    LINK.shared                = $(COMPILER) -dynamiclib -install_name $(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX) $(version_link) -multiply_defined suppress
+  else
+    # loadable module (default case)
+    DLSUFFIX           := .so
+    LINK.shared                = $(COMPILER) -bundle
+  endif
+  shlib                        = lib$(NAME).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)$(DLSUFFIX)
+  shlib_major          = lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)
 endif
 
 ifeq ($(PORTNAME), openbsd)
-  shlib                        := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
   ifdef ELF_SYSTEM
     LINK.shared                = $(COMPILER) -shared -Wl,-x,-soname,$(soname)
     SHLIB_LINK         += -lc
@@ -102,7 +121,6 @@ ifeq ($(PORTNAME), openbsd)
 endif
 
 ifeq ($(PORTNAME), bsdi)
-  shlib                        := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
   ifeq ($(DLSUFFIX), .so)
     LINK.shared                = $(COMPILER) -shared -Wl,-x,-soname,$(soname)
     SHLIB_LINK         += -lc
@@ -114,16 +132,15 @@ endif
 
 ifeq ($(PORTNAME), freebsd)
   ifdef ELF_SYSTEM
-    shlib              := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
+    shlib              = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
     LINK.shared                = $(COMPILER) -shared -Wl,-x,-soname,$(soname)
   else
-    shlib              := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+    shlib              = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
     LINK.shared                = $(LD) -x -Bshareable -Bforcearchive
   endif
 endif
 
 ifeq ($(PORTNAME), netbsd)
-  shlib                        := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
   ifdef ELF_SYSTEM
     LINK.shared                = $(COMPILER) -shared -Wl,-x,-soname,$(soname)
   else
@@ -132,25 +149,33 @@ ifeq ($(PORTNAME), netbsd)
 endif
 
 ifeq ($(PORTNAME), hpux)
-  shlib                        := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
-  LINK.shared          = $(LD) +h $(soname) -b +b $(libdir)
+  shlib                        = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
   ifeq ($(GCC), yes)
-    SHLIB_LINK         += `$(CC) -print-libgcc-file-name`
+    SHLIB_LINK         += `$(CC) $(LDFLAGS) -print-libgcc-file-name`
+  endif
+  ifeq ($(with_gnu_ld), yes)
+    LINK.shared                = $(CC) $(LDFLAGS) -shared -Wl,-h -Wl,$(soname)
+  else
+    # can't use the CC-syntax rpath pattern here
+    rpath =
+    ifeq ($(enable_rpath), yes)
+      LINK.shared      = $(LD) +h $(soname) -b +b $(rpathdir)
+    else
+      LINK.shared      = $(LD) +h $(soname) -b
+    endif
   endif
 endif
 
 ifeq ($(PORTNAME), irix)
-  shlib                        := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
+  shlib                        = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
   LINK.shared          = $(COMPILER) -shared -Wl,-set_version,sgi$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
 endif
 
 ifeq ($(PORTNAME), linux)
-  shlib                        := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
   LINK.shared          = $(COMPILER) -shared -Wl,-soname,$(soname)
 endif
 
 ifeq ($(PORTNAME), solaris)
-  shlib                        := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
   ifeq ($(GCC), yes)
     LINK.shared                = $(CC) -shared
   else
@@ -164,17 +189,14 @@ ifeq ($(PORTNAME), solaris)
 endif
 
 ifeq ($(PORTNAME), sunos4)
-  shlib                        := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
   LINK.shared          = $(LD) -assert pure-text -Bdynamic
 endif
  
 ifeq ($(PORTNAME), osf)
-  shlib                        := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
   LINK.shared          = $(LD) -shared -expect_unresolved '*'
 endif
 
 ifeq ($(PORTNAME), sco)
-  shlib                        := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
   ifeq ($(GCC), yes)
     LINK.shared                = $(CC) -shared
   else
@@ -184,17 +206,14 @@ ifeq ($(PORTNAME), sco)
 endif
 
 ifeq ($(PORTNAME), svr4)
-  shlib                        := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
   LINK.shared          = $(LD) -G
 endif
 
 ifeq ($(PORTNAME), univel)
-  shlib                        := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
   LINK.shared          = $(LD) -G -z text
 endif
 
 ifeq ($(PORTNAME), unixware)
-  shlib                        := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
   ifeq ($(GCC), yes)
     LINK.shared                = $(CC) -shared
   else
@@ -204,15 +223,19 @@ ifeq ($(PORTNAME), unixware)
 endif
 
 ifeq ($(PORTNAME), cygwin)
-  shlib                        := $(NAME)$(DLSUFFIX)
+  shlib                        = $(NAME)$(DLSUFFIX)
+  # needed for /contrib modules, not sure why
+  SHLIB_LINK           += $(LIBS)
+  haslibarule   = yes
 endif
 
 ifeq ($(PORTNAME), win32)
-  shlib                        := lib$(NAME)$(DLSUFFIX)
+  shlib                        = lib$(NAME)$(DLSUFFIX)
+  haslibarule   = yes
 endif
 
 ifeq ($(PORTNAME), beos)
-  shlib                        := lib$(NAME)$(DLSUFFIX)
+  shlib                        = lib$(NAME)$(DLSUFFIX)
   LINK.shared          = $(LD) -nostart
   SHLIB_LINK           += -ltermcap -lstdc++.r4 -lbind -lsocket -L/boot/develop/lib/x86
 endif
@@ -238,13 +261,11 @@ all-static-lib: lib$(NAME).a
 
 all-shared-lib: $(shlib)
 
-ifneq ($(PORTNAME), cygwin)
-ifneq ($(PORTNAME), win32)
-
 ifndef LORDER
 MK_NO_LORDER := true
 endif
 
+ifndef haslibarule
 lib$(NAME).a: $(OBJS)
 ifdef MK_NO_LORDER
        $(LINK.static) $@ $^
@@ -252,29 +273,27 @@ else
        $(LINK.static) $@ `$(LORDER) $^ | tsort`
 endif
        $(RANLIB) $@
-
-endif # not win32
-endif # not cygwin
+endif #haslibarule
 
 ifeq ($(enable_shared), yes)
 
-ifneq ($(PORTNAME), beos)
-ifneq ($(PORTNAME), cygwin)
 ifneq ($(PORTNAME), win32)
+ifneq ($(PORTNAME), cygwin)
+ifneq ($(PORTNAME), beos)
 ifneq ($(PORTNAME), aix)
 
 # Normal case
 $(shlib): $(OBJS)
-       $(LINK.shared) $(OBJS) $(SHLIB_LINK) -o $@
+       $(LINK.shared) $(LDFLAGS_SL) $(OBJS) $(SHLIB_LINK) -o $@
 # If we're using major and minor versions, then make a symlink to major-version-only.
-ifneq ($(shlib), lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION))
-       rm -f lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
-       $(LN_S) $(shlib) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
+ifneq ($(shlib), $(shlib_major))
+       rm -f $(shlib_major)
+       $(LN_S) $(shlib) $(shlib_major)
 endif
 # Make sure we have a link to a name without any version numbers
-ifneq ($(shlib), lib$(NAME)$(DLSUFFIX))
-       rm -f lib$(NAME)$(DLSUFFIX)
-       $(LN_S) $(shlib) lib$(NAME)$(DLSUFFIX)
+ifneq ($(shlib), $(shlib_bare))
+       rm -f $(shlib_bare)
+       $(LN_S) $(shlib) $(shlib_bare)
 endif
 
 else # PORTNAME == aix
@@ -286,37 +305,44 @@ $(shlib): lib$(NAME).a
        
 endif # PORTNAME == aix
 
-else # PORTNAME == win32
+else # PORTNAME == beos
 
-# win32 case
-$(shlib) lib$(NAME).a: $(OBJS)
-       $(DLLTOOL) --export-all $(DLLTOOL_DEFFLAGS) --output-def $(NAME).def $(OBJS)
-       $(DLLWRAP) -o $(shlib) --dllname $(shlib) $(DLLWRAP_FLAGS) --def $(NAME).def $(OBJS) $(SHLIB_LINK)
-       $(DLLTOOL) --dllname $(shlib) $(DLLTOOL_LIBFLAGS) --def $(NAME).def --output-lib lib$(NAME).a
+# BEOS case
+$(shlib): $(OBJS)
+       ln -fs $(top_srcdir)/src/backend/postgres _APP_
+       $(CC) -Xlinker -soname=$@ $(LDFLAGS_SL) -o $@ _APP_ $(OBJS) $(SHLIB_LINK)
 
-endif # PORTNAME == win32
+endif # PORTNAME == beos
 
 else # PORTNAME == cygwin
 
 # Cygwin case
-$(shlib) lib$(NAME).a: $(OBJS) $(DLLINIT)
+$(shlib) lib$(NAME).a: $(OBJS)
+ifndef DLL_DEFFILE
        $(DLLTOOL) --export-all $(DLLTOOL_DEFFLAGS) --output-def $(NAME).def $(OBJS)
-       $(DLLWRAP) -o $(shlib) --dllname $(shlib) $(DLLWRAP_FLAGS) --def $(NAME).def $(OBJS) $(DLLINIT) $(SHLIB_LINK)
+       $(DLLWRAP) $(LDFLAGS_SL) -o $(shlib) --dllname $(shlib) $(DLLWRAP_FLAGS) --def $(NAME).def $(OBJS) $(SHLIB_LINK)
        $(DLLTOOL) --dllname $(shlib) $(DLLTOOL_LIBFLAGS) --def $(NAME).def --output-lib lib$(NAME).a
-
-$(DLLINIT): $(DLLINIT:%.o=%.c)
-       $(MAKE) -C $(@D) $(@F)
+else
+       $(DLLWRAP) $(LDFLAGS_SL) -o $(shlib) --dllname $(shlib) $(DLLWRAP_FLAGS) --def $(DLL_DEFFILE) $(OBJS) $(SHLIB_LINK)
+       $(DLLTOOL) --dllname $(shlib) $(DLLTOOL_LIBFLAGS) --def $(DLL_DEFFILE) --output-lib lib$(NAME).a
+endif
 
 endif # PORTNAME == cygwin
 
-else # PORTNAME == beos
+else # PORTNAME == win32
 
-# BEOS case
-$(shlib): $(OBJS)
-       ln -fs $(top_srcdir)/src/backend/postgres _APP_
-       $(CC) -Xlinker -soname=$@ $(LDFLAGS_SL) -o $@ _APP_ $(OBJS) $(SHLIB_LINK)
+# win32 case
+$(shlib) lib$(NAME).a: $(OBJS)
+ifndef DLL_DEFFILE
+       $(DLLTOOL) --export-all $(DLLTOOL_DEFFLAGS) --output-def $(NAME).def $(OBJS)
+       $(DLLWRAP) $(LDFLAGS_SL) -o $(shlib) --dllname $(shlib) $(DLLWRAP_FLAGS) --def $(NAME).def $(OBJS) $(SHLIB_LINK)
+       $(DLLTOOL) --dllname $(shlib) $(DLLTOOL_LIBFLAGS) --def $(NAME).def --output-lib lib$(NAME).a
+else
+       $(DLLWRAP) $(LDFLAGS_SL) -o $(shlib) --dllname $(shlib) $(DLLWRAP_FLAGS) --def $(DLL_DEFFILE) $(OBJS) $(SHLIB_LINK)
+       $(DLLTOOL) --dllname $(shlib) $(DLLTOOL_LIBFLAGS) --def $(DLL_DEFFILE) --output-lib lib$(NAME).a
+endif
 
-endif # PORTNAME == beos
+endif # PORTNAME == win32
 
 endif # enable_shared
 
@@ -340,17 +366,16 @@ install-lib-shared: $(shlib)
        $(INSTALL_SHLIB) $< $(DESTDIR)$(libdir)/$(shlib)
 ifneq ($(PORTNAME), cygwin)
 ifneq ($(PORTNAME), win32)
-ifneq ($(shlib), lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION))
+ifneq ($(shlib), $(shlib_major))
        cd $(DESTDIR)$(libdir) && \
-       rm -f lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) && \
-       $(LN_S) $(shlib) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
+       rm -f $(shlib_major) && \
+       $(LN_S) $(shlib) $(shlib_major)
 endif
-ifneq ($(shlib), lib$(NAME)$(DLSUFFIX))
+ifneq ($(shlib), $(shlib_bare))
        cd $(DESTDIR)$(libdir) && \
-       rm -f lib$(NAME)$(DLSUFFIX) && \
-       $(LN_S) $(shlib) lib$(NAME)$(DLSUFFIX)
+       rm -f $(shlib_bare) && \
+       $(LN_S) $(shlib) $(shlib_bare)
 endif
-
 endif # not win32
 endif # not cygwin
 endif # enable_shared
@@ -364,9 +389,9 @@ endif # enable_shared
 uninstall-lib:
        rm -f $(DESTDIR)$(libdir)/lib$(NAME).a
 ifeq ($(enable_shared), yes)
-       rm -f $(DESTDIR)$(libdir)/lib$(NAME)$(DLSUFFIX) \
-         $(DESTDIR)$(libdir)/lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) \
-         $(DESTDIR)$(libdir)/lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+       rm -f $(DESTDIR)$(libdir)/$(shlib_bare) \
+         $(DESTDIR)$(libdir)/$(shlib_major) \
+         $(DESTDIR)$(libdir)/$(shlib)
 endif # enable_shared
 
 
@@ -378,7 +403,7 @@ endif # enable_shared
 clean-lib:
        rm -f lib$(NAME).a
 ifeq ($(enable_shared), yes)
-       rm -f lib$(NAME)$(DLSUFFIX) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+       rm -f $(shlib_bare) $(shlib_major) $(shlib)
 ifdef EXPSUFF
        rm -f lib$(NAME)$(EXPSUFF)
 endif