X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=common-rules.mk;h=629fc95f1bba215b9d3e484dbbcda25377e8b0b1;hb=refs%2Fheads%2Fsynced%2Fmaster;hp=67afc1df852ac58d32b16f73213c0dc6d8d34438;hpb=3678804a681bb01bbf057c6bf9344aabc285e1d5;p=virt-v2v-test-cases-nonfree.git

diff --git a/common-rules.mk b/common-rules.mk
index 67afc1d..629fc95 100644
--- a/common-rules.mk
+++ b/common-rules.mk
@@ -19,7 +19,25 @@ 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  = mllib.cmxa v2v_test_harness.cmxa -cclib '-lutils -lgnu'
+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)/../../common/utils/.libs \
+	-I $(TEST_HARNESS_DIR)/../../src/.libs \
+	-I $(TEST_HARNESS_DIR)/../../gnulib/lib/.libs \
+	-I $(TEST_HARNESS_DIR)/../../mllib \
+	-I $(TEST_HARNESS_DIR)
+endif
 
 # XXX FIXME
 # We don't distribute the xml.* files with the test harness.