Index: Makefile
===================================================================
--- Makefile
+++ Makefile
@@ -88,14 +88,6 @@
 
 ifeq ($(IS_TOP_LEVEL),1)
 
-ifneq ($(PROJ_SRC_ROOT),$(PROJ_OBJ_ROOT))
-$(RecursiveTargets)::
-	$(Verb) if [ ! -f test/Makefile ]; then \
-	  $(MKDIR) test; \
-	  $(CP) $(PROJ_SRC_DIR)/test/Makefile test/Makefile; \
-	fi
-endif
-
 test::
 	@ $(MAKE) -C test
 
Index: source/Plugins/Platform/MacOSX/Makefile
===================================================================
--- source/Plugins/Platform/MacOSX/Makefile
+++ source/Plugins/Platform/MacOSX/Makefile
@@ -8,6 +8,25 @@
 ##===----------------------------------------------------------------------===##
 
 LLDB_LEVEL := ../../../..
+LEVEL := $(LLDB_LEVEL)/../..
+
+include $(LEVEL)/Makefile.config
+
+SOURCES += PlatformDarwin.cpp \
+		   PlatformDarwinKernel.cpp \
+		   PlatformMacOSX.cpp \
+		   PlatformRemoteiOS.cpp \
+		   PlatformRemoteAppleTV.cpp \
+		   PlatformRemoteAppleWatch.cpp
+
+ifeq ($(HOST_OS),Darwin)
+SOURCES += PlatformAppleSimulator.cpp \
+		   PlatformiOSSimulator.cpp \
+		   PlatformiOSSimulatorCoreSimulatorSupport.mm \
+		   PlatformAppleTVSimulator.cpp \
+		   PlatformAppleWatchSimulator.cpp
+endif
+
 LIBRARYNAME := lldbPluginPlatformMacOSX
 BUILD_ARCHIVE = 1