[Lldb-commits] [lldb] r131697 - in /lldb/trunk: Makefile lib/Makefile

[Johnny Chen]

Author: johnny
Date: Thu May 19 18:09:48 2011
New Revision: 131697

URL: http://llvm.org/viewvc/llvm-project?rev=131697&view=rev
Log:
python-config in Makefiles

Replace python static settings of compiler flags with invocation of
python-config.

Signed-off-by: Johnny Chen <johnny.chen at apple.com>

Modified:
    lldb/trunk/Makefile
    lldb/trunk/lib/Makefile

Modified: lldb/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/Makefile?rev=131697&r1=131696&r2=131697&view=diff
==============================================================================
--- lldb/trunk/Makefile (original)
+++ lldb/trunk/Makefile Thu May 19 18:09:48 2011
@@ -29,14 +29,14 @@
 include $(LEVEL)/Makefile.common
 
 # Set Python include directory
-PYTHON_INC_DIR = /usr/include/python2.7
+PYTHON_INC_DIR = $(shell python-config --includes)
 
 # Set common LLDB build flags.
 CPP.Flags += -I$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/include 
 CPP.Flags += -I$(PROJ_OBJ_DIR)/$(LLDB_LEVEL)/include
 CPP.Flags += -I$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/../clang/include
 CPP.Flags += -I$(PROJ_OBJ_DIR)/$(LLDB_LEVEL)/../clang/include
-CPP.Flags += -I$(PYTHON_INC_DIR)
+CPP.Flags +=   $(PYTHON_INC_DIR)
 CPP.Flags += -I$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/source
 CPP.Flags += -I$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/source/Utility
 CPP.Flags += -I$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/source/Plugins/Process/Utility

Modified: lldb/trunk/lib/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lib/Makefile?rev=131697&r1=131696&r2=131697&view=diff
==============================================================================
--- lldb/trunk/lib/Makefile (original)
+++ lldb/trunk/lib/Makefile Thu May 19 18:09:48 2011
@@ -17,7 +17,7 @@
 LINK_LIBS_IN_SHARED = 1
 SHARED_LIBRARY = 1
 
-PYTHON_BUILD_FLAGS = -lpython2.6
+PYTHON_BUILD_FLAGS = $(shell python-config --ldflags)
 
 # Include all archives in liblldb.a files
 USEDLIBS = lldbAPI.a \