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
This commit is contained in:
Tom Lane 2014-02-19 19:34:50 -05:00
parent 52acfd27f1
commit 4f5f485d10
2 changed files with 13 additions and 17 deletions

View File

@ -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

View File

@ -0,0 +1,5 @@
; dlltool --output-def pgevent.def pgevent.o pgmsgevent.o
EXPORTS
DllUnregisterServer@0 ;
DllRegisterServer@0 ;
DllInstall ;