Change linux makefiles to use system wide python lib.
authorGuillermo S. Romero <gsr.b3d@infernal-iceberg.com>
Mon, 10 Aug 2009 02:43:03 +0000 (02:43 +0000)
committerGuillermo S. Romero <gsr.b3d@infernal-iceberg.com>
Mon, 10 Aug 2009 02:43:03 +0000 (02:43 +0000)
source/nan_definitions.mk
source/nan_link.mk

index d6701c6fa449cc259bf65433eb51cc30aa06cc0d..c98ccca307f6f0f84e2f6f3ac78f5ee923a4e488 100644 (file)
@@ -295,7 +295,8 @@ ifndef CONFIG_GUESS
     export NAN_PYTHON ?= /usr
     export NAN_PYTHON_VERSION ?= 3.1
     export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
-    export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
+    # Next line if for static python, nan_link.mk uses -lpython$(NAN_PYTHON_VERSION)
+    #export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
     export NAN_OPENAL ?= /usr
     export NAN_JPEG ?= /usr
     export NAN_PNG ?= /usr
index 3c84e62049b9d675a4821a268d6c5fc04c86e182..a317c8a36ad22785efed06fbce18ac55c8a0adf7 100644 (file)
@@ -98,6 +98,7 @@ ifeq ($(OS),linux)
     LLIBS = -L$(NAN_MESA)/lib -L/usr/X11R6/lib -lXmu -lXext -lX11 -lXi
     LLIBS += -lutil -lc -lm -ldl -lpthread
     LLIBS += -lsamplerate
+    LLIBS += -lpython$(NAN_PYTHON_VERSION)
     LOPTS = -export-dynamic
     DADD = -lGL -lGLU
     SADD = $(NAN_MESA)/lib/libGL.a $(NAN_MESA)/lib/libGLU.a