diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2014-02-19 19:34:50 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2014-02-19 19:34:50 -0500 |
| commit | 4f5f485d10cad372a3a0cd8dd70780f1a32f43f0 (patch) | |
| tree | efd7bdc69a03e3c65b9034baa740e36182c3ef67 /src | |
| parent | 52acfd27f11ca586f90c2c1255ca9a4a66766b57 (diff) | |
| download | postgresql-4f5f485d10cad372a3a0cd8dd70780f1a32f43f0.tar.gz postgresql-4f5f485d10cad372a3a0cd8dd70780f1a32f43f0.zip | |
Avoid using dllwrap to build pgevent in Mingw builds.
If this works, we can get rid of configure's support for locating dllwrap
... but let's see what the buildfarm says, first.
Hiroshi Inoue
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pgevent/Makefile | 25 | ||||
| -rw-r--r-- | src/bin/pgevent/exports.txt | 5 |
2 files changed, 13 insertions, 17 deletions
diff --git a/src/bin/pgevent/Makefile b/src/bin/pgevent/Makefile index 1d902762c56..d3c73297a7e 100644 --- a/src/bin/pgevent/Makefile +++ b/src/bin/pgevent/Makefile @@ -17,30 +17,21 @@ include $(top_builddir)/src/Makefile.global ifeq ($(PORTNAME), win32) OBJS=pgevent.o pgmsgevent.o -NAME=pgevent.dll +NAME=pgevent -all: $(NAME) +SHLIB_LINK = +SHLIB_EXPORTS = exports.txt + +all: all-lib install: all install-lib -pgevent.dll: pgevent.def $(OBJS) - $(DLLWRAP) --def $< -o $(NAME) $(OBJS) +include $(top_srcdir)/src/Makefile.shlib pgmsgevent.o: pgmsgevent.rc win32ver.rc $(WINDRES) $< -o $@ --include-dir=$(top_builddir)/src/include --include-dir=$(top_srcdir)/src/include --include-dir=$(srcdir) --include-dir=. -all-lib: $(NAME) - -install-lib: $(NAME) - $(INSTALL_STLIB) $< '$(DESTDIR)$(libdir)/$<' - -uninstall-lib: - rm -f '$(DESTDIR)$(libdir)/$(NAME)' - -clean distclean: - rm -f $(OBJS) $(NAME) win32ver.rc - -clean-lib: - rm -f $(NAME) +clean distclean: clean-lib + rm -f $(OBJS) win32ver.rc endif diff --git a/src/bin/pgevent/exports.txt b/src/bin/pgevent/exports.txt new file mode 100644 index 00000000000..70dcd25bd8e --- /dev/null +++ b/src/bin/pgevent/exports.txt @@ -0,0 +1,5 @@ +; dlltool --output-def pgevent.def pgevent.o pgmsgevent.o +EXPORTS + DllUnregisterServer@0 ; + DllRegisterServer@0 ; + DllInstall ; |