[Makefiles] Align library names with CMake build

Summary: This aligns the library names used by the Makefile build to be the same as those create by the CMake build to make switching between the two easier. The only major difficulty was lldbHost which was one library in the CMake system and several in the Makefile system. Most of the other changes are trivial renames.

Reviewers: labath

Subscribers: emaste, tberghammer, lldb-commits

Differential Revision: http://reviews.llvm.org/D11154

llvm-svn: 242196

13 files changed, 37 insertions, 37 deletions

diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/Makefile b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/Makefile
index 70400caa7d8..ffac3b45717 100644
--- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/Makefile
+++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/Makefile
@@ -1,14 +1,14 @@
 ##===- source/Plugins/Disassembler/llvm/Makefile -------------*- Makefile -*-===##
-# 
+#
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
-# 
+#
 ##===----------------------------------------------------------------------===##
 
 LLDB_LEVEL := ../../../..
-LIBRARYNAME := lldbPluginDynamicLoaderMacOSX
+LIBRARYNAME := lldbPluginDynamicLoaderMacOSXDYLD
 BUILD_ARCHIVE = 1
 
 include $(LLDB_LEVEL)/Makefile
diff --git a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/Makefile b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/Makefile
index 70ea1f34e2b..1c56366015d 100644
--- a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/Makefile
+++ b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/Makefile
@@ -1,14 +1,14 @@
 ##===- source/Plugins/DynamicLoader/POSIX-DYLD/Makefile ----*- Makefile -*-===##
-# 
+#
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
-# 
+#
 ##===----------------------------------------------------------------------===##
 
 LLDB_LEVEL := ../../../..
-LIBRARYNAME := lldbPluginDynamicLoaderPOSIX
+LIBRARYNAME := lldbPluginDynamicLoaderPosixDYLD
 BUILD_ARCHIVE = 1
 
 include $(LLDB_LEVEL)/Makefile
diff --git a/lldb/source/Plugins/Instruction/ARM/Makefile b/lldb/source/Plugins/Instruction/ARM/Makefile
index 61591a3e54c..31a233b0b37 100644
--- a/lldb/source/Plugins/Instruction/ARM/Makefile
+++ b/lldb/source/Plugins/Instruction/ARM/Makefile
@@ -1,14 +1,14 @@
 ##===- source/Plugins/Instruction/ARM/Makefile -------------*- Makefile -*-===##
-# 
+#
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
-# 
+#
 ##===----------------------------------------------------------------------===##
 
 LLDB_LEVEL := ../../../..
-LIBRARYNAME := lldbPluginEmulateInstructionARM
+LIBRARYNAME := lldbPluginInstructionARM
 BUILD_ARCHIVE = 1
 
 include $(LLDB_LEVEL)/Makefile
diff --git a/lldb/source/Plugins/Instruction/ARM64/Makefile b/lldb/source/Plugins/Instruction/ARM64/Makefile
index b07a6020dd3..8f60ce6dcd4 100644
--- a/lldb/source/Plugins/Instruction/ARM64/Makefile
+++ b/lldb/source/Plugins/Instruction/ARM64/Makefile
@@ -1,14 +1,14 @@
 ##===- source/Plugins/Instruction/ARM/Makefile -------------*- Makefile -*-===##
-# 
+#
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
-# 
+#
 ##===----------------------------------------------------------------------===##
 
 LLDB_LEVEL := ../../../..
-LIBRARYNAME := lldbPluginEmulateInstructionARM64
+LIBRARYNAME := lldbPluginInstructionARM64
 BUILD_ARCHIVE = 1
 
 include $(LLDB_LEVEL)/Makefile
diff --git a/lldb/source/Plugins/Instruction/MIPS/Makefile b/lldb/source/Plugins/Instruction/MIPS/Makefile
index 61ff6874b7c..e9cef4ba0cf 100644
--- a/lldb/source/Plugins/Instruction/MIPS/Makefile
+++ b/lldb/source/Plugins/Instruction/MIPS/Makefile
@@ -1,14 +1,14 @@
 ##===- source/Plugins/Instruction/MIPS/Makefile -------------*- Makefile -*-===##
-# 
+#
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
-# 
+#
 ##===----------------------------------------------------------------------===##
 
 LLDB_LEVEL := ../../../..
-LIBRARYNAME := lldbPluginEmulateInstructionMIPS
+LIBRARYNAME := lldbPluginInstructionMIPS
 BUILD_ARCHIVE = 1
 
 include $(LLDB_LEVEL)/Makefile
diff --git a/lldb/source/Plugins/Instruction/MIPS64/Makefile b/lldb/source/Plugins/Instruction/MIPS64/Makefile
index a4acb9be31b..7e5b339a359 100644
--- a/lldb/source/Plugins/Instruction/MIPS64/Makefile
+++ b/lldb/source/Plugins/Instruction/MIPS64/Makefile
@@ -1,14 +1,14 @@
 ##===- source/Plugins/Instruction/MIPS64/Makefile -------------*- Makefile -*-===##
-# 
+#
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
-# 
+#
 ##===----------------------------------------------------------------------===##
 
 LLDB_LEVEL := ../../../..
-LIBRARYNAME := lldbPluginEmulateInstructionMIPS64
+LIBRARYNAME := lldbPluginInstructionMIPS64
 BUILD_ARCHIVE = 1
 
 include $(LLDB_LEVEL)/Makefile
