Slightly simplify make logic

[oota-llvm.git] / Makefile.rules

diff --git a/Makefile.rules b/Makefile.rules
index a524f0b9f193f3618e9a30e70ce4aa133118cdba..45a25edb0ab4916908277737a97eaa8b75928a5d 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -332,7 +332,7 @@ LCC1XX  := $(LLVMGCCDIR)/libexec/gcc/$(LLVMGCCARCH)/cc1plus
 # Some of the compiled LLVM tools which are used for compilation of runtime
 # libraries.
 #
-LLVMAS  := $(LLVMTOOLCURRENT)/as
+LLVMAS  := $(LLVMTOOLCURRENT)/llvm-as
 
 
 ###########################################################################
@@ -354,14 +354,15 @@ endif
 # Allow gnu extensions...
 CPPFLAGS += -D_GNU_SOURCE
 
-CompileCommonOpts := -Wall -W  -Wwrite-strings -Wno-unused -I$(LEVEL)/include
-CompileOptimizeOpts := -O3 -DNDEBUG -finline-functions -fshort-enums
+CompileWarnings  := -Wall -W  -Wwrite-strings -Wno-unused
+CompileCommonOpts := $(CompileWarnings) -I$(LEVEL)/include -fshort-enums
+CompileOptimizeOpts := -O3 -DNDEBUG -finline-functions
 
 #
 # Compile commands with libtool.
 #
 Compile  := $(LIBTOOL) --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CompileCommonOpts)
-CompileC  := $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CCFLAGS) $(CompileCommonOpts)
+CompileC  := $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(CompileCommonOpts)
 
 # Compile a cpp file, don't link...
 CompileG := $(Compile) -g  -D_DEBUG
@@ -739,11 +740,11 @@ $(BUILD_OBJ_DIR)/Debug/%.lo: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Debug/.dir
 
 $(BUILD_OBJ_DIR)/Bytecode/%.bc: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Bytecode/.dir $(LCC1XX)
        @echo "Compiling $< to bytecode"
-       $(VERB) $(LLVMGXX) $(CPPFLAGS) -c $< -o $@
+       $(VERB) $(LLVMGXX) $(CompileWarnings) $(CPPFLAGS) -c $< -o $@
 
 $(BUILD_OBJ_DIR)/Bytecode/%.bc: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Bytecode/.dir $(LCC1)
        @echo "Compiling $< to bytecode"
-       $(VERB) $(LLVMGCC) $(CPPFLAGS) -c $< -o $@
+       $(VERB) $(LLVMGCC) $(CompileWarnings) $(CPPFLAGS) -c $< -o $@
 
 $(BUILD_OBJ_DIR)/Bytecode/%.bc: $(SourceDir)%.ll $(BUILD_OBJ_DIR)/Bytecode/.dir $(LLVMAS)
        @echo "Compiling $< to bytecode"
@@ -842,9 +843,7 @@ $(BUILD_OBJ_DIR)/Depend/%.d: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Depend/.dir
 #
 ifneq ($(MAKECMDGOALS),clean)
 ifneq ($(MAKECMDGOALS),distclean)
-ifneq ($(SourceDepend),)
--include $(SourceDepend)
-endif
+-include /dev/null $(SourceDepend)
 endif
 endif