Makefile: use TOPLEVEL instead of hardcoding ..

diff --git a/xenvm/Makefile b/xenvm/Makefile
index b01a7c293bbd5cd9d625768bdd7ea949a2f8e61b..e657418cc06e4d624e959c73ce08fc3d7eb1b47c 100644 (file)
--- a/xenvm/Makefile
+++ b/xenvm/Makefile
@@ -2,9 +2,11 @@ TOPLEVEL=..
 include $(TOPLEVEL)/common.make
 
 OCAMLINCLUDE += \
-       -I ../libs/log -I ../libs/xb -I ../libs/xs -I ../libs/uuid \
-       -I ../libs/mmap -I ../libs/xc -I ../libs/eventchn \
-       -I ../libs/netdev -I ../libs/stdext -I ../common -I ../xenops
+       -I $(TOPLEVEL)/libs/log -I $(TOPLEVEL)/libs/xb -I $(TOPLEVEL)/libs/xs \
+       -I $(TOPLEVEL)/libs/uuid -I $(TOPLEVEL)/libs/mmap \
+       -I $(TOPLEVEL)/libs/xc -I $(TOPLEVEL)/libs/eventchn \
+       -I $(TOPLEVEL)/libs/netdev -I $(TOPLEVEL)/libs/stdext \
+       -I $(TOPLEVEL)/common -I $(TOPLEVEL)/xenops
 OCAMLOPTFLAGS += -thread
 
 #OBJS_XENOPS_COMMON = \
@@ -13,39 +15,39 @@ OCAMLOPTFLAGS += -thread
 #      balloon device_common hotplug device \
 #      domain
 
-xenvm_OBJS = ../common/config xenvmlib tasks misc vmconfig vmstate vmact xenvm
+xenvm_OBJS = $(TOPLEVEL)/common/config xenvmlib tasks misc vmconfig vmstate vmact xenvm
 xenvm-cmd_OBJS = xenvmlib xenvm-cmd
 xenops_OBJS = xenops
 
-ALL_OCAML_OBJS = ../common/config xenvmlib xenvm xenvmlib xenvm-cmd misc tasks vmconfig vmstate vmact xenops
+ALL_OCAML_OBJS = $(TOPLEVEL)/common/config xenvmlib xenvm xenvmlib xenvm-cmd misc tasks vmconfig vmstate vmact xenops
 
 #INTF = watch.cmi netman.cmi balloon.cmi device_common.cmi device.cmi domain.cmi xal.cmi
 xenvm_LIBS = unix.cmxa threads.cmxa \
        ../libs/uuid/uuid.cmxa \
-       -ccopt -L -ccopt ../libs/mmap ../libs/mmap/mmap.cmxa \
-       -ccopt -L -ccopt ../libs/log ../libs/log/log.cmxa \
-       -ccopt -L -ccopt ../libs/eventchn ../libs/eventchn/eventchn.cmxa \
-       -ccopt -L -ccopt ../libs/xc ../libs/xc/xc.cmxa \
-       -ccopt -L -ccopt ../libs/xb ../libs/xb/xb.cmxa \
-       -ccopt -L -ccopt ../libs/xs ../libs/xs/xs.cmxa \
-       -ccopt -L -ccopt ../libs/stdext ../libs/stdext/stdext.cmxa \
-       -ccopt -L -ccopt ../libs/netdev ../libs/netdev/netdev.cmxa \
-       -ccopt -L -ccopt ../xenops ../xenops/xenops.cmxa
+       -ccopt -L -ccopt $(TOPLEVEL)/libs/mmap $(TOPLEVEL)/libs/mmap/mmap.cmxa \
+       -ccopt -L -ccopt $(TOPLEVEL)/libs/log $(TOPLEVEL)/libs/log/log.cmxa \
+       -ccopt -L -ccopt $(TOPLEVEL)/libs/eventchn $(TOPLEVEL)/libs/eventchn/eventchn.cmxa \
+       -ccopt -L -ccopt $(TOPLEVEL)/libs/xc $(TOPLEVEL)/libs/xc/xc.cmxa \
+       -ccopt -L -ccopt $(TOPLEVEL)/libs/xb $(TOPLEVEL)/libs/xb/xb.cmxa \
+       -ccopt -L -ccopt $(TOPLEVEL)/libs/xs $(TOPLEVEL)/libs/xs/xs.cmxa \
+       -ccopt -L -ccopt $(TOPLEVEL)/libs/stdext $(TOPLEVEL)/libs/stdext/stdext.cmxa \
+       -ccopt -L -ccopt $(TOPLEVEL)/libs/netdev $(TOPLEVEL)/libs/netdev/netdev.cmxa \
+       -ccopt -L -ccopt $(TOPLEVEL)/xenops $(TOPLEVEL)/xenops/xenops.cmxa
 
 xenvm-cmd_LIBS = unix.cmxa threads.cmxa \
-       -ccopt -L -ccopt ../libs/stdext ../libs/stdext/stdext.cmxa
+       -ccopt -L -ccopt $(TOPLEVEL)/libs/stdext $(TOPLEVEL)/libs/stdext/stdext.cmxa
 
 xenops_LIBS = unix.cmxa threads.cmxa \
-       ../libs/uuid/uuid.cmxa \
-       -ccopt -L -ccopt ../libs/mmap ../libs/mmap/mmap.cmxa \
-       -ccopt -L -ccopt ../libs/log ../libs/log/log.cmxa \
-       -ccopt -L -ccopt ../libs/eventchn ../libs/eventchn/eventchn.cmxa \
-       -ccopt -L -ccopt ../libs/xc ../libs/xc/xc.cmxa \
-       -ccopt -L -ccopt ../libs/xb ../libs/xb/xb.cmxa \
-       -ccopt -L -ccopt ../libs/xs ../libs/xs/xs.cmxa \
-       -ccopt -L -ccopt ../libs/stdext ../libs/stdext/stdext.cmxa \
-       -ccopt -L -ccopt ../libs/netdev ../libs/netdev/netdev.cmxa \
-       -ccopt -L -ccopt ../xenops ../xenops/xenops.cmxa
+       $(TOPLEVEL)/libs/uuid/uuid.cmxa \
+       -ccopt -L -ccopt $(TOPLEVEL)/libs/mmap $(TOPLEVEL)/libs/mmap/mmap.cmxa \
+       -ccopt -L -ccopt $(TOPLEVEL)/libs/log $(TOPLEVEL)/libs/log/log.cmxa \
+       -ccopt -L -ccopt $(TOPLEVEL)/libs/eventchn $(TOPLEVEL)/libs/eventchn/eventchn.cmxa \
+       -ccopt -L -ccopt $(TOPLEVEL)/libs/xc $(TOPLEVEL)/libs/xc/xc.cmxa \
+       -ccopt -L -ccopt $(TOPLEVEL)/libs/xb $(TOPLEVEL)/libs/xb/xb.cmxa \
+       -ccopt -L -ccopt $(TOPLEVEL)/libs/xs $(TOPLEVEL)/libs/xs/xs.cmxa \
+       -ccopt -L -ccopt $(TOPLEVEL)/libs/stdext $(TOPLEVEL)/libs/stdext/stdext.cmxa \
+       -ccopt -L -ccopt $(TOPLEVEL)/libs/netdev $(TOPLEVEL)/libs/netdev/netdev.cmxa \
+       -ccopt -L -ccopt $(TOPLEVEL)/xenops $(TOPLEVEL)/xenops/xenops.cmxa
 
 PROGRAMS = xenvm xenvm-cmd xenops
 OCAML_PROGRAM = xenvm xenvm-cmd xenops