Index: src/Makefile.shlib =================================================================== RCS file: /projects/cvsroot/pgsql-server/src/Makefile.shlib,v retrieving revision 1.67 diff -w -c -2 -r1.67 Makefile.shlib *** src/Makefile.shlib 21 Mar 2003 17:18:34 -0000 1.67 --- src/Makefile.shlib 3 Nov 2003 05:42:53 -0000 *************** *** 199,202 **** --- 199,206 ---- endif + ifeq ($(PORTNAME), win32) + shlib := lib$(NAME)$(DLSUFFIX) + endif + ifeq ($(PORTNAME), beos) shlib := lib$(NAME)$(DLSUFFIX) *************** *** 227,230 **** --- 231,235 ---- ifneq ($(PORTNAME), cygwin) + ifneq ($(PORTNAME), win32) ifndef LORDER *************** *** 240,243 **** --- 245,249 ---- $(RANLIB) $@ + endif # not win32 endif # not cygwin *************** *** 246,249 **** --- 252,256 ---- ifneq ($(PORTNAME), beos) ifneq ($(PORTNAME), cygwin) + ifneq ($(PORTNAME), win32) ifneq ($(PORTNAME), aix) *************** *** 271,274 **** --- 278,291 ---- endif # PORTNAME == aix + 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 + + endif # PORTNAME == win32 + else # PORTNAME == cygwin *************** *** 310,313 **** --- 327,331 ---- $(INSTALL_SHLIB) $< $(DESTDIR)$(libdir)/$(shlib) ifneq ($(PORTNAME), cygwin) + ifneq ($(PORTNAME), win32) ifneq ($(shlib), lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)) cd $(DESTDIR)$(libdir) && \ *************** *** 321,324 **** --- 339,343 ---- endif + endif # not win32 endif # not cygwin endif # enable_shared *************** *** 353,356 **** --- 372,379 ---- endif ifeq ($(PORTNAME), cygwin) + rm -f $(NAME).dll $(NAME).def + endif + + ifeq ($(PORTNAME), win32) rm -f $(NAME).dll $(NAME).def endif