diff options
| -rw-r--r-- | tools/Rules.mk | 3 | ||||
| -rw-r--r-- | tools/xcutils/Makefile | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tools/Rules.mk b/tools/Rules.mk index d5af8a9dc5..2ca8898bdd 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -16,6 +16,9 @@ CFLAGS_include = -I$(XEN_INCLUDE) CFLAGS_libxenctrl = -I$(XEN_LIBXC) $(CFLAGS_include) LDFLAGS_libxenctrl = -L$(XEN_LIBXC) -lxenctrl +CFLAGS_libxenguest = -I$(XEN_LIBXC) $(CFLAGS_include) +LDFLAGS_libxenguest = -L$(XEN_LIBXC) -lxenguest + X11_LDPATH = -L/usr/X11R6/$(LIBDIR) CFLAGS += -D__XEN_TOOLS__ diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile index 24fa8849f8..cc9e7a606a 100644 --- a/tools/xcutils/Makefile +++ b/tools/xcutils/Makefile @@ -11,10 +11,8 @@ XEN_ROOT = ../.. include $(XEN_ROOT)/tools/Rules.mk -INCLUDES += $(CFLAGS_libxenctrl) -I $(XEN_XENSTORE) -I$(XEN_INCLUDE) - CFLAGS += -Werror -CFLAGS += $(INCLUDES) +CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) -I$(XEN_XENSTORE) # Make gcc generate dependencies. CFLAGS += -Wp,-MD,.$(@F).d @@ -22,7 +20,7 @@ PROG_DEP = .*.d PROGRAMS = xc_restore xc_save readnotes -LDLIBS = $(LDFLAGS_libxenctrl) -L$(XEN_XENSTORE) -lxenguest -lxenstore +LDLIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) -L$(XEN_XENSTORE) -lxenstore .PHONY: all all: build |