Index: tools/debugserver/source/CMakeLists.txt
===================================================================
--- tools/debugserver/source/CMakeLists.txt
+++ tools/debugserver/source/CMakeLists.txt
@@ -14,7 +14,7 @@
   -DDEBUGSERVER_VERSION_STR="${LLDB_VERSION}"
   )
 
-add_library(lldbDebugserverCommon
+add_lldb_library(lldbDebugserverCommon
   #${dnbconfig_header}
   debugserver.cpp
   DNBArch.cpp
Index: tools/debugserver/source/MacOSX/CMakeLists.txt
===================================================================
--- tools/debugserver/source/MacOSX/CMakeLists.txt
+++ tools/debugserver/source/MacOSX/CMakeLists.txt
@@ -14,7 +14,7 @@
   ${CMAKE_CURRENT_BINARY_DIR}/mach_excUser.c
   )
 add_custom_command(OUTPUT ${generated_mach_interfaces}
-  COMMAND mig -I${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/dbgnub-mig.defs
+  COMMAND mig -I${CMAKE_CURRENT_BINARY_DIR}/../.. ${CMAKE_CURRENT_SOURCE_DIR}/dbgnub-mig.defs
   DEPENDS ${dnbconfig_header}
   )
 
@@ -33,6 +33,7 @@
   CFString.cpp
   Genealogy.cpp
   MachException.cpp
+  Genealogy.cpp
   MachProcess.mm
   MachTask.mm
   MachThread.cpp
Index: tools/debugserver/source/MacOSX/Makefile
===================================================================
--- tools/debugserver/source/MacOSX/Makefile
+++ tools/debugserver/source/MacOSX/Makefile
@@ -24,6 +24,7 @@
 SOURCES := CFBundle.cpp \
   CFData.cpp			\
   CFString.cpp			\
+  Genealogy.cpp		\
   MachException.cpp		\
   MachProcess.cpp		\
   MachTask.cpp			\
@@ -51,4 +52,4 @@
 endif
 
 $(GENERATED_MACH_SOURCES):
-	mig -I$(PROJ_OBJ_DIR)/../.. $(PROJ_SRC_DIR)/dbgnub-mig.defs
\ No newline at end of file
+	mig -I$(PROJ_OBJ_DIR)/../.. $(PROJ_SRC_DIR)/dbgnub-mig.defs
Index: tools/debugserver/source/MacOSX/i386/CMakeLists.txt
===================================================================
--- tools/debugserver/source/MacOSX/i386/CMakeLists.txt
+++ tools/debugserver/source/MacOSX/i386/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_NO_RTTI 1)
 
 include_directories(${LLDB_SOURCE_DIR}/tools/debugserver/source)
-add_library(lldbDebugserverMacOSX_I386
+add_lldb_library(lldbDebugserverMacOSX_I386
   DNBArchImplI386.cpp
   )
Index: tools/debugserver/source/MacOSX/x86_64/CMakeLists.txt
===================================================================
--- tools/debugserver/source/MacOSX/x86_64/CMakeLists.txt
+++ tools/debugserver/source/MacOSX/x86_64/CMakeLists.txt
@@ -5,6 +5,6 @@
 # we must include the grandparent directory...
 include_directories(${LLDB_SOURCE_DIR}/tools/debugserver/source)
 
-add_library(lldbDebugserverMacOSX_X86_64
+add_lldb_library(lldbDebugserverMacOSX_X86_64
   DNBArchImplX86_64.cpp
   )