diff options
| author | Tom Lane | 2014-02-14 22:10:53 +0000 |
|---|---|---|
| committer | Tom Lane | 2014-02-14 22:10:53 +0000 |
| commit | 638b153f2a23dadbbc5079c30f062a10be42ad11 (patch) | |
| tree | 4558a6e63c84f99b7049ecb9450baa5c634d1ead | |
| parent | 2128c52f5c476276fcaa2bc49b31f6d445365f95 (diff) | |
Fix fat-fingered makefile changes for pltcl.
I put the OBJS assignments in the wrong order. Per buildfarm.
| -rw-r--r-- | src/pl/tcl/Makefile | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile index 3f9df550341..e0fb13e56eb 100644 --- a/src/pl/tcl/Makefile +++ b/src/pl/tcl/Makefile @@ -29,15 +29,28 @@ endif endif +# On Windows, we don't link directly with the Tcl library; see below ifneq ($(PORTNAME), win32) - SHLIB_LINK = $(TCL_LIB_SPEC) $(TCL_LIBS) -lc +endif + + +NAME = pltcl + +OBJS = pltcl.o -else # win32 +DATA = pltcl.control pltcl--1.0.sql pltcl--unpackaged--1.0.sql \ + pltclu.control pltclu--1.0.sql pltclu--unpackaged--1.0.sql + +REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-extension=pltcl +REGRESS = pltcl_setup pltcl_queries +# where to find psql for running the tests +PSQLDIR = $(bindir) # 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 = $(subst -L,,$(filter -L%, $(TCL_LIB_SPEC)))/$(tclwithver).dll @@ -53,18 +66,6 @@ $(tclwithver).def: $(TCLDLL) endif # win32 -NAME = pltcl - -OBJS = pltcl.o - -DATA = pltcl.control pltcl--1.0.sql pltcl--unpackaged--1.0.sql \ - pltclu.control pltclu--1.0.sql pltclu--unpackaged--1.0.sql - -REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-extension=pltcl -REGRESS = pltcl_setup pltcl_queries -# where to find psql for running the tests -PSQLDIR = $(bindir) - include $(top_srcdir)/src/Makefile.shlib ifeq ($(TCL_SHARED_BUILD), 1) |