Skip to content

Commit 2069de9

Browse files
KenoKeno
committedJul 14, 2015
[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
1 parent 5be4512 commit 2069de9

File tree

23 files changed

+88
-186
lines changed

23 files changed

+88
-186
lines changed
 

‎lldb/lib/Makefile

+23-30
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
##===- source/Makefile -------------------------------------*- Makefile -*-===##
2-
#
2+
#
33
# The LLVM Compiler Infrastructure
44
#
55
# This file is distributed under the University of Illinois Open Source
66
# License. See LICENSE.TXT for details.
7-
#
7+
#
88
##===----------------------------------------------------------------------===##
99

1010
LEVEL := ../../..
@@ -28,9 +28,9 @@ USEDLIBS = lldbAPI.a \
2828
lldbCore.a \
2929
lldbDataFormatters.a \
3030
lldbExpression.a \
31-
lldbHostCommon.a \
32-
lldbInitialize.a \
33-
lldbInitAndLog.a \
31+
lldbInitialization.a \
32+
lldbHost.a \
33+
lldbBase.a \
3434
lldbInterpreter.a \
3535
lldbPluginABIMacOSX_arm.a \
3636
lldbPluginABIMacOSX_arm64.a \
@@ -46,33 +46,33 @@ USEDLIBS = lldbAPI.a \
4646
lldbPluginABISysV_hexagon.a \
4747
lldbPluginDisassemblerLLVM.a \
4848
lldbPluginDynamicLoaderStatic.a \
49-
lldbPluginDynamicLoaderPOSIX.a \
49+
lldbPluginDynamicLoaderPosixDYLD.a \
5050
lldbPluginDynamicLoaderHexagon.a \
51-
lldbPluginDynamicLoaderMacOSX.a \
51+
lldbPluginDynamicLoaderMacOSXDYLD.a \
5252
lldbPluginDynamicLoaderWindowsDYLD.a \
53-
lldbPluginEmulateInstructionARM.a \
54-
lldbPluginEmulateInstructionARM64.a \
55-
lldbPluginEmulateInstructionMIPS.a \
56-
lldbPluginEmulateInstructionMIPS64.a \
53+
lldbPluginInstructionARM.a \
54+
lldbPluginInstructionARM64.a \
55+
lldbPluginInstructionMIPS.a \
56+
lldbPluginInstructionMIPS64.a \
5757
lldbPluginInstrumentationRuntimeAddressSanitizer.a \
58-
lldbPluginLanguageRuntimeCPlusPlusItaniumABI.a \
59-
lldbPluginLanguageRuntimeObjCAppleObjCRuntime.a \
60-
lldbPluginLanguageRuntimeRenderScriptRuntime.a \
58+
lldbPluginCXXItaniumABI.a \
59+
lldbPluginAppleObjCRuntime.a \
60+
lldbPluginRenderScriptRuntime.a \
6161
lldbPluginMemoryHistoryASan.a \
6262
lldbPluginObjectContainerBSDArchive.a \
63-
lldbPluginObjectContainerUniversalMachO.a \
63+
lldbPluginObjectContainerMachOArchive.a \
6464
lldbPluginObjectFileELF.a \
6565
lldbPluginObjectFileJIT.a \
6666
lldbPluginSymbolVendorELF.a \
6767
lldbPluginObjectFilePECOFF.a \
68-
lldbPluginOperatingSystemPython.a \
69-
lldbPluginPlatformGDBServer.a \
68+
lldbPluginOSPython.a \
69+
lldbPluginPlatformGDB.a \
7070
lldbPluginProcessGDBRemote.a \
7171
lldbPluginSymbolFileDWARF.a \
7272
lldbPluginSymbolFileSymtab.a \
7373
lldbPluginSystemRuntimeMacOSX.a \
7474
lldbPluginUnwindAssemblyInstEmulation.a \
75-
lldbPluginUnwindAssemblyx86.a \
75+
lldbPluginUnwindAssemblyX86.a \
7676
lldbPluginUtility.a \
7777
lldbSymbol.a \
7878
lldbTarget.a \
@@ -113,9 +113,7 @@ LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter codegen \
113113
linker option
114114

115115
ifeq ($(HOST_OS),Darwin)
116-
USEDLIBS += lldbHostMacOSX.a \
117-
lldbHostPosix.a \
118-
lldbPluginDynamicLoaderDarwinKernel.a \
116+
USEDLIBS += lldbPluginDynamicLoaderDarwinKernel.a \
119117
lldbPluginObjectFileMachO.a \
120118
lldbPluginSymbolVendorMacOSX.a \
121119
lldbPluginProcessDarwin.a \
@@ -125,24 +123,19 @@ ifeq ($(HOST_OS),Darwin)
125123
endif
126124

127125
ifeq ($(HOST_OS),Linux)
128-
USEDLIBS += lldbHostLinux.a \
129-
lldbHostPosix.a \
130-
lldbPluginProcessLinux.a \
126+
USEDLIBS += lldbPluginProcessLinux.a \
131127
lldbPluginProcessPOSIX.a \
132128
lldbPluginProcessElfCore.a \
133129
lldbPluginJITLoaderGDB.a
134130
endif
135131

136132
ifeq ($(HOST_OS),MingW)
137-
USEDLIBS += lldbHostWindows.a \
138-
lldbPluginProcessElfCore.a \
133+
USEDLIBS += lldbPluginProcessElfCore.a \
139134
lldbPluginJITLoaderGDB.a
140135
endif
141136

142137
ifneq (,$(filter $(HOST_OS), FreeBSD GNU/kFreeBSD))
143-
USEDLIBS += lldbHostFreeBSD.a \
144-
lldbHostPosix.a \
145-
lldbPluginProcessPOSIX.a \
138+
USEDLIBS += lldbPluginProcessPOSIX.a \
146139
lldbPluginProcessFreeBSD.a \
147140
lldbPluginProcessElfCore.a \
148141
lldbPluginJITLoaderGDB.a
@@ -165,7 +158,7 @@ ifeq ($(HOST_OS),Darwin)
165158
-Wl,$(LLDB_SUBMIT_VERSION).$(LLDB_SUBMIT_SUBVERSION) \
166159
-Wl,-compatibility_version -Wl,1
167160
endif
168-
# extra options to override libtool defaults
161+
# extra options to override libtool defaults
169162
LLVMLibsOptions += -F/System/Library/Frameworks -F/System/Library/PrivateFrameworks
170163
LLVMLibsOptions += -framework Foundation -framework CoreFoundation
171164
LLVMLibsOptions += -framework CoreServices -framework Carbon -framework Security

‎lldb/source/Host/Makefile

+23-14
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,50 @@
11
##===- source/Host/Makefile --------------------------------*- Makefile -*-===##
2-
#
2+
#
33
# The LLVM Compiler Infrastructure
44
#
55
# This file is distributed under the University of Illinois Open Source
66
# License. See LICENSE.TXT for details.
7-
#
7+
#
88
##===----------------------------------------------------------------------===##
99

1010
LLDB_LEVEL := ../..
11+
LEVEL := $(LLDB_LEVEL)/../..
1112

12-
include $(LLDB_LEVEL)/../../Makefile.config
13+
include $(LEVEL)/Makefile.config
1314

14-
DIRS := common
15+
define DIR_SOURCES
16+
SOURCES += $$(addprefix $(1)/,$$(notdir $$(wildcard $$(PROJ_SRC_DIR)/$(1)/*.cpp \
17+
$$(PROJ_SRC_DIR)/*.cc $$(PROJ_SRC_DIR)/$(1)/*.c)))
18+
endef
19+
20+
$(eval $(call DIR_SOURCES,common))
1521

1622
ifeq ($(HOST_OS),Darwin)
17-
DIRS += posix
18-
DIRS += macosx
23+
$(eval $(call DIR_SOURCES,posix))
24+
$(eval $(call DIR_SOURCES,macosx))
1925
endif
2026

2127
ifeq ($(HOST_OS),Linux)
22-
DIRS += posix
23-
DIRS += linux
28+
$(eval $(call DIR_SOURCES,posix))
29+
$(eval $(call DIR_SOURCES,linux))
2430
endif
2531

2632
ifneq (,$(filter $(HOST_OS), FreeBSD GNU/kFreeBSD))
27-
DIRS += posix
28-
DIRS += freebsd
33+
$(eval $(call DIR_SOURCES,posix))
34+
$(eval $(call DIR_SOURCES,freebsd))
2935
endif
3036

3137
ifeq ($(HOST_OS),MingW)
32-
DIRS += windows
38+
$(eval $(call DIR_SOURCES,windows))
3339
endif
3440

3541
ifeq ($(HOST_OS),Android)
36-
DIRS += posix
37-
DIRS += linux
38-
DIRS += android
42+
$(eval $(call DIR_SOURCES,posix))
43+
$(eval $(call DIR_SOURCES,linux))
44+
$(eval $(call DIR_SOURCES,android))
3945
endif
4046

47+
LIBRARYNAME := lldbHost
48+
BUILD_ARCHIVE = 1
49+
4150
include $(LLDB_LEVEL)/Makefile

‎lldb/source/Host/common/Makefile

-14
This file was deleted.

‎lldb/source/Host/freebsd/Makefile

-16
This file was deleted.

‎lldb/source/Host/linux/Makefile

-14
This file was deleted.

‎lldb/source/Host/macosx/Makefile

-26
This file was deleted.

‎lldb/source/Host/posix/Makefile

-14
This file was deleted.

‎lldb/source/Host/windows/Makefile

-16
This file was deleted.

‎lldb/source/Initialization/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
##===----------------------------------------------------------------------===##
99

1010
LLDB_LEVEL := ../..
11-
LIBRARYNAME := lldbInitialize
11+
LIBRARYNAME := lldbInitialization
1212
BUILD_ARCHIVE = 1
1313

1414
include $(LLDB_LEVEL)/Makefile

‎lldb/source/Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
##===- source/Makefile -------------------------------------*- Makefile -*-===##
2-
#
2+
#
33
# The LLVM Compiler Infrastructure
44
#
55
# This file is distributed under the University of Illinois Open Source
66
# License. See LICENSE.TXT for details.
7-
#
7+
#
88
##===----------------------------------------------------------------------===##
99

1010
LLDB_LEVEL := ..
1111
PARALLEL_DIRS := API Initialization Breakpoint Commands Core DataFormatters Expression Host Interpreter Plugins Symbol Target Utility
12-
LIBRARYNAME := lldbInitAndLog
12+
LIBRARYNAME := lldbBase
1313
BUILD_ARCHIVE = 1
1414

1515
# Although LLVM makefiles provide $(HOST_OS), we cannot use that here because it is defined by including the $(LLDB_LEVEL)/Makefile
1616
# 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
1717
# calculated in the same way as Clang's version.
18-
ifeq (Darwin,$(shell uname -s))
18+
ifeq (Darwin,$(shell uname -s))
1919
BUILT_SOURCES = LLDB_vers.c
2020
endif
2121

‎lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
##===- source/Plugins/Disassembler/llvm/Makefile -------------*- Makefile -*-===##
2-
#
2+
#
33
# The LLVM Compiler Infrastructure
44
#
55
# This file is distributed under the University of Illinois Open Source
66
# License. See LICENSE.TXT for details.
7-
#
7+
#
88
##===----------------------------------------------------------------------===##
99

1010
LLDB_LEVEL := ../../../..
11-
LIBRARYNAME := lldbPluginDynamicLoaderMacOSX
11+
LIBRARYNAME := lldbPluginDynamicLoaderMacOSXDYLD
1212
BUILD_ARCHIVE = 1
1313

1414
include $(LLDB_LEVEL)/Makefile

‎lldb/source/Plugins/DynamicLoader/POSIX-DYLD/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
##===- source/Plugins/DynamicLoader/POSIX-DYLD/Makefile ----*- Makefile -*-===##
2-
#
2+
#
33
# The LLVM Compiler Infrastructure
44
#
55
# This file is distributed under the University of Illinois Open Source
66
# License. See LICENSE.TXT for details.
7-
#
7+
#
88
##===----------------------------------------------------------------------===##
99

1010
LLDB_LEVEL := ../../../..
11-
LIBRARYNAME := lldbPluginDynamicLoaderPOSIX
11+
LIBRARYNAME := lldbPluginDynamicLoaderPosixDYLD
1212
BUILD_ARCHIVE = 1
1313

1414
include $(LLDB_LEVEL)/Makefile

‎lldb/source/Plugins/Instruction/ARM/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
##===- source/Plugins/Instruction/ARM/Makefile -------------*- Makefile -*-===##
2-
#
2+
#
33
# The LLVM Compiler Infrastructure
44
#
55
# This file is distributed under the University of Illinois Open Source
66
# License. See LICENSE.TXT for details.
7-
#
7+
#
88
##===----------------------------------------------------------------------===##
99

1010
LLDB_LEVEL := ../../../..
11-
LIBRARYNAME := lldbPluginEmulateInstructionARM
11+
LIBRARYNAME := lldbPluginInstructionARM
1212
BUILD_ARCHIVE = 1
1313

1414
include $(LLDB_LEVEL)/Makefile

‎lldb/source/Plugins/Instruction/ARM64/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
##===- source/Plugins/Instruction/ARM/Makefile -------------*- Makefile -*-===##
2-
#
2+
#
33
# The LLVM Compiler Infrastructure
44
#
55
# This file is distributed under the University of Illinois Open Source
66
# License. See LICENSE.TXT for details.
7-
#
7+
#
88
##===----------------------------------------------------------------------===##
99

1010
LLDB_LEVEL := ../../../..
11-
LIBRARYNAME := lldbPluginEmulateInstructionARM64
11+
LIBRARYNAME := lldbPluginInstructionARM64
1212
BUILD_ARCHIVE = 1
1313

1414
include $(LLDB_LEVEL)/Makefile

0 commit comments

Comments
 (0)
Please sign in to comment.