git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Here's a patch that will allow external modules like pl<lang> to set

2004年5月12日 21:56:27 +0000 (21:56 +0000)

committer Bruce Momjian <bruce@momjian.us>

2004年5月12日 21:56:27 +0000 (21:56 +0000)

additional flags for the dlltool and dllwrap commands. More info here:

http://archives.postgresql.org/pgsql-hackers/2004-05/msg00350.php

Thomas Hallgren

src/Makefile.shlib patch | blob | blame | history

diff --git a/src/Makefile.shlib b/src/Makefile.shlib

index 003aefb2e6c956165ef49026b0573db65ae13072..0414398d89c1f7260fcb1622167ef7ebef3313b8 100644 (file)

--- a/src/Makefile.shlib

+++ b/src/Makefile.shlib

@@ -6,7 +6,7 @@

# IDENTIFICATION

-# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.74 2003年12月01日 22:23:06 momjian Exp $

+# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.75 2004年05月12日 21:56:27 momjian Exp $

#-------------------------------------------------------------------------

@@ -26,6 +26,12 @@

# additional stuff to put in its link command

# (If you want a patchlevel, include it in SO_MINOR_VERSION, e.g., "6.2".)

+# Optional flags when building DLL's (only applicable to win32 and cygwin

+# platforms).

+# 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

# The module Makefile must also include

# $(top_builddir)/src/Makefile.global before including this file.

# (Makefile.global sets PORTNAME and other needed symbols.)

@@ -284,9 +290,9 @@ else # PORTNAME == win32

# win32 case

$(shlib) lib$(NAME).a: $(OBJS)

- $(DLLTOOL) --export-all --output-def $(NAME).def $(OBJS)

- $(DLLWRAP) -o $(shlib) --dllname $(shlib) --def $(NAME).def $(OBJS) $(SHLIB_LINK)

- $(DLLTOOL) --dllname $(shlib) --def $(NAME).def --output-lib lib$(NAME).a

+ $(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

endif # PORTNAME == win32

@@ -294,9 +300,9 @@ else # PORTNAME == cygwin

# Cygwin case

$(shlib) lib$(NAME).a: $(OBJS) $(DLLINIT)

- $(DLLTOOL) --export-all --output-def $(NAME).def $(OBJS)

- $(DLLWRAP) -o $(shlib) --dllname $(shlib) --def $(NAME).def $(OBJS) $(DLLINIT) $(SHLIB_LINK)

- $(DLLTOOL) --dllname $(shlib) --def $(NAME).def --output-lib lib$(NAME).a

+ $(DLLTOOL) --export-all $(DLLTOOL_DEFFLAGS) --output-def $(NAME).def $(OBJS)

+ $(DLLWRAP) -o $(shlib) --dllname $(shlib) $(DLLWRAP_FLAGS) --def $(NAME).def $(OBJS) $(DLLINIT) $(SHLIB_LINK)

+ $(DLLTOOL) --dllname $(shlib) $(DLLTOOL_LIBFLAGS) --def $(NAME).def --output-lib lib$(NAME).a

$(DLLINIT): $(DLLINIT:%.o=%.c)

$(MAKE) -C $(@D) $(@F)

This is the main PostgreSQL git repository.

RSS Atom