[vmkit-commits] [vmkit] r119018 - in /vmkit/trunk: Makefile.common.in include/j3/LLVMMaterializer.h lib/J3/Classpath/ClasspathReflect.h lib/J3/VMCore/Zip.cpp

[Gael Thomas]

Author: gthomas
Date: Sat Nov 13 18:55:07 2010
New Revision: 119018

URL: http://llvm.org/viewvc/llvm-project?rev=119018&view=rev
Log:
Load dependency files. Don't know if I can define BYTECODE_LIBRARY, thus copy the llvm if. Fix some includes.

Modified:
    vmkit/trunk/Makefile.common.in
    vmkit/trunk/include/j3/LLVMMaterializer.h
    vmkit/trunk/lib/J3/Classpath/ClasspathReflect.h
    vmkit/trunk/lib/J3/VMCore/Zip.cpp

Modified: vmkit/trunk/Makefile.common.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.common.in?rev=119018&r1=119017&r2=119018&view=diff
==============================================================================
--- vmkit/trunk/Makefile.common.in (original)
+++ vmkit/trunk/Makefile.common.in Sat Nov 13 18:55:07 2010
@@ -38,3 +38,9 @@
 endif
 
 include $(PROJ_SRC_ROOT)/Makefile.rules
+
+ifndef DISABLE_AUTO_DEPENDENCIES
+ifndef IS_CLEANING_TARGET
+-include $(DependSourceFiles:%=$(PROJ_OBJ_DIR)/$(BuildMode)/%.bc.d)
+endif
+endif

Modified: vmkit/trunk/include/j3/LLVMMaterializer.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/j3/LLVMMaterializer.h?rev=119018&r1=119017&r2=119018&view=diff
==============================================================================
--- vmkit/trunk/include/j3/LLVMMaterializer.h (original)
+++ vmkit/trunk/include/j3/LLVMMaterializer.h Sat Nov 13 18:55:07 2010
@@ -12,7 +12,7 @@
 
 #include <llvm/GVMaterializer.h>
 
-#include <j3/JavaJITCompiler.h>
+#include "j3/JavaJITCompiler.h"
 
 namespace j3 {
 

Modified: vmkit/trunk/lib/J3/Classpath/ClasspathReflect.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathReflect.h?rev=119018&r1=119017&r2=119018&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathReflect.h (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathReflect.h Sat Nov 13 18:55:07 2010
@@ -12,8 +12,8 @@
 
 #include "MvmGC.h"
 
-#include <JavaClass.h>
-#include <JavaObject.h>
+#include "JavaClass.h"
+#include "JavaObject.h"
 
 extern "C" j3::JavaObject* internalFillInStackTrace(j3::JavaObject*);
 

Modified: vmkit/trunk/lib/J3/VMCore/Zip.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Zip.cpp?rev=119018&r1=119017&r2=119018&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Zip.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/Zip.cpp Sat Nov 13 18:55:07 2010
@@ -9,7 +9,7 @@
 
 #include <zlib.h>
 
-#include <mvm/Allocator.h>
+#include "mvm/Allocator.h"
 
 #include "JavaArray.h"
 #include "Reader.h"