[vmkit-commits] [vmkit] r54684 - in /vmkit/trunk: lib/Makefile tools/vmkit/Makefile

[Nicolas Geoffray]

Author: geoffray
Date: Tue Aug 12 08:29:43 2008
New Revision: 54684

URL: http://llvm.org/viewvc/llvm-project?rev=54684&view=rev
Log:
Fix lib dependency of makefiles.


Modified:
    vmkit/trunk/lib/Makefile
    vmkit/trunk/tools/vmkit/Makefile

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

==============================================================================
--- vmkit/trunk/lib/Makefile (original)
+++ vmkit/trunk/lib/Makefile Tue Aug 12 08:29:43 2008
@@ -16,7 +16,9 @@
 PARALLEL_DIRS += JnJVM
 endif
 
+ifeq ($(WITH_N3_MONO), 1)Â || ($(WITH_N3_PNETLIB), 1)
 PARALLEL_DIRS += N3
+endif
 
 include $(LEVEL)/Makefile.common
 

Modified: vmkit/trunk/tools/vmkit/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmkit/Makefile?rev=54684&r1=54683&r2=54684&view=diff

==============================================================================
--- vmkit/trunk/tools/vmkit/Makefile (original)
+++ vmkit/trunk/tools/vmkit/Makefile Tue Aug 12 08:29:43 2008
@@ -11,10 +11,21 @@
 include $(LEVEL)/Makefile.config
 
 TOOLNAME = vmkit
-USEDLIBS = Allocator CommonThread Mvm $(GCLIB) JnJVM Classpath PNetLib N3
+USEDLIBS = Allocator CommonThread Mvm $(GCLIB) 
+
+ifeq ($(WITH_JNJVM), 1)
+USEDLIBS += JnJVM Classpath
+endif
+
+ifeq ($(WITH_N3_PNETLIB), 1)
+  USEDLIBS += N3 PNetLib
+endif
+
 LINK_COMPONENTS = engine scalaropts instrumentation ipa ipo
 
 include $(LEVEL)/Makefile.common
 
+ifeq ($(WITH_N3_PNETLIB), 1)
 LIBS += $(PNETLIB)/engine/libILEngine.a $(PNETLIB)/image/libILImage.a $(PNETLIB)/support/libILSupport.a \
         $(PNETLIB)/libffi/.libs/libffi.a $(PNETLIB)//dumpasm/libILDumpAsm.a
+endif