[llvm-commits] [vmkit] r50488 - in /vmkit/trunk: configure.ac lib/JnJVM/VMCore/Makefile.am

[Nicolas Geoffray]

Author: geoffray
Date: Wed Apr 30 12:17:36 2008
New Revision: 50488

URL: http://llvm.org/viewvc/llvm-project?rev=50488&view=rev
Log:
Build fix.


Modified:
    vmkit/trunk/configure.ac
    vmkit/trunk/lib/JnJVM/VMCore/Makefile.am

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

==============================================================================
--- vmkit/trunk/configure.ac (original)
+++ vmkit/trunk/configure.ac Wed Apr 30 12:17:36 2008
@@ -237,6 +237,8 @@
     CXXFLAGS="$CXXFLAGS -DMULTIPLE_VM -DSERVICE_GC -DMULTIPLE_GC -DSERVICE_VM -I$PWD/lib/Mvm/Allocator"
   fi
 fi
+
+AM_CONDITIONAL([SERVICE_BUILD], [test "x$vmtype" = "xservice"])
   
 dnl **************************************************************************
 dnl GNU CLASSPATH version

Modified: vmkit/trunk/lib/JnJVM/VMCore/Makefile.am
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/Makefile.am?rev=50488&r1=50487&r2=50488&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/Makefile.am (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/Makefile.am Wed Apr 30 12:17:36 2008
@@ -13,6 +13,10 @@
 	JavaBacktrace.cpp NativeUtil.h NativeUtil.cpp Jni.cpp \
 	JavaCache.h JavaCache.cpp JavaUpcalls.h JavaUpcalls.cpp \
 	JnjvmModuleProvider.h JnjvmModuleProvider.cpp JavaRuntimeJIT.cpp JavaMetaJIT.cpp JavaJITInitialise.cpp \
-	LowerArrayLength.cpp ServiceDomain.cpp
+	LowerArrayLength.cpp 
+
+if SERVICE_BUILD
+libJnJVM_la_SOURCES += ServiceDomain.cpp
+endif
 
 libJnJVM_la_CXXFLAGS =-DPREFIX=\"$(PREFIX)\" -W -Wall -ansi -Wno-unused-parameter -Wno-long-long -Wno-unused-function -fno-omit-frame-pointer -g -Werror -O2