[Lldb-commits] [lldb] r242196 - [Makefiles] Align library names with CMake build

Keno Fischer kfischer at college.harvard.edu
Tue Jul 14 13:25:20 PDT 2015


Author: kfischer
Date: Tue Jul 14 15:25:19 2015
New Revision: 242196

URL: http://llvm.org/viewvc/llvm-project?rev=242196&view=rev
Log:
[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

Removed:
    lldb/trunk/source/Host/common/Makefile
    lldb/trunk/source/Host/freebsd/Makefile
    lldb/trunk/source/Host/linux/Makefile
    lldb/trunk/source/Host/macosx/Makefile
    lldb/trunk/source/Host/posix/Makefile
    lldb/trunk/source/Host/windows/Makefile
Modified:
    lldb/trunk/lib/Makefile
    lldb/trunk/source/Host/Makefile
    lldb/trunk/source/Initialization/Makefile
    lldb/trunk/source/Makefile
    lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/Makefile
    lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/Makefile
    lldb/trunk/source/Plugins/Instruction/ARM/Makefile
    lldb/trunk/source/Plugins/Instruction/ARM64/Makefile
    lldb/trunk/source/Plugins/Instruction/MIPS/Makefile
    lldb/trunk/source/Plugins/Instruction/MIPS64/Makefile
    lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/Makefile
    lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/Makefile
    lldb/trunk/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/Makefile
    lldb/trunk/source/Plugins/ObjectContainer/Universal-Mach-O/Makefile
    lldb/trunk/source/Plugins/OperatingSystem/Python/Makefile
    lldb/trunk/source/Plugins/Platform/gdb-server/Makefile
    lldb/trunk/source/Plugins/UnwindAssembly/x86/Makefile

Modified: lldb/trunk/lib/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lib/Makefile?rev=242196&r1=242195&r2=242196&view=diff
==============================================================================
--- lldb/trunk/lib/Makefile (original)
+++ lldb/trunk/lib/Makefile Tue Jul 14 15:25:19 2015
@@ -1,10 +1,10 @@
 ##===- source/Makefile -------------------------------------*- Makefile -*-===##
-# 
+#
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
-# 
+#
 ##===----------------------------------------------------------------------===##
 
 LEVEL := ../../..
@@ -28,9 +28,9 @@ USEDLIBS = lldbAPI.a \
 	lldbCore.a \
 	lldbDataFormatters.a \
 	lldbExpression.a \
-	lldbHostCommon.a \
-	lldbInitialize.a \
-	lldbInitAndLog.a \
+	lldbInitialization.a \
+	lldbHost.a \
+	lldbBase.a \
 	lldbInterpreter.a \
 	lldbPluginABIMacOSX_arm.a \
 	lldbPluginABIMacOSX_arm64.a \
@@ -46,33 +46,33 @@ USEDLIBS = lldbAPI.a \
 	lldbPluginABISysV_hexagon.a \
 	lldbPluginDisassemblerLLVM.a \
 	lldbPluginDynamicLoaderStatic.a \
-	lldbPluginDynamicLoaderPOSIX.a \
+	lldbPluginDynamicLoaderPosixDYLD.a \
 	lldbPluginDynamicLoaderHexagon.a \
-	lldbPluginDynamicLoaderMacOSX.a \
+	lldbPluginDynamicLoaderMacOSXDYLD.a \
 	lldbPluginDynamicLoaderWindowsDYLD.a \
-	lldbPluginEmulateInstructionARM.a \
-	lldbPluginEmulateInstructionARM64.a \
-	lldbPluginEmulateInstructionMIPS.a \
-	lldbPluginEmulateInstructionMIPS64.a \
+	lldbPluginInstructionARM.a \
+	lldbPluginInstructionARM64.a \
+	lldbPluginInstructionMIPS.a \
+	lldbPluginInstructionMIPS64.a \
 	lldbPluginInstrumentationRuntimeAddressSanitizer.a \
-	lldbPluginLanguageRuntimeCPlusPlusItaniumABI.a \
-	lldbPluginLanguageRuntimeObjCAppleObjCRuntime.a \
-	lldbPluginLanguageRuntimeRenderScriptRuntime.a \
+	lldbPluginCXXItaniumABI.a \
+	lldbPluginAppleObjCRuntime.a \
+	lldbPluginRenderScriptRuntime.a \
 	lldbPluginMemoryHistoryASan.a \
 	lldbPluginObjectContainerBSDArchive.a \
-	lldbPluginObjectContainerUniversalMachO.a \
+	lldbPluginObjectContainerMachOArchive.a \
 	lldbPluginObjectFileELF.a \
 	lldbPluginObjectFileJIT.a \
 	lldbPluginSymbolVendorELF.a \
 	lldbPluginObjectFilePECOFF.a \
-	lldbPluginOperatingSystemPython.a \
-	lldbPluginPlatformGDBServer.a \
+	lldbPluginOSPython.a \
+	lldbPluginPlatformGDB.a \
 	lldbPluginProcessGDBRemote.a \
 	lldbPluginSymbolFileDWARF.a \
 	lldbPluginSymbolFileSymtab.a \
 	lldbPluginSystemRuntimeMacOSX.a \
 	lldbPluginUnwindAssemblyInstEmulation.a \
-	lldbPluginUnwindAssemblyx86.a \
+	lldbPluginUnwindAssemblyX86.a \
 	lldbPluginUtility.a \
 	lldbSymbol.a \
 	lldbTarget.a \
@@ -113,9 +113,7 @@ LINK_COMPONENTS := $(TARGETS_TO_BUILD) a
                    linker option
 
 ifeq ($(HOST_OS),Darwin)
-  USEDLIBS += lldbHostMacOSX.a \
-              lldbHostPosix.a \
-              lldbPluginDynamicLoaderDarwinKernel.a \
+  USEDLIBS += lldbPluginDynamicLoaderDarwinKernel.a \
               lldbPluginObjectFileMachO.a \
               lldbPluginSymbolVendorMacOSX.a \
               lldbPluginProcessDarwin.a \
@@ -125,24 +123,19 @@ ifeq ($(HOST_OS),Darwin)
 endif
 
 ifeq ($(HOST_OS),Linux)
-  USEDLIBS += lldbHostLinux.a \
-              lldbHostPosix.a \
-              lldbPluginProcessLinux.a \
+  USEDLIBS += lldbPluginProcessLinux.a \
               lldbPluginProcessPOSIX.a \
               lldbPluginProcessElfCore.a \
               lldbPluginJITLoaderGDB.a
 endif
 
 ifeq ($(HOST_OS),MingW)
-  USEDLIBS += lldbHostWindows.a \
-              lldbPluginProcessElfCore.a \
+  USEDLIBS += lldbPluginProcessElfCore.a \
               lldbPluginJITLoaderGDB.a
 endif
 
 ifneq (,$(filter $(HOST_OS), FreeBSD GNU/kFreeBSD))
-  USEDLIBS += lldbHostFreeBSD.a \
-              lldbHostPosix.a \
-              lldbPluginProcessPOSIX.a \
+  USEDLIBS += lldbPluginProcessPOSIX.a \
               lldbPluginProcessFreeBSD.a \
               lldbPluginProcessElfCore.a \
               lldbPluginJITLoaderGDB.a
@@ -165,7 +158,7 @@ ifeq ($(HOST_OS),Darwin)
                            -Wl,$(LLDB_SUBMIT_VERSION).$(LLDB_SUBMIT_SUBVERSION) \
                            -Wl,-compatibility_version -Wl,1
     endif
-    # extra options to override libtool defaults 
+    # extra options to override libtool defaults
 	LLVMLibsOptions += -F/System/Library/Frameworks -F/System/Library/PrivateFrameworks
 	LLVMLibsOptions += -framework Foundation -framework CoreFoundation
 	LLVMLibsOptions += -framework CoreServices -framework Carbon -framework Security

Modified: lldb/trunk/source/Host/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/Makefile?rev=242196&r1=242195&r2=242196&view=diff
==============================================================================
--- lldb/trunk/source/Host/Makefile (original)
+++ lldb/trunk/source/Host/Makefile Tue Jul 14 15:25:19 2015
@@ -1,41 +1,50 @@
 ##===- source/Host/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 := ../..
+LEVEL := $(LLDB_LEVEL)/../..
 
-include $(LLDB_LEVEL)/../../Makefile.config
+include $(LEVEL)/Makefile.config
 
-DIRS := common
+define DIR_SOURCES
+SOURCES += $$(addprefix $(1)/,$$(notdir $$(wildcard $$(PROJ_SRC_DIR)/$(1)/*.cpp \
+					 $$(PROJ_SRC_DIR)/*.cc $$(PROJ_SRC_DIR)/$(1)/*.c)))
+endef
+
+$(eval $(call DIR_SOURCES,common))
 
 ifeq ($(HOST_OS),Darwin)
-DIRS += posix
-DIRS += macosx
+$(eval $(call DIR_SOURCES,posix))
+$(eval $(call DIR_SOURCES,macosx))
 endif
 
 ifeq ($(HOST_OS),Linux)
-DIRS += posix
-DIRS += linux
+$(eval $(call DIR_SOURCES,posix))
+$(eval $(call DIR_SOURCES,linux))
 endif
 
 ifneq (,$(filter $(HOST_OS), FreeBSD GNU/kFreeBSD))
-DIRS += posix
-DIRS += freebsd
+$(eval $(call DIR_SOURCES,posix))
+$(eval $(call DIR_SOURCES,freebsd))
 endif
 
 ifeq ($(HOST_OS),MingW)
-DIRS += windows
+$(eval $(call DIR_SOURCES,windows))
 endif
 
 ifeq ($(HOST_OS),Android)
-DIRS += posix
-DIRS += linux
-DIRS += android
+$(eval $(call DIR_SOURCES,posix))
+$(eval $(call DIR_SOURCES,linux))
+$(eval $(call DIR_SOURCES,android))
 endif
 
+LIBRARYNAME := lldbHost
+BUILD_ARCHIVE = 1
+
 include $(LLDB_LEVEL)/Makefile

Removed: lldb/trunk/source/Host/common/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/Makefile?rev=242195&view=auto
==============================================================================
--- lldb/trunk/source/Host/common/Makefile (original)
+++ lldb/trunk/source/Host/common/Makefile (removed)
@@ -1,14 +0,0 @@
-##===- source/Host/common/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 := lldbHostCommon
-BUILD_ARCHIVE = 1
-
-include $(LLDB_LEVEL)/Makefile

Removed: lldb/trunk/source/Host/freebsd/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/freebsd/Makefile?rev=242195&view=auto
==============================================================================
--- lldb/trunk/source/Host/freebsd/Makefile (original)
+++ lldb/trunk/source/Host/freebsd/Makefile (removed)
@@ -1,16 +0,0 @@
-##===- source/Host/freebsd/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 := lldbHostFreeBSD
-BUILD_ARCHIVE = 1
-
-CPP.Flags += -I/usr/local/include
-
-include $(LLDB_LEVEL)/Makefile

Removed: lldb/trunk/source/Host/linux/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/linux/Makefile?rev=242195&view=auto
==============================================================================
--- lldb/trunk/source/Host/linux/Makefile (original)
+++ lldb/trunk/source/Host/linux/Makefile (removed)
@@ -1,14 +0,0 @@
-##===- source/Host/linux/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 := lldbHostLinux
-BUILD_ARCHIVE = 1
-
-include $(LLDB_LEVEL)/Makefile

Removed: lldb/trunk/source/Host/macosx/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/macosx/Makefile?rev=242195&view=auto
==============================================================================
--- lldb/trunk/source/Host/macosx/Makefile (original)
+++ lldb/trunk/source/Host/macosx/Makefile (removed)
@@ -1,26 +0,0 @@
-##===- source/Host/macosx/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 := lldbHostMacOSX
-BUILD_ARCHIVE = 1
-
-CFCPP_SOURCES = \
-          $(addprefix cfcpp/,$(notdir $(wildcard $(PROJ_SRC_DIR)/cfcpp/*.cpp)))
-SOURCES = $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cpp $(PROJ_SRC_DIR)/*.mm)) \
-          $(CFCPP_SOURCES)
-
-include $(LLDB_LEVEL)/Makefile
-
-CFCPP_BaseNameSources := $(sort $(basename $(CFCPP_SOURCES)))
-CFCPP_OBJECTS := $(CFCPP_BaseNameSources:%=$(ObjDir)/%.o)
-
-# Make sure the cfcpp output directory exists
-$(CFCPP_OBJECTS): $(ObjDir)/cfcpp/.dir
-

Removed: lldb/trunk/source/Host/posix/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/posix/Makefile?rev=242195&view=auto
==============================================================================
--- lldb/trunk/source/Host/posix/Makefile (original)
+++ lldb/trunk/source/Host/posix/Makefile (removed)
@@ -1,14 +0,0 @@
-##===- source/Host/posix/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 := lldbHostPosix
-BUILD_ARCHIVE = 1
-
-include $(LLDB_LEVEL)/Makefile

Removed: lldb/trunk/source/Host/windows/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/windows/Makefile?rev=242195&view=auto
==============================================================================
--- lldb/trunk/source/Host/windows/Makefile (original)
+++ lldb/trunk/source/Host/windows/Makefile (removed)
@@ -1,16 +0,0 @@
-##===- source/Host/windows/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 := lldbHostWindows
-BUILD_ARCHIVE = 1
-
-SOURCES = $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cpp )) $(PROJ_SRC_DIR)/../posix/ConnectionFileDescriptorPosix.cpp
-
-include $(LLDB_LEVEL)/Makefile

Modified: lldb/trunk/source/Initialization/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Initialization/Makefile?rev=242196&r1=242195&r2=242196&view=diff
==============================================================================
--- lldb/trunk/source/Initialization/Makefile (original)
+++ lldb/trunk/source/Initialization/Makefile Tue Jul 14 15:25:19 2015
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 
 LLDB_LEVEL := ../..
-LIBRARYNAME := lldbInitialize
+LIBRARYNAME := lldbInitialization
 BUILD_ARCHIVE = 1
 
 include $(LLDB_LEVEL)/Makefile

Modified: lldb/trunk/source/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Makefile?rev=242196&r1=242195&r2=242196&view=diff
==============================================================================
--- lldb/trunk/source/Makefile (original)
+++ lldb/trunk/source/Makefile Tue Jul 14 15:25:19 2015
@@ -1,21 +1,21 @@
 ##===- source/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 := ..
 PARALLEL_DIRS := API Initialization Breakpoint Commands Core DataFormatters Expression Host Interpreter Plugins Symbol Target Utility
-LIBRARYNAME := lldbInitAndLog
+LIBRARYNAME := lldbBase
 BUILD_ARCHIVE = 1
 
 # Although LLVM makefiles provide $(HOST_OS), we cannot use that here because it is defined by including the $(LLDB_LEVEL)/Makefile
 # below. Instead, we use uname -s to detect the HOST_OS and generate LLDB_vers.c only on Mac. On Linux, the version number is
 # calculated in the same way as Clang's version.
-ifeq (Darwin,$(shell uname -s)) 
+ifeq (Darwin,$(shell uname -s))
 BUILT_SOURCES = LLDB_vers.c
 endif
 

Modified: lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/Makefile?rev=242196&r1=242195&r2=242196&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/Makefile (original)
+++ lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/Makefile Tue Jul 14 15:25:19 2015
@@ -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

Modified: lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/Makefile?rev=242196&r1=242195&r2=242196&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/Makefile (original)
+++ lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/Makefile Tue Jul 14 15:25:19 2015
@@ -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

Modified: lldb/trunk/source/Plugins/Instruction/ARM/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Instruction/ARM/Makefile?rev=242196&r1=242195&r2=242196&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Instruction/ARM/Makefile (original)
+++ lldb/trunk/source/Plugins/Instruction/ARM/Makefile Tue Jul 14 15:25:19 2015
@@ -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

Modified: lldb/trunk/source/Plugins/Instruction/ARM64/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Instruction/ARM64/Makefile?rev=242196&r1=242195&r2=242196&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Instruction/ARM64/Makefile (original)
+++ lldb/trunk/source/Plugins/Instruction/ARM64/Makefile Tue Jul 14 15:25:19 2015
@@ -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

Modified: lldb/trunk/source/Plugins/Instruction/MIPS/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Instruction/MIPS/Makefile?rev=242196&r1=242195&r2=242196&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Instruction/MIPS/Makefile (original)
+++ lldb/trunk/source/Plugins/Instruction/MIPS/Makefile Tue Jul 14 15:25:19 2015
@@ -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

Modified: lldb/trunk/source/Plugins/Instruction/MIPS64/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Instruction/MIPS64/Makefile?rev=242196&r1=242195&r2=242196&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Instruction/MIPS64/Makefile (original)
+++ lldb/trunk/source/Plugins/Instruction/MIPS64/Makefile Tue Jul 14 15:25:19 2015
@@ -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

Modified: lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/Makefile?rev=242196&r1=242195&r2=242196&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/Makefile (original)
+++ lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/Makefile Tue Jul 14 15:25:19 2015
@@ -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

Modified: lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/Makefile?rev=242196&r1=242195&r2=242196&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/Makefile (original)
+++ lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/Makefile Tue Jul 14 15:25:19 2015
@@ -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

Modified: lldb/trunk/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/Makefile?rev=242196&r1=242195&r2=242196&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/Makefile (original)
+++ lldb/trunk/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/Makefile Tue Jul 14 15:25:19 2015
@@ -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

Modified: lldb/trunk/source/Plugins/ObjectContainer/Universal-Mach-O/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectContainer/Universal-Mach-O/Makefile?rev=242196&r1=242195&r2=242196&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ObjectContainer/Universal-Mach-O/Makefile (original)
+++ lldb/trunk/source/Plugins/ObjectContainer/Universal-Mach-O/Makefile Tue Jul 14 15:25:19 2015
@@ -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

Modified: lldb/trunk/source/Plugins/OperatingSystem/Python/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/OperatingSystem/Python/Makefile?rev=242196&r1=242195&r2=242196&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/OperatingSystem/Python/Makefile (original)
+++ lldb/trunk/source/Plugins/OperatingSystem/Python/Makefile Tue Jul 14 15:25:19 2015
@@ -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

Modified: lldb/trunk/source/Plugins/Platform/gdb-server/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/gdb-server/Makefile?rev=242196&r1=242195&r2=242196&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Platform/gdb-server/Makefile (original)
+++ lldb/trunk/source/Plugins/Platform/gdb-server/Makefile Tue Jul 14 15:25:19 2015
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 
 LLDB_LEVEL := ../../../..
-LIBRARYNAME := lldbPluginPlatformGDBServer
+LIBRARYNAME := lldbPluginPlatformGDB
 BUILD_ARCHIVE = 1
 
 include $(LLDB_LEVEL)/Makefile

Modified: lldb/trunk/source/Plugins/UnwindAssembly/x86/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/UnwindAssembly/x86/Makefile?rev=242196&r1=242195&r2=242196&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/UnwindAssembly/x86/Makefile (original)
+++ lldb/trunk/source/Plugins/UnwindAssembly/x86/Makefile Tue Jul 14 15:25:19 2015
@@ -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





More information about the lldb-commits mailing list