From 6070d0402b1a9e4daf547b68bd988250b3082bdc Mon Sep 17 00:00:00 2001 From: Vincent Hanquez Date: Tue, 14 Jul 2009 16:05:57 +0100 Subject: [PATCH] replace .. with TOPLEVEL in Makefiles --- xenops/Makefile | 10 +++++----- xenstore/Makefile | 14 +++++++------- xenstored/Makefile | 22 +++++++++++----------- xenvm/Makefile | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/xenops/Makefile b/xenops/Makefile index 7b2b501..58f1610 100644 --- a/xenops/Makefile +++ b/xenops/Makefile @@ -4,14 +4,14 @@ include $(TOPLEVEL)/common.make LIBS = xenops.cma xenops.cmxa OCAMLINCLUDE += \ - -I ../libs/log -I ../libs/xb -I ../libs/xs -I ../libs/uuid \ - -I ../libs/mmap -I ../libs/xc -I ../libs/eventchn -I ../libs/scsi \ - -I ../libs/netdev -I ../libs/stdext -I ../libs/base64 -I ../common + -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/scsi \ + -I $(TOPLEVEL)/libs/netdev -I $(TOPLEVEL)/libs/stdext -I $(TOPLEVEL)/libs/base64 -I $(TOPLEVEL)/common OCAMLOPTFLAGS += -thread OBJS_XENOPS_COMMON = \ - ../common/debug io memory netman table stats watch \ - ../common/forkhelpers xenguestHelper xenbus xal \ + $(TOPLEVEL)/common/debug io memory netman table stats watch \ + $(TOPLEVEL)/common/forkhelpers xenguestHelper xenbus xal \ balloon device_common hotplug device \ domain diff --git a/xenstore/Makefile b/xenstore/Makefile index 861871d..2a20334 100644 --- a/xenstore/Makefile +++ b/xenstore/Makefile @@ -1,17 +1,17 @@ TOPLEVEL=.. include $(TOPLEVEL)/common.make -OCAMLINCLUDE += -I ../libs/log -I ../libs/xb -I ../libs/uuid \ - -I ../libs/mmap -I ../libs/xs -I ../libs/stdext +OCAMLINCLUDE += -I $(TOPLEVEL)/libs/log -I $(TOPLEVEL)/libs/xb -I $(TOPLEVEL)/libs/uuid \ + -I $(TOPLEVEL)/libs/mmap -I $(TOPLEVEL)/libs/xs -I $(TOPLEVEL)/libs/stdext OBJS = xenstore INTF = xenstore_LIBS = unix.cmxa \ - ../libs/uuid/uuid.cmxa \ - -ccopt -L -ccopt ../libs/mmap ../libs/mmap/mmap.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 + $(TOPLEVEL)/libs/uuid/uuid.cmxa \ + -ccopt -L -ccopt $(TOPLEVEL)/libs/mmap $(TOPLEVEL)/libs/mmap/mmap.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 xenstore_OBJS = $(OBJS) diff --git a/xenstored/Makefile b/xenstored/Makefile index 8c7e763..71e31e7 100644 --- a/xenstored/Makefile +++ b/xenstored/Makefile @@ -1,22 +1,22 @@ TOPLEVEL=.. include $(TOPLEVEL)/common.make -OCAMLINCLUDE += -I ../libs/log -I ../libs/xb -I ../libs/uuid \ - -I ../libs/mmap -I ../libs/xc -I ../libs/eventchn \ - -I ../libs/stdext -I ../common +OCAMLINCLUDE += -I $(TOPLEVEL)/libs/log -I $(TOPLEVEL)/libs/xb -I $(TOPLEVEL)/libs/uuid \ + -I $(TOPLEVEL)/libs/mmap -I $(TOPLEVEL)/libs/xc -I $(TOPLEVEL)/libs/eventchn \ + -I $(TOPLEVEL)/libs/stdext -I $(TOPLEVEL)/common -OBJS = define ../common/config logging quota perms symbol utils store disk transaction \ +OBJS = define $(TOPLEVEL)/common/config logging quota perms symbol utils store disk transaction \ event domain domains connection connections \ parse_arg process xenstored INTF = symbol.cmi XENSTOREDLIBS = unix.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/stdext ../libs/stdext/stdext.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/stdext $(TOPLEVEL)/libs/stdext/stdext.cmxa PROGRAMS = xenstored diff --git a/xenvm/Makefile b/xenvm/Makefile index 3071c0e..ae6e3a2 100644 --- a/xenvm/Makefile +++ b/xenvm/Makefile @@ -24,7 +24,7 @@ ALL_OCAML_OBJS = $(TOPLEVEL)/common/config xenvmlib xenvm xenvmlib xenvm-cmd mis #INTF = watch.cmi netman.cmi balloon.cmi device_common.cmi device.cmi domain.cmi xal.cmi xenvm_LIBS = unix.cmxa dBus.cmxa threads.cmxa \ - ../libs/uuid/uuid.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 \ -- 2.39.5