[Lldb-commits] [PATCH] Fix makefiles to build elf-core, mach-core and JitLoaderGDB plugins on all platforms.

[Kuba Ober]

This brings it in line with cmake build scripts.

Please commit after trying it out.

Contributed by Kuba Ober
---
 lib/Makefile            | 16 ++++++----------
 source/Plugins/Makefile | 12 ++++--------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/lib/Makefile b/lib/Makefile
index 3e48d51..3975f0d 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -46,11 +46,14 @@ USEDLIBS = lldbAPI.a \
 	lldbPluginObjectFilePECOFF.a \
 	lldbPluginOperatingSystemPython.a \
 	lldbPluginPlatformGDBServer.a \
+	lldbPluginJITLoaderGDB.a \
 	lldbPluginProcessGDBRemote.a \
 	lldbPluginSymbolFileDWARF.a \
 	lldbPluginSymbolFileSymtab.a \
 	lldbPluginUnwindAssemblyInstEmulation.a \
 	lldbPluginUnwindAssemblyx86.a \
+	lldbPluginProcessElfCore.a \
+	lldbPluginProcessMachCore.a \
 	lldbPluginUtility.a \
 	lldbSymbol.a \
 	lldbTarget.a \
@@ -100,7 +103,6 @@ ifeq ($(HOST_OS),Darwin)
               lldbPluginObjectFileMachO.a \
               lldbPluginSymbolVendorMacOSX.a \
               lldbPluginProcessDarwin.a \
-              lldbPluginProcessMachCore.a \
               lldbPluginSystemRuntimeMacOSX.a
 endif
 
@@ -108,23 +110,17 @@ ifeq ($(HOST_OS),Linux)
   USEDLIBS += lldbHostLinux.a \
               lldbPluginProcessLinux.a \
               lldbPluginProcessPOSIX.a \
-              lldbPluginDynamicLoaderMacOSX.a \
-              lldbPluginProcessElfCore.a \
-              lldbPluginJITLoaderGDB.a
+              lldbPluginDynamicLoaderMacOSX.a
 endif
 
 ifeq ($(HOST_OS),MingW)
-  USEDLIBS += lldbHostWindows.a \
-              lldbPluginProcessElfCore.a \
-              lldbPluginJITLoaderGDB.a
+  USEDLIBS += lldbHostWindows.a
 endif
 
 ifneq (,$(filter $(HOST_OS), FreeBSD GNU/kFreeBSD))
   USEDLIBS += lldbHostFreeBSD.a \
               lldbPluginProcessPOSIX.a \
-              lldbPluginProcessFreeBSD.a \
-              lldbPluginProcessElfCore.a \
-              lldbPluginJITLoaderGDB.a
+              lldbPluginProcessFreeBSD.a
 endif
 
 include $(LEVEL)/Makefile.common
diff --git a/source/Plugins/Makefile b/source/Plugins/Makefile
index e43290d..4a74569 100644
--- a/source/Plugins/Makefile
+++ b/source/Plugins/Makefile
@@ -21,7 +21,10 @@ DIRS := ABI/MacOSX-arm ABI/MacOSX-i386 ABI/SysV-x86_64 Disassembler/llvm \
 	LanguageRuntime/ObjC/AppleObjCRuntime \
 	DynamicLoader/POSIX-DYLD \
 	OperatingSystem/Python \
-	SymbolVendor/ELF
+	SymbolVendor/ELF \
+	Process/elf-core \
+	Process/mach-core \
+	JITLoader/GDB
 
 ifeq ($(HOST_OS),Darwin)
 DIRS += Process/MacOSX-Kernel
@@ -29,26 +32,19 @@ DIRS += DynamicLoader/MacOSX-DYLD DynamicLoader/Darwin-Kernel
 DIRS +=	ObjectContainer/Universal-Mach-O ObjectFile/Mach-O
 DIRS += SymbolVendor/MacOSX
 #DIRS += Process/MacOSX-User
-DIRS += Process/mach-core
 DIRS += SystemRuntime/MacOSX
 endif
 
 ifeq ($(HOST_OS),Linux)
 DIRS += DynamicLoader/MacOSX-DYLD
 DIRS += Process/Linux Process/POSIX
-DIRS += Process/elf-core
-DIRS += JITLoader/GDB
 endif
 
 ifeq ($(HOST_OS),MingW)
-DIRS += Process/elf-core
-DIRS += JITLoader/GDB
 endif
 
 ifneq (,$(filter $(HOST_OS), FreeBSD GNU/kFreeBSD))
 DIRS += Process/FreeBSD Process/POSIX
-DIRS += Process/elf-core
-DIRS += JITLoader/GDB
 endif
 
 include $(LLDB_LEVEL)/Makefile
-- 
1.8.5.5