win_xpsp3_i386_no_tools: Add known-good booting screenshot.

[virt-v2v-test-cases-nonfree.git] / common-rules.mk

diff --git a/common-rules.mk b/common-rules.mk
index 67afc1d..1f6fd56 100644 (file)
--- a/common-rules.mk
+++ b/common-rules.mk
@@ -19,7 +19,20 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o *.a *.so
 
 OCAMLFLAGS = -g -warn-error CDEFLMPSUVYZX-3-24
 
-OCAMLPACKAGES = -package str,unix,gettext-stub,libvirt,guestfs,v2v_test_harness
+if INSTALLED_TEST_HARNESS
+OCAMLLINKPKG  =
+else
+OCAMLLINKPKG  = v2v_test_harness.cmxa
+endif
+
+OCAMLPACKAGES  = -package str,unix,gettext-stub,libvirt,guestfs
+OCAMLLINKPKG  += -linkpkg
+
+if INSTALLED_TEST_HARNESS
+OCAMLPACKAGES += -package v2v_test_harness
+else
+OCAMLPACKAGES += -I $(TEST_HARNESS_DIR)
+endif
 
 # XXX FIXME
 # We don't distribute the xml.* files with the test harness.