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

[Nicolas Geoffray]

Author: geoffray
Date: Thu Jan 29 08:41:38 2009
New Revision: 63309

URL: http://llvm.org/viewvc/llvm-project?rev=63309&view=rev
Log:
Makefiles again.


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=63309&r1=63308&r2=63309&view=diff

==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Thu Jan 29 08:41:38 2009
@@ -28,9 +28,9 @@
 	$(Echo) "Building LLVM assembly with $(VMKIT_ASSEMBLY)"
 	$(Verb) $(LLVMAS) -f $(<F) -o - | $(LLC) -f -o $@
 
-LLVMAssembly.o : LLVMAssembly.s
-	$(Verb) $(MKDIR) $(BuildMode)
-	$(Verb) $(GAS) LLVMAssembly.s -o $(BuildMode)/LLVMAssembly.o
+$(ObjDir)/%.lo $(ObjDir)/%.o: %.s $(ObjDir)/.dir $(BUILT_SOURCES)
+	$(Echo) "Compiling $*.s for $(BuildMode) build " $(PIC_FLAG)
+	$(Verb) $(GAS) $< -o $(ObjDir)/$*.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=63309&r1=63308&r2=63309&view=diff

==============================================================================
--- vmkit/trunk/lib/Mvm/Runtime/Makefile (original)
+++ vmkit/trunk/lib/Mvm/Runtime/Makefile Thu Jan 29 08:41:38 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.o
+BUILT_SOURCES = LLVMRuntime.inc LLVMAssembly.s
 
 SOURCES = LLVMAssembly.s $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cpp))