[vmkit-commits] [vmkit] r63308 - in /vmkit/trunk: Makefile.rules lib/Mvm/Runtime/Makefile

[Nicolas Geoffray]

Author: geoffray
Date: Thu Jan 29 08:18:50 2009
New Revision: 63308

URL: http://llvm.org/viewvc/llvm-project?rev=63308&view=rev
Log:
Cleaning (?) Makefiles.


Modified:
    vmkit/trunk/Makefile.rules
    vmkit/trunk/lib/Mvm/Runtime/Makefile

Modified: vmkit/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.rules?rev=63308&r1=63307&r2=63308&view=diff

==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Thu Jan 29 08:18:50 2009
@@ -22,13 +22,15 @@
 
 .PRECIOUS: LLVMAssembly.s
 
-LLVMAssembly.s : $(LLVMAS) $(LLC) $(VMKIT_ASSEMBLY)
+LLVMAssembly.o : $(LLVMAS) $(LLC) $(VMKIT_ASSEMBLY)
 
 LLVMAssembly.s : LLVMAssembly.ll
 	$(Echo) "Building LLVM assembly with $(VMKIT_ASSEMBLY)"
 	$(Verb) $(LLVMAS) -f $(<F) -o - | $(LLC) -f -o $@
+
+LLVMAssembly.o : LLVMAssembly.s
 	$(Verb) $(MKDIR) $(BuildMode)
-	$(Verb) $(GAS) $@ -o $(BuildMode)/LLVMAssembly.o
+	$(Verb) $(GAS) LLVMAssembly.s -o $(BuildMode)/LLVMAssembly.o
 
 clean-local::
 	$(Verb) $(RM) -f LLVMAssembly.s LLVMAssembly.bc

Modified: vmkit/trunk/lib/Mvm/Runtime/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Runtime/Makefile?rev=63308&r1=63307&r2=63308&view=diff

==============================================================================
--- vmkit/trunk/lib/Mvm/Runtime/Makefile (original)
+++ vmkit/trunk/lib/Mvm/Runtime/Makefile Thu Jan 29 08:18:50 2009
@@ -13,7 +13,7 @@
 LIBRARYNAME = Mvm
 VMKIT_RUNTIME = $(PROJ_SRC_DIR)/LLVMRuntime.ll
 VMKIT_ASSEMBLY = $(PROJ_SRC_DIR)/LLVMAssembly.ll
-BUILT_SOURCES = LLVMRuntime.inc LLVMAssembly.s
+BUILT_SOURCES = LLVMRuntime.inc LLVMAssembly.o
 
 SOURCES = LLVMAssembly.s $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cpp))