diff --git a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/Makefile b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/Makefile
index e9f78decde3..ac87437f9d2 100644
--- a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/Makefile
+++ b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/Makefile
@@ -1,14 +1,14 @@
 ##===- source/Plugins/LangRuntime/C++/ItaniumABI/Makefile --*- Makefile -*-===##
-# 
+#
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
-# 
+#
 ##===----------------------------------------------------------------------===##
 
 LLDB_LEVEL := ../../../../..
-LIBRARYNAME := lldbPluginLanguageRuntimeCPlusPlusItaniumABI
+LIBRARYNAME := lldbPluginCXXItaniumABI
 BUILD_ARCHIVE = 1
 
 include $(LLDB_LEVEL)/Makefile
diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/Makefile b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/Makefile
index 64f9ce119f0..485fe75b3f8 100644
--- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/Makefile
+++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/Makefile
@@ -1,14 +1,14 @@
 ##===- source/Plugins/LangRuntime/ObjC/AppleRT/Makefile ----*- Makefile -*-===##
-# 
+#
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
-# 
+#
 ##===----------------------------------------------------------------------===##
 
 LLDB_LEVEL := ../../../../..
-LIBRARYNAME := lldbPluginLanguageRuntimeObjCAppleObjCRuntime
+LIBRARYNAME := lldbPluginAppleObjCRuntime
 BUILD_ARCHIVE = 1
 
 include $(LLDB_LEVEL)/Makefile
diff --git a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/Makefile b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/Makefile
index 6c9769b9c3e..eeb50ae3fca 100644
--- a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/Makefile
+++ b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/Makefile
@@ -1,14 +1,14 @@
 ##===- Source/Plugins/LangRuntime/RenderScript/RenderScriptRuntime/Makefile ----*- Makefile -*-===##
-# 
+#
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
-# 
+#
 ##===----------------------------------------------------------------------===##
 
 LLDB_LEVEL := ../../../../..
-LIBRARYNAME := lldbPluginLanguageRuntimeRenderScriptRuntime
+LIBRARYNAME := lldbPluginRenderScriptRuntime
 BUILD_ARCHIVE = 1
 
 include $(LLDB_LEVEL)/Makefile
diff --git a/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/Makefile b/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/Makefile
index 274ecddf927..957753527d2 100644
--- a/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/Makefile
+++ b/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/Makefile
@@ -1,14 +1,14 @@
 ##===- source/Plugins/ObjectContainer/Universal-Mach-O/Makefile -------------*- Makefile -*-===##
-# 
+#
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
-# 
+#
 ##===----------------------------------------------------------------------===##
 
 LLDB_LEVEL := ../../../..
-LIBRARYNAME := lldbPluginObjectContainerUniversalMachO
+LIBRARYNAME := lldbPluginObjectContainerMachOArchive
 BUILD_ARCHIVE = 1
 
 include $(LLDB_LEVEL)/Makefile
diff --git a/lldb/source/Plugins/OperatingSystem/Python/Makefile b/lldb/source/Plugins/OperatingSystem/Python/Makefile
index 4f5b45c82f9..67cd0acd703 100644
--- a/lldb/source/Plugins/OperatingSystem/Python/Makefile
+++ b/lldb/source/Plugins/OperatingSystem/Python/Makefile
@@ -1,14 +1,14 @@
 ##==- source/Plugins/OperatingSystem/Python/Makefile --------*- Makefile -*-==##
-# 
+#
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
-# 
+#
 ##===----------------------------------------------------------------------===##
 
 LLDB_LEVEL := ../../../..
-LIBRARYNAME := lldbPluginOperatingSystemPython
+LIBRARYNAME := lldbPluginOSPython
 BUILD_ARCHIVE = 1
 
 include $(LLDB_LEVEL)/Makefile
diff --git a/lldb/source/Plugins/Platform/gdb-server/Makefile b/lldb/source/Plugins/Platform/gdb-server/Makefile
index 94fba171151..c56613b2a65 100644
--- a/lldb/source/Plugins/Platform/gdb-server/Makefile
+++ b/lldb/source/Plugins/Platform/gdb-server/Makefile
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 
 LLDB_LEVEL := ../../../..
-LIBRARYNAME := lldbPluginPlatformGDBServer
+LIBRARYNAME := lldbPluginPlatformGDB
 BUILD_ARCHIVE = 1
 
 include $(LLDB_LEVEL)/Makefile
diff --git a/lldb/source/Plugins/UnwindAssembly/x86/Makefile b/lldb/source/Plugins/UnwindAssembly/x86/Makefile
index dddf7f71e98..24419c044f0 100644
--- a/lldb/source/Plugins/UnwindAssembly/x86/Makefile
+++ b/lldb/source/Plugins/UnwindAssembly/x86/Makefile
@@ -1,14 +1,14 @@
 ##==-- source/Plugins/UnwindAssembly/x86/Makefile ----------*- Makefile -*-===##
-# 
+#
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
-# 
+#
 ##===----------------------------------------------------------------------===##
 
 LLDB_LEVEL := ../../../..
-LIBRARYNAME := lldbPluginUnwindAssemblyx86
+LIBRARYNAME := lldbPluginUnwindAssemblyX86
 BUILD_ARCHIVE = 1
 
 include $(LLDB_LEVEL)/Makefile