aboutsummaryrefslogtreecommitdiffstats
path: root/tools/xcutils
diff options
context:
space:
mode:
Diffstat (limited to 'tools/xcutils')
-rw-r--r--tools/xcutils/Makefile19
-rw-r--r--tools/xcutils/lsevtchn.c2
2 files changed, 15 insertions, 6 deletions
diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile
index 5872d57d8c..e16c6a334f 100644
--- a/tools/xcutils/Makefile
+++ b/tools/xcutils/Makefile
@@ -11,12 +11,20 @@
XEN_ROOT = $(CURDIR)/../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -Werror
-CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore)
PROGRAMS = xc_restore xc_save readnotes lsevtchn
-LDLIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore)
+CFLAGS += -Werror
+
+CFLAGS_xc_restore := $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest)
+CFLAGS_xc_save := $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore)
+CFLAGS_readnotes := $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest)
+CFLAGS_lsevtchn := $(CFLAGS_libxenctrl)
+
+LDLIBS_xc_restore := $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest)
+LDLIBS_xc_save := $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore)
+LDLIBS_readnotes := $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest)
+LDLIBS_lsevtchn := $(LDLIBS_libxenctrl)
.PHONY: all
all: build
@@ -24,8 +32,11 @@ all: build
.PHONY: build
build: $(PROGRAMS)
+%.o: %.c
+ $(CC) $(CFLAGS) $(CFLAGS_$*) -c $^ -o $@
+
$(PROGRAMS): %: %.o
- $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) $(LDLIBS_$*) -o $@
.PHONY: install
install: build
diff --git a/tools/xcutils/lsevtchn.c b/tools/xcutils/lsevtchn.c
index e79fe0990a..d1710613dd 100644
--- a/tools/xcutils/lsevtchn.c
+++ b/tools/xcutils/lsevtchn.c
@@ -4,9 +4,7 @@
#include <string.h>
#include <stdio.h>
-#include <xs.h>
#include <xenctrl.h>
-#include <xenguest.h>
int main(int argc, char **argv)
{