[vmkit-commits] [vmkit] r54678 - in /vmkit/trunk: Makefile.rules lib/Mvm/Runtime/JIT.cpp lib/Mvm/Runtime/Makefile

[Nicolas Geoffray]

Author: geoffray
Date: Tue Aug 12 05:15:34 2008
New Revision: 54678

URL: http://llvm.org/viewvc/llvm-project?rev=54678&view=rev
Log:
Fix rule to generate .inc files, not .cpp files.


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

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

==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Tue Aug 12 05:15:34 2008
@@ -1,11 +1,11 @@
 ifdef VMKIT_RUNTIME
 
 LLFiles := $(strip $(wildcard $(PROJ_SRC_DIR)/*.ll))
-CPPFiles := $(filter %.cpp,$(BUILT_SOURCES))
+INCFiles := $(filter %.inc,$(BUILT_SOURCES))
 .PRECIOUS: $(CPPFiles)
 
 # All of these files depend on tblgen and the .td files.
-$(CPPFiles) : $(LLVMAS) $(LLC) $(LLFiles)
+$(INCFiles) : $(LLVMAS) $(LLC) $(LLFiles)
 
 # CPPFiles rule: All of the tblgen generated files are emitted to 
 # $(ObjDir)/%.inc.tmp, instead of emitting them directly to %.inc.  This allows
@@ -13,12 +13,12 @@
 # tblgen is modified, all of the .inc.tmp files are regereated, but no
 # dependencies of the .inc files are, unless the contents of the .inc file
 # changes.
-$(CPPFiles) : %.cpp : %.ll
+$(INCFiles) : %.inc : %.ll
 	$(Echo) "Building $(<F) LLVM runtime"
 	$(Verb) $(LLVMAS) -f $(<F) -o - | $(LLC) -march=cpp -cppgen=contents -f -o $@
 
 
 clean-local::
-	$(Verb) $(RM) -f $(CPPFiles)
+	$(Verb) $(RM) -f $(INCFiles)
 
 endif

Modified: vmkit/trunk/lib/Mvm/Runtime/JIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Runtime/JIT.cpp?rev=54678&r1=54677&r2=54678&view=diff

==============================================================================
--- vmkit/trunk/lib/Mvm/Runtime/JIT.cpp (original)
+++ vmkit/trunk/lib/Mvm/Runtime/JIT.cpp Tue Aug 12 05:15:34 2008
@@ -51,7 +51,7 @@
 extern "C" void __register_frame(void*);
 
 static
-#include "LLVMRuntime.cpp"
+#include "LLVMRuntime.inc"
 
 void mvm::jit::initialise() {
   llvm::NoFramePointerElim = true;

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

==============================================================================
--- vmkit/trunk/lib/Mvm/Runtime/Makefile (original)
+++ vmkit/trunk/lib/Mvm/Runtime/Makefile Tue Aug 12 05:15:34 2008
@@ -13,6 +13,6 @@
 LIBRARYNAME = Mvm
 VMKIT_RUNTIME = Mvm
 
-BUILT_SOURCES = LLVMRuntime.cpp
+BUILT_SOURCES = LLVMRuntime.inc
 
 include $(LEVEL)/Makefile.common