[Lldb-commits] [PATCH 2/2] Makefile updates.

[Stephen Wilson]

Update lib/Makefile to use current LLVM and Clang components and add the
PluginUtility library to the build.
---
 lib/Makefile            |    8 +++-----
 source/Plugins/Makefile |    4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/Makefile b/lib/Makefile
index 454e89b..881b23c 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -33,11 +33,10 @@ USEDLIBS = lldbAPI.a \
 	lldbPluginObjectFileELF.a \
 	lldbPluginSymbolFileDWARF.a \
 	lldbPluginSymbolFileSymtab.a \
+	lldbPluginUtility.a \
 	lldbSymbol.a \
 	lldbTarget.a \
 	lldbUtility.a \
-	plugin_llvmc_Base.a \
-	plugin_llvmc_Clang.a \
 	clangAnalysis.a \
 	clangAST.a \
 	clangBasic.a \
@@ -49,14 +48,14 @@ USEDLIBS = lldbAPI.a \
 	clangRewrite.a \
 	clangParse.a \
 	clangSema.a \
-	CompilerDriver.a \
+	clangSerialization.a \
 	EnhancedDisassembly.a \
 	clangChecker.a
 
 include $(LLDB_LEVEL)/../../Makefile.config
 
 LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter codegen \
-                   ipo selectiondag jit
+                   ipo selectiondag jit mc
 
 ifeq ($(HOST_OS),Darwin)
   USEDLIBS += lldbHostMacOSX.a \
@@ -64,7 +63,6 @@ ifeq ($(HOST_OS),Darwin)
               lldbPluginObjectContainerUniversalMachO.a \
               lldbPluginObjectFileMachO.a \
               lldbPluginProcessGDBRemote.a \
-              lldbPluginUtility.a \
               lldbPluginSymbolVendorMacOSX.a
 endif
 
diff --git a/source/Plugins/Makefile b/source/Plugins/Makefile
index 28c7c1e..14eed8a 100644
--- a/source/Plugins/Makefile
+++ b/source/Plugins/Makefile
@@ -14,11 +14,11 @@ include $(LLDB_LEVEL)/../../Makefile.config
 
 DIRS := ABI/MacOSX-i386 ABI/SysV-x86_64 Disassembler/llvm  \
 	ObjectContainer/BSD-Archive ObjectFile/ELF SymbolFile/DWARF \
-	SymbolFile/Symtab
+	SymbolFile/Symtab Process/Utility
 
 ifeq ($(HOST_OS),Darwin)
 DIRS += DynamicLoader/MacOSX-DYLD ObjectContainer/Universal-Mach-O \
-	ObjectFile/Mach-O Process/gdb-remote Process/Utility \
+	ObjectFile/Mach-O Process/gdb-remote  \
 	SymbolVendor/MacOSX Process/MacOSX-User
 endif
 
-- 
1.7.3.2