[vmkit-commits] [vmkit] r54729 - in /vmkit/trunk: Makefile.config.in Makefile.rules autoconf/configure.ac configure lib/Makefile

[Nicolas Geoffray]

Author: geoffray
Date: Wed Aug 13 04:28:19 2008
New Revision: 54729

URL: http://llvm.org/viewvc/llvm-project?rev=54729&view=rev
Log:
Makefile fixes.


Modified:
    vmkit/trunk/Makefile.config.in
    vmkit/trunk/Makefile.rules
    vmkit/trunk/autoconf/configure.ac
    vmkit/trunk/configure
    vmkit/trunk/lib/Makefile

Modified: vmkit/trunk/Makefile.config.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.config.in?rev=54729&r1=54728&r2=54729&view=diff

==============================================================================
--- vmkit/trunk/Makefile.config.in (original)
+++ vmkit/trunk/Makefile.config.in Wed Aug 13 04:28:19 2008
@@ -1,4 +1,5 @@
 GCLIB = @GC_LIBS@
+WITH_N3 = @WITH_N3@
 WITH_N3_PNETLIB = @WITH_N3_PNETLIB@
 WITH_N3_MONO = @WITH_N3_MONO@
 WITH_JNJVM = @WITH_JNJVM@

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

==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Wed Aug 13 04:28:19 2008
@@ -3,13 +3,13 @@
 .PRECIOUS: LLVMRuntime.inc
 
 # All of these files depend on tblgen and the .td files.
-LLVMRuntime.inc : $(LLVMAS) $(LLC) $(LLFiles)
+LLVMRuntime.inc : $(LLVMAS) $(LLC) $(VMKIT_RUNTIME)
 
 LLVMRuntime.gen.ll : $(VMKIT_RUNTIME)
 	$(Verb) cat $(VMKIT_RUNTIME) > LLVMRuntime.gen.ll
 
 LLVMRuntime.inc : LLVMRuntime.gen.ll
-	$(Echo) "Building LLVM runtime"
+	$(Echo) "Building LLVM runtime with $(VMKIT_RUNTIME)"
 	$(Verb) $(LLVMAS) -f $(<F) -o - | $(LLC) -march=cpp -cppgen=contents -f -o $@
 
 

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

==============================================================================
--- vmkit/trunk/autoconf/configure.ac (original)
+++ vmkit/trunk/autoconf/configure.ac Wed Aug 13 04:28:19 2008
@@ -295,9 +295,12 @@
        [[pnetlibpath=/usr/lib/cscc/lib/]]
 )
 
+WITH_N3=0
+
 if test "x$pnetlocalprefix" != x; then
   echo Using ${pnetlocalprefix} as PNET local prefix;
   WITH_N3_PNETLIB=1;
+  WITH_N3=1;
 else
   WITH_N3_PNETLIB=0;
 fi
@@ -319,6 +322,7 @@
 if test "x$monopath" != x; then
   echo Building N3 with Mono;
   WITH_N3_MONO=1;
+  WITH_N3=1;
 else
   WITH_N3_MONO=0;
 fi
@@ -326,6 +330,8 @@
 AC_SUBST([WITH_N3_MONO])
 AC_SUBST([monopath])
 
+AC_SUBST([WITH_N3])
+
 dnl===-----------------------------------------------------------------------===
 dnl===
 dnl=== SECTION 4: Check for programs we need and that they are the right version

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

==============================================================================
--- vmkit/trunk/configure (original)
+++ vmkit/trunk/configure Wed Aug 13 04:28:19 2008
@@ -701,6 +701,7 @@
 pnetlibpath
 WITH_N3_MONO
 monopath
+WITH_N3
 CXX
 CXXFLAGS
 ac_ct_CXX
@@ -4024,9 +4025,12 @@
 fi
 
 
+WITH_N3=0
+
 if test "x$pnetlocalprefix" != x; then
   echo Using ${pnetlocalprefix} as PNET local prefix;
   WITH_N3_PNETLIB=1;
+  WITH_N3=1;
 else
   WITH_N3_PNETLIB=0;
 fi
@@ -4051,6 +4055,7 @@
 if test "x$monopath" != x; then
   echo Building N3 with Mono;
   WITH_N3_MONO=1;
+  WITH_N3=1;
 else
   WITH_N3_MONO=0;
 fi
@@ -4059,6 +4064,8 @@
 
 
 
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -7848,6 +7855,7 @@
 pnetlibpath!$pnetlibpath$ac_delim
 WITH_N3_MONO!$WITH_N3_MONO$ac_delim
 monopath!$monopath$ac_delim
+WITH_N3!$WITH_N3$ac_delim
 CXX!$CXX$ac_delim
 CXXFLAGS!$CXXFLAGS$ac_delim
 ac_ct_CXX!$ac_ct_CXX$ac_delim
@@ -7861,7 +7869,6 @@
 MV!$MV$ac_delim
 RANLIB!$RANLIB$ac_delim
 RM!$RM$ac_delim
-SED!$SED$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -7903,6 +7910,7 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+SED!$SED$ac_delim
 TAR!$TAR$ac_delim
 BINPWD!$BINPWD$ac_delim
 CAT!$CAT$ac_delim
@@ -7917,7 +7925,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 13; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

Modified: vmkit/trunk/lib/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Makefile?rev=54729&r1=54728&r2=54729&view=diff

==============================================================================
--- vmkit/trunk/lib/Makefile (original)
+++ vmkit/trunk/lib/Makefile Wed Aug 13 04:28:19 2008
@@ -16,7 +16,7 @@
 PARALLEL_DIRS += JnJVM
 endif
 
-ifeq ($(WITH_N3_MONO), 1)Â || ($(WITH_N3_PNETLIB), 1)
+ifeq ($(WITH_N3), 1)
 PARALLEL_DIRS += N3
 endif