git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4d894b4)
Cosmetic improvements in plpython's make rule for libpython import library.
2014年2月14日 16:31:35 +0000 (11:31 -0500)
2014年2月14日 16:31:35 +0000 (11:31 -0500)
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.


diff --git a/src/pl/plpython/Makefile b/src/pl/plpython/Makefile
index 3fe8e4a7d3436a29d27652be44f1937c8419b4aa..46d2030d698b5a0d338c3bc2b0bb920c610be032 100644 (file)
--- 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))
This is the main PostgreSQL git repository.
RSS Atom

AltStyle によって変換されたページ (->オリジナル) /