--- a/src/pl/tcl/Makefile +++ b/src/pl/tcl/Makefile @@ -13,10 +13,7 @@ override CPPFLAGS := -I. -I$(srcdir) $(TCL_INCLUDE_SPEC) $(CPPFLAGS) -# On Windows, we don't link directly with the Tcl library; see below -ifneq ($(PORTNAME), win32) SHLIB_LINK = $(TCL_LIB_SPEC) $(TCL_LIBS) -endif PGFILEDESC = "PL/Tcl - procedural language" @@ -32,23 +29,6 @@ REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-extension=pltcl REGRESS = pltcl_setup pltcl_queries pltcl_trigger pltcl_call pltcl_start_proc pltcl_subxact pltcl_unicode pltcl_transaction -# Tcl on win32 ships with import libraries only for Microsoft Visual C++, -# which are not compatible with mingw gcc. Therefore we need to build a -# new import library to link with. -ifeq ($(PORTNAME), win32) - -tclwithver = $(subst -l,,$(filter -l%, $(TCL_LIB_SPEC))) -TCLDLL = $(dir $(TCLSH))/$(tclwithver).dll - -OBJS += lib$(tclwithver).a - -lib$(tclwithver).a: $(tclwithver).def - dlltool --dllname $(tclwithver).dll --def $(tclwithver).def --output-lib lib$(tclwithver).a - -$(tclwithver).def: $(TCLDLL) - gendef - $^ > $@ - -endif # win32 include $(top_srcdir)/src/Makefile.shlib @@ -95,9 +75,6 @@ clean distclean: clean-lib rm -f $(OBJS) rm -rf $(pg_regress_clean_files) -ifeq ($(PORTNAME), win32) - rm -f $(tclwithver).def -endif maintainer-clean: distclean rm -f pltclerrcodes.h