[llvm-branch-commits] [cfe-branch] r102716 - /cfe/branches/Apple/cremebrulee-IB/Makefile

[Daniel Dunbar]

Author: ddunbar
Date: Fri Apr 30 10:24:06 2010
New Revision: 102716

URL: http://llvm.org/viewvc/llvm-project?rev=102716&view=rev
Log:
Don't use '::' targets when unnecessary.

Modified:
    cfe/branches/Apple/cremebrulee-IB/Makefile

Modified: cfe/branches/Apple/cremebrulee-IB/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/cremebrulee-IB/Makefile?rev=102716&r1=102715&r2=102716&view=diff
==============================================================================
--- cfe/branches/Apple/cremebrulee-IB/Makefile (original)
+++ cfe/branches/Apple/cremebrulee-IB/Makefile Fri Apr 30 10:24:06 2010
@@ -195,7 +195,9 @@
 
 SYSCTL := $(shell if [ `sysctl -n hw.activecpu` -ge 8 -a `sysctl -n hw.memsize` -le 2147483648 ]; then echo 4; else sysctl -n hw.activecpu; fi)
 
+# Default is to build Clang.
 install: install-clang
+clean: clean-clang
 
 installsrc:
 	@echo "Installing source for $(Project)..."
@@ -205,14 +207,12 @@
 
 installhdrs:
 
-clean: clean-clang
-
 ##
 # Cross Compilation Build Support
 
 .PHONY: install-cross build-cross configure-cross setup-tools-cross
 
-install-cross:: build-cross
+install-cross: build-cross
 	$(_v) for arch in $(RC_ARCHS) ; do \
 		echo "Installing $(Project) for $$arch..." && \
 		$(MKDIR) $(OBJROOT)/install-$$arch && \
@@ -234,13 +234,13 @@
 	$(_v) find $(DSTROOT) -name \*.dSYM -print | xargs rm -r
 	$(_v)- $(CHOWN) -R root:wheel $(DSTROOT) $(SYMROOT)
 
-build-cross:: configure-cross
+build-cross: configure-cross
 	$(_v) for arch in $(RC_ARCHS) ; do \
 		echo "Building (Cross) $(Project) for $$arch..." && \
 		$(MAKE) -j$(SYSCTL) -C $(OBJROOT)/$$arch $(Build_Target) CFLAGS="-arch $$arch $(CFLAGS)" CXXFLAGS="-arch $$arch $(CXXFLAGS)" OPTIONAL_DIRS= CLANG_NO_RUNTIME=1 || exit 1; \
 	done
 
-configure-cross:: setup-tools-cross
+configure-cross: setup-tools-cross
 	$(_v) for arch in $(RC_ARCHS) ; do \
 		echo "Configuring (Cross) $(Project) for $$arch..." && \
 		$(MKDIR) $(OBJROOT)/$$arch && \
@@ -255,7 +255,7 @@
 # A cross-compiler configure will expect to find tools under names like
 # arm-apple-darwin10-gcc, so make sure we have them. Note that -marm
 # is added to the gcc/g++ command line due to rdar://7353031
-setup-tools-cross::
+setup-tools-cross:
 	$(_v) $(MKDIR) $(OBJROOT)/bin
 	$(_v) for prog in ar nm ranlib strip lipo ld as ; do \
 	  echo '#!/bin/sh' > $(OBJROOT)/bin/arm-apple-darwin10-$$prog && \
@@ -274,7 +274,7 @@
 	done
 
 ##
-# Standard Build Support
+# Standard Clang Build Support
 
 .PHONY: install-clang install-clang_final build-clang build-clang_final build-clang_stage1
 .PHONY: configure-clang_final configure-clang_singlestage configure-clang_stage2
@@ -283,7 +283,7 @@
 
 install-clang: install-clang_final $(Extra_Clang_Install_Targets)
 
-install-clang_final:: build-clang
+install-clang_final: build-clang
 	$(_v) for arch in $(RC_ARCHS) ; do \
 		echo "Installing $(Project) for $$arch..." && \
 		$(MKDIR) $(OBJROOT)/install-$$arch && \
@@ -305,24 +305,24 @@
 	$(_v) find $(DSTROOT) -name \*.dSYM -print | xargs rm -r
 	$(_v)- $(CHOWN) -R root:wheel $(DSTROOT) $(SYMROOT)
 
-build-clang:: build-clang_final
+build-clang: build-clang_final
 
-build-clang_final:: configure-clang_final
+build-clang_final: configure-clang_final
 	$(_v) for arch in $(RC_ARCHS) ; do \
 		echo "Building (Final) $(Project) for $$arch..." && \
 		$(MAKE) -j$(SYSCTL) -C $(OBJROOT)/$$arch $(Build_Target) || exit 1; \
 	done
 
-build-clang_stage1:: configure-clang_stage1
+build-clang_stage1: configure-clang_stage1
 	$(_v) for arch in $(RC_ARCHS) ; do \
 		echo "Building (Stage 1) $(Project) for $$arch..." && \
 		$(MAKE) -j$(SYSCTL) -C $(OBJROOT)/stage1-$$arch $(Build_Target) || exit 1; \
 		$(MAKE) -j$(SYSCTL) -C $(OBJROOT)/stage1-$$arch $(Install_Target) || exit 1; \
 	done
 
-configure-clang_final:: $(Final_Configure_Target)
+configure-clang_final: $(Final_Configure_Target)
 
-configure-clang_stage2:: build-clang_stage1
+configure-clang_stage2: build-clang_stage1
 	$(_v) $(MKDIR) $(OBJROOT)
 	$(_v) for arch in $(RC_ARCHS) ; do \
 		echo "Configuring (Final) $(Project) for $$arch..." && \
@@ -333,7 +333,7 @@
 		  CXX="$(OBJROOT)/stage1-install-$$arch/bin/clang++ -arch $$arch" || exit 1 ; \
 	done
 
-configure-clang_singlestage::
+configure-clang_singlestage:
 	$(_v) $(MKDIR) $(OBJROOT)
 	$(_v) for arch in $(RC_ARCHS) ; do \
 		echo "Configuring (Final) $(Project) for $$arch..." && \
@@ -344,7 +344,7 @@
 		  CXX="$(CXX) -arch $$arch" || exit 1 ; \
 	done
 
-configure-clang_stage1:: 
+configure-clang_stage1: 
 	$(_v) $(MKDIR) $(OBJROOT)
 	$(_v) for arch in $(RC_ARCHS) ; do \
 		echo "Configuring (Stage 1) $(Project) for $$arch..." && \
@@ -355,7 +355,7 @@
 	done
 
 # FIXME: Eliminate this step.
-clean::
+clean-clang:
 	if [ "$(SRCROOT)" != . ]; then \
 	  rm -rf "$(SRCROOT)/clang/test/Archive"; \
 	fi