[Lldb-commits] [lldb] r131742 - /lldb/trunk/source/Host/macosx/Makefile

[Charles Davis]

Author: cdavis
Date: Fri May 20 13:18:09 2011
New Revision: 131742

URL: http://llvm.org/viewvc/llvm-project?rev=131742&view=rev
Log:
Better way to build the CFCPP sources as part of liblldbHostMacOSX.

Modified:
    lldb/trunk/source/Host/macosx/Makefile

Modified: lldb/trunk/source/Host/macosx/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/macosx/Makefile?rev=131742&r1=131741&r2=131742&view=diff
==============================================================================
--- lldb/trunk/source/Host/macosx/Makefile (original)
+++ lldb/trunk/source/Host/macosx/Makefile Fri May 20 13:18:09 2011
@@ -11,14 +11,16 @@
 LIBRARYNAME := lldbHostMacOSX
 BUILD_ARCHIVE = 1
 
-SOURCES = $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cpp $(PROJ_SRC_DIR)/*.mm)) \
+CFCPP_SOURCES = \
           $(addprefix cfcpp/,$(notdir $(wildcard $(PROJ_SRC_DIR)/cfcpp/*.cpp)))
+SOURCES = $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cpp $(PROJ_SRC_DIR)/*.mm)) \
+          $(CFCPP_SOURCES)
 
-# Make sure the cfcpp output directory exists
-all-local:: $(PROJ_OBJ_DIR)/$(BuildMode)/cfcpp
+include $(LLDB_LEVEL)/Makefile
 
-$(PROJ_OBJ_DIR)/$(BuildMode)/cfcpp:
-	-$(Verb) $(MKDIR) $(PROJ_OBJ_DIR)/$(BuildMode)/cfcpp 2>/dev/null
+CFCPP_BaseNameSources := $(sort $(basename $(CFCPP_SOURCES)))
+CFCPP_OBJECTS := $(CFCPP_BaseNameSources:%=$(ObjDir)/%.o)
 
-include $(LLDB_LEVEL)/Makefile
+# Make sure the cfcpp output directory exists
+$(CFCPP_OBJECTS): $(ObjDir)/cfcpp/.dir