[vmkit-commits] [vmkit] r57512 - in /vmkit/trunk: autoconf/configure.ac configure lib/N3/Mono/Mono.cpp lib/N3/Mono/MonoPath.cpp.in lib/N3/Mono/MonoPath.inc.in lib/N3/PNetLib/PNetLib.cpp lib/N3/PNetLib/PNetPath.cpp.in lib/N3/PNetLib/PNetPath.inc.in

[Nicolas Geoffray]

Author: geoffray
Date: Tue Oct 14 13:10:59 2008
New Revision: 57512

URL: http://llvm.org/viewvc/llvm-project?rev=57512&view=rev
Log:
Fix compilation of N3 when OBJ != SRC.


Added:
    vmkit/trunk/lib/N3/Mono/MonoPath.inc.in
      - copied unchanged from r57488, vmkit/trunk/lib/N3/Mono/MonoPath.cpp.in
    vmkit/trunk/lib/N3/PNetLib/PNetPath.inc.in
      - copied unchanged from r57488, vmkit/trunk/lib/N3/PNetLib/PNetPath.cpp.in
Removed:
    vmkit/trunk/lib/N3/Mono/MonoPath.cpp.in
    vmkit/trunk/lib/N3/PNetLib/PNetPath.cpp.in
Modified:
    vmkit/trunk/autoconf/configure.ac
    vmkit/trunk/configure
    vmkit/trunk/lib/N3/Mono/Mono.cpp
    vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp

Modified: vmkit/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/autoconf/configure.ac?rev=57512&r1=57511&r2=57512&view=diff

==============================================================================
--- vmkit/trunk/autoconf/configure.ac (original)
+++ vmkit/trunk/autoconf/configure.ac Tue Oct 14 13:10:59 2008
@@ -511,8 +511,8 @@
 AC_CONFIG_FILES(Makefile.common)
 AC_CONFIG_FILES(Makefile.config)
 AC_CONFIG_FILES([lib/JnJVM/Classpath/Classpath.h])
-AC_CONFIG_FILES([lib/N3/PNetLib/PNetPath.cpp])
-AC_CONFIG_FILES([lib/N3/Mono/MonoPath.cpp])
+AC_CONFIG_FILES([lib/N3/PNetLib/PNetPath.inc])
+AC_CONFIG_FILES([lib/N3/Mono/MonoPath.inc])
 
 dnl Do special configuration of Makefiles
 AC_CONFIG_MAKEFILE(Makefile)

Modified: vmkit/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/configure?rev=57512&r1=57511&r2=57512&view=diff

==============================================================================
--- vmkit/trunk/configure (original)
+++ vmkit/trunk/configure Tue Oct 14 13:10:59 2008
@@ -7136,9 +7136,9 @@
 
 ac_config_files="$ac_config_files lib/JnJVM/Classpath/Classpath.h"
 
-ac_config_files="$ac_config_files lib/N3/PNetLib/PNetPath.cpp"
+ac_config_files="$ac_config_files lib/N3/PNetLib/PNetPath.inc"
 
-ac_config_files="$ac_config_files lib/N3/Mono/MonoPath.cpp"
+ac_config_files="$ac_config_files lib/N3/Mono/MonoPath.inc"
 
 
 ac_config_commands="$ac_config_commands Makefile"
@@ -7716,8 +7716,8 @@
     "Makefile.common") CONFIG_FILES="$CONFIG_FILES Makefile.common" ;;
     "Makefile.config") CONFIG_FILES="$CONFIG_FILES Makefile.config" ;;
     "lib/JnJVM/Classpath/Classpath.h") CONFIG_FILES="$CONFIG_FILES lib/JnJVM/Classpath/Classpath.h" ;;
-    "lib/N3/PNetLib/PNetPath.cpp") CONFIG_FILES="$CONFIG_FILES lib/N3/PNetLib/PNetPath.cpp" ;;
-    "lib/N3/Mono/MonoPath.cpp") CONFIG_FILES="$CONFIG_FILES lib/N3/Mono/MonoPath.cpp" ;;
+    "lib/N3/PNetLib/PNetPath.inc") CONFIG_FILES="$CONFIG_FILES lib/N3/PNetLib/PNetPath.inc" ;;
+    "lib/N3/Mono/MonoPath.inc") CONFIG_FILES="$CONFIG_FILES lib/N3/Mono/MonoPath.inc" ;;
     "Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;;
     "lib/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS lib/Makefile" ;;
 

Modified: vmkit/trunk/lib/N3/Mono/Mono.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/Mono/Mono.cpp?rev=57512&r1=57511&r2=57512&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/Mono/Mono.cpp (original)
+++ vmkit/trunk/lib/N3/Mono/Mono.cpp Tue Oct 14 13:10:59 2008
@@ -23,6 +23,8 @@
 
 #include "number-formatter.h"
 
+#include "MonoPath.inc"
+
 using namespace n3;
 
 extern "C" int System_Environment_get_Platform (void) {

Removed: vmkit/trunk/lib/N3/Mono/MonoPath.cpp.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/Mono/MonoPath.cpp.in?rev=57511&view=auto

==============================================================================
--- vmkit/trunk/lib/N3/Mono/MonoPath.cpp.in (original)
+++ vmkit/trunk/lib/N3/Mono/MonoPath.cpp.in (removed)
@@ -1,15 +0,0 @@
-//===------ MonoPath.cpp - mscorlib.dll location for mono -----------------===//
-//
-//                              N3
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "MSCorlib.h"
-
-using namespace n3;
-
-const char* MSCorlib::libsPath  =  "@monopath@/";
-

Modified: vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp?rev=57512&r1=57511&r2=57512&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp (original)
+++ vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp Tue Oct 14 13:10:59 2008
@@ -28,6 +28,8 @@
 #include "VMObject.h"
 #include "VMThread.h"
 
+#include "PNetPath.inc"
+
 using namespace n3;
 
 #define IL_CONSOLE_NORMAL 0

Removed: vmkit/trunk/lib/N3/PNetLib/PNetPath.cpp.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/PNetLib/PNetPath.cpp.in?rev=57511&view=auto

==============================================================================
--- vmkit/trunk/lib/N3/PNetLib/PNetPath.cpp.in (original)
+++ vmkit/trunk/lib/N3/PNetLib/PNetPath.cpp.in (removed)
@@ -1,15 +0,0 @@
-//===---------- PNetPath.h - Configuration for pnetlib --------------------===//
-//
-//                              N3
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "MSCorlib.h"
-
-using namespace n3;
-
-const char* MSCorlib::libsPath  =  "@pnetlibpath@/";
-