postgres.git / summary / log / commit / refs

commit    a7983e989d9cafc9cef49becfee054e34b1ed9b4
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Fri Feb 14 16:31:35 2014 +0000
First released in: 9.4.0

    Cosmetic improvements in plpython's make rule for libpython import library.
    
    This build technique is remarkably ugly, but that doesn't mean it has
    to be unreadable too.  Be a bit more liberal with the vertical whitespace,
    and give the .def file a proper dependency, just in case.


 src/pl/plpython/Makefile | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/pl/plpython/Makefile b/src/pl/plpython/Makefile
index 3fe8e4a7d34..46d2030d698 100644
--- a/src/pl/plpython/Makefile
+++ b/src/pl/plpython/Makefile
@@ -61,14 +61,19 @@ endif
 # which are not compatible with mingw gcc. Therefore we need to build a
 # new import library to link with.
 ifeq ($(PORTNAME), win32)
+
 pytverstr=$(subst .,,${python_version})
+PYTHONDLL=$(subst \,/,$(WINDIR))/system32/python${pytverstr}.dll
+
 OBJS += libpython${pytverstr}.a
+
 libpython${pytverstr}.a: python${pytverstr}.def
-	dlltool --dllname python${pytverstr}.dll --def python${pytverstr}.def --output-lib  libpython${pytverstr}.a
-WD=$(subst \,/,$(WINDIR))
-python${pytverstr}.def:
-	pexports $(WD)/system32/python${pytverstr}.dll > python${pytverstr}.def
-endif
+	dlltool --dllname python${pytverstr}.dll --def python${pytverstr}.def --output-lib libpython${pytverstr}.a
+
+python${pytverstr}.def: $(PYTHONDLL)
+	pexports $^ > $@
+
+endif # win32
 
 
 SHLIB_LINK = $(python_libspec) $(python_additional_libs) $(filter -lintl,$(LIBS))


[parent: 4d894b41cd12]