--- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -85,7 +85,7 @@ # Naming convention for dynamically loadable modules shlib = $(NAME)$(DLSUFFIX) endif -stlib = lib$(NAME).a +stlib = lib$(NAME).dll.a ifndef soname # additional flags for backend modules --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -87,11 +87,11 @@ LIBS += -lsecur32 postgres: $(OBJS) $(WIN32RES) - $(CC) $(CFLAGS) $(call expand_subsys,$(OBJS)) $(WIN32RES) $(LDFLAGS) -Wl,--stack=$(WIN32_STACK_RLIMIT) -Wl,--export-all-symbols -Wl,--out-implib=libpostgres.a $(LIBS) -o $@$(X) + $(CC) $(CFLAGS) $(call expand_subsys,$(OBJS)) $(WIN32RES) $(LDFLAGS) -Wl,--stack=$(WIN32_STACK_RLIMIT) -Wl,--export-all-symbols -Wl,--out-implib=libpostgres.dll.a $(LIBS) -o $@$(X) # libpostgres.a is actually built in the preceding rule, but we need this to # ensure it's newer than postgres; see notes in src/backend/parser/Makefile -libpostgres.a: postgres +libpostgres.dll.a: postgres touch $@ endif # win32 @@ -196,7 +196,7 @@ endif ifeq ($(PORTNAME), win32) ifeq ($(MAKE_DLL), true) - $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a' + $(INSTALL_DATA) libpostgres.dll.a '$(DESTDIR)$(libdir)/libpostgres.dll.a' endif endif $(MAKE) -C catalog install-data @@ -255,7 +255,7 @@ endif ifeq ($(PORTNAME), win32) ifeq ($(MAKE_DLL), true) - rm -f '$(DESTDIR)$(libdir)/libpostgres.a' + rm -f '$(DESTDIR)$(libdir)/libpostgres.dll.a' endif endif $(MAKE) -C catalog uninstall-data @@ -277,7 +277,7 @@ rm -f postgres.dll libpostgres.a endif ifeq ($(PORTNAME), win32) - rm -f postgres.dll libpostgres.a $(WIN32RES) + rm -f postgres.dll libpostgres.dll.a $(WIN32RES) endif distclean: clean