diff options
| -rw-r--r-- | tools/debugger/xenitp/Makefile | 27 | ||||
| -rw-r--r-- | tools/flask/utils/Makefile | 11 | ||||
| -rw-r--r-- | tools/misc/Makefile | 36 | ||||
| -rw-r--r-- | tools/misc/lomount/Makefile | 10 | ||||
| -rw-r--r-- | tools/tests/mce-test/tools/Makefile | 9 | ||||
| -rw-r--r-- | tools/tests/xen-access/Makefile | 10 | ||||
| -rw-r--r-- | tools/xcutils/Makefile | 18 | ||||
| -rw-r--r-- | tools/xenbackendd/Makefile | 9 | ||||
| -rw-r--r-- | tools/xenmon/Makefile | 10 | ||||
| -rw-r--r-- | tools/xenpmd/Makefile | 10 | ||||
| -rw-r--r-- | tools/xentrace/Makefile | 25 |
11 files changed, 72 insertions, 103 deletions
diff --git a/tools/debugger/xenitp/Makefile b/tools/debugger/xenitp/Makefile index b4d5473fb9..ba8f44cd37 100644 --- a/tools/debugger/xenitp/Makefile +++ b/tools/debugger/xenitp/Makefile @@ -5,14 +5,7 @@ include $(XEN_ROOT)/tools/Rules.mk CFLAGS += $(CFLAGS_libxenctrl) -HDRS = $(wildcard *.h) -OBJS = $(patsubst %.c,%.o,$(wildcard *.c)) - -BIN = LIBBIN = -SCRIPTS = -MAN1 = $(wildcard *.1) -MAN8 = $(wildcard *.8) ifeq ($(XEN_TARGET_ARCH),ia64) LIBBIN += xenitp @@ -22,32 +15,18 @@ endif all: build .PHONY: build -build: $(BIN) $(LIBBIN) +build: $(LIBBIN) .PHONY: install install: build - $(INSTALL_DIR) $(DESTDIR)$(BINDIR) [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR) - $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR) - $(INSTALL_DIR) $(DESTDIR)$(MAN8DIR) - if [ "x$(SCRIPTS)" != "x" ]; then \ - $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR); \ - fi [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(PRIVATE_BINDIR) - if [ "x$(MAN1)" != "x" ]; then \ - $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR); \ - fi - if [ "x$(MAN1)" != "x" ]; then \ - $(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MAN8DIR); \ - fi .PHONY: clean clean: - $(RM) *.a *.so *.o *.rpm $(BIN) $(LIBBIN) - -%: %.c $(HDRS) Makefile - $(CC) $(CFLAGS) -o $@ $< $(LDLIBS_libxenctrl) + $(RM) *.a *.so *.o *.rpm $(LIBBIN) XENITP_OBJS=xenitp.o ia64-dis.o ia64-opc.o cpu-ia64-opc.o + xenitp: $(XENITP_OBJS) $(CC) $(CFLAGS) -o $@ $(XENITP_OBJS) $(LDLIBS_libxenctrl) diff --git a/tools/flask/utils/Makefile b/tools/flask/utils/Makefile index c7337a967b..25729a1e8f 100644 --- a/tools/flask/utils/Makefile +++ b/tools/flask/utils/Makefile @@ -18,7 +18,13 @@ CLIENTS_OBJS := $(patsubst flask-%,%.o,$(CLIENTS)) .PHONY: all all: $(CLIENTS) -$(CLIENTS): flask-%: %.o +flask-loadpolicy: loadpolicy.o + $(CC) $(LDFLAGS) $< $(LDLIBS) -L$(LIBFLASK_ROOT) -lflask $(LDLIBS_libxenctrl) -o $@ + +flask-setenforce: setenforce.o + $(CC) $(LDFLAGS) $< $(LDLIBS) -L$(LIBFLASK_ROOT) -lflask $(LDLIBS_libxenctrl) -o $@ + +flask-getenforce: getenforce.o $(CC) $(LDFLAGS) $< $(LDLIBS) -L$(LIBFLASK_ROOT) -lflask $(LDLIBS_libxenctrl) -o $@ .PHONY: clean @@ -41,6 +47,3 @@ install: all $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)$(SBINDIR) -include $(DEPS) - -# never delete any intermediate files. -.SECONDARY: diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 3f2351bc2c..ede0755e78 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -13,14 +13,6 @@ TARGETS-$(CONFIG_X86) += xen-detect xen-hvmctx xen-hvmcrash TARGETS-$(CONFIG_MIGRATE) += xen-hptool TARGETS := $(TARGETS-y) -LDLIBS_xenperf := $(LDLIBS_libxenctrl) -LDLIBS_xenpm := $(LDLIBS_libxenctrl) -LDLIBS_xenlockprof := $(LDLIBS_libxenctrl) -LDLIBS_xenwatchdogd := $(LDLIBS_libxenctrl) -LDLIBS_xen-hvmctx := $(LDLIBS_libxenctrl) -LDLIBS_xen-hvmcrash := $(LDLIBS_libxenctrl) -LDLIBS_xen-hptool := $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) - SUBDIRS-$(CONFIG_LOMOUNT) += lomount SUBDIRS-$(CONFIG_MINITERM) += miniterm SUBDIRS := $(SUBDIRS-y) @@ -54,13 +46,31 @@ clean: $(RM) *.o $(TARGETS) *~ $(DEPS) set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d clean; done -%.o: %.c $(HDRS) Makefile - $(CC) -c $(CFLAGS) -o $@ $< +xen-hvmctx: xen-hvmctx.o + $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) + +xen-hvmcrash: xen-hvmcrash.o + $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) + +xenperf: xenperf.o + $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) + +xenpm: xenpm.o + $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) + +gtracestat: gtracestat.o + $(CC) $(LDFLAGS) -o $@ $< + +xenlockprof: xenlockprof.o + $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) + +xen-hptool: xen-hptool.o + $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) -xen-hvmctx xen-hvmcrash xenperf xenpm gtracestat xenlockprof xen-hptool xenwatchdogd: %: %.o Makefile - $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_$*) +xenwatchdogd: xenwatchdogd.o + $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) -gtraceview: %: %.o Makefile +gtraceview: gtraceview.o $(CC) $(LDFLAGS) -o $@ $< $(CURSES_LIBS) -include $(DEPS) diff --git a/tools/misc/lomount/Makefile b/tools/misc/lomount/Makefile index 67636a8cb1..1d6d00cf5e 100644 --- a/tools/misc/lomount/Makefile +++ b/tools/misc/lomount/Makefile @@ -3,16 +3,11 @@ include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror -HDRS = $(wildcard *.h) -OBJS = $(patsubst %.c,%.o,$(wildcard *.c)) - -BIN = lomount - .PHONY: all all: build .PHONY: build -build: $(BIN) +build: lomount .PHONY: install install install-recurse: build @@ -22,6 +17,7 @@ install install-recurse: build clean: $(RM) *.a *.so *.o *.rpm $(BIN) -%: %.c $(HDRS) Makefile +lomount: lomount.o $(CC) $(CFLAGS) -o $@ $< +-include $(DEPS)
\ No newline at end of file diff --git a/tools/tests/mce-test/tools/Makefile b/tools/tests/mce-test/tools/Makefile index 6df8385dc4..8a23b83f5a 100644 --- a/tools/tests/mce-test/tools/Makefile +++ b/tools/tests/mce-test/tools/Makefile @@ -2,21 +2,20 @@ XEN_ROOT=$(CURDIR)/../../../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror - CFLAGS += $(CFLAGS_libxenctrl) +CFLAGS += $(CFLAGS_libxenguest) +CFLAGS += $(CFLAGS_libxenstore) CFLAGS += $(CFLAGS_xeninclude) -HDRS = $(wildcard *.h) - .PHONY: all all: xen-mceinj install: - cp xen-mceinj /usr/sbin/ + $(INSTALL_PROG) xen-mceinj $(DESTDIR)$(SBINDIR) .PHONY: clean clean: $(RM) *.o xen-mceinj -xen-mceinj: %: %.o Makefile +xen-mceinj: xen-mceinj.o Makefile $(CC) -o $@ $< $(LDFLAGS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) diff --git a/tools/tests/xen-access/Makefile b/tools/tests/xen-access/Makefile index b3555aba70..65eef99304 100644 --- a/tools/tests/xen-access/Makefile +++ b/tools/tests/xen-access/Makefile @@ -4,28 +4,24 @@ include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror CFLAGS += $(CFLAGS_libxenctrl) +CFLAGS += $(CFLAGS_libxenguest) CFLAGS += $(CFLAGS_xeninclude) TARGETS-y := TARGETS-$(CONFIG_X86) += xen-access TARGETS := $(TARGETS-y) -SUBDIRS-y := -SUBDIRS := $(SUBDIRS-y) - .PHONY: all all: build .PHONY: build build: $(TARGETS) - set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d; done .PHONY: clean clean: $(RM) *.o $(TARGETS) *~ $(DEPS) - set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d clean; done -xen-access: %: %.o Makefile - $(CC) -o $@ $< $(LDFLAGS) $(LDLIBS_libxenctrl) +xen-access: xen-access.o Makefile + $(CC) -o $@ $< $(LDFLAGS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) -include $(DEPS) diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile index d5c64a8f14..65fd76741f 100644 --- a/tools/xcutils/Makefile +++ b/tools/xcutils/Makefile @@ -20,19 +20,23 @@ CFLAGS_xc_save.o := $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxe CFLAGS_readnotes.o := $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) CFLAGS_lsevtchn.o := $(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 .PHONY: build build: $(PROGRAMS) -$(PROGRAMS): %: %.o - $(CC) $(LDFLAGS) $^ $(LDLIBS) $(LDLIBS_$*) -o $@ +xc_restore: xc_restore.o + $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) + +xc_save: xc_save.o + $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) + +readnotes: readnotes.o + $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) + +lsevtchn: lsevtchn.o + $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS_libxenctrl) .PHONY: install install: build diff --git a/tools/xenbackendd/Makefile b/tools/xenbackendd/Makefile index eaf0313fba..0d3edc8dc9 100644 --- a/tools/xenbackendd/Makefile +++ b/tools/xenbackendd/Makefile @@ -17,13 +17,11 @@ CFLAGS += $(CFLAGS_libxenstore) CPPFLAGS += -DXEN_SCRIPT_DIR="\"$(XEN_SCRIPT_DIR)\"" LDLIBS += $(LDLIBS_libxenstore) -SBIN = xenbackendd - .PHONY: all all: build .PHONY: build -build: $(SBIN) +build: xenbackendd .PHONY: install install: build @@ -32,10 +30,9 @@ install: build .PHONY: clean clean: - rm -f $(SBIN) $(DEPS) - + rm -f $(DEPS) -%: %.o Makefile +xenbackendd: xenbackendd.o $(CC) $(LDFLAGS) $< -o $@ $(LDLIBS) -include $(DEPS) diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile index b3b54243a1..ffbad56d3b 100644 --- a/tools/xenmon/Makefile +++ b/tools/xenmon/Makefile @@ -17,14 +17,13 @@ CFLAGS += -Werror CFLAGS += $(CFLAGS_libxenctrl) LDLIBS += $(LDLIBS_libxenctrl) -BIN = xentrace_setmask xenbaked SCRIPTS = xenmon.py .PHONY: all all: build .PHONY: build -build: $(BIN) +build: xentrace_setmask xenbaked .PHONY: install install: build @@ -37,13 +36,12 @@ install: build .PHONY: clean clean: - rm -f $(BIN) $(DEPS) + rm -f $(DEPS) - -%: %.o Makefile +xenbaked: xenbaked.o Makefile $(CC) $(LDFLAGS) $< -o $@ $(LDLIBS) -xentrace_%: %.o Makefile +xentrace_setmask: setmask.o Makefile $(CC) $(LDFLAGS) $< -o $@ $(LDLIBS) -include $(DEPS) diff --git a/tools/xenpmd/Makefile b/tools/xenpmd/Makefile index 0743c8c04d..13f940fc77 100644 --- a/tools/xenpmd/Makefile +++ b/tools/xenpmd/Makefile @@ -6,21 +6,19 @@ CFLAGS += $(CFLAGS_libxenstore) LDLIBS += $(LDLIBS_libxenstore) -BIN = xenpmd - .PHONY: all -all: $(BIN) +all: xenpmd .PHONY: install install: all $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) $(BIN) $(DESTDIR)$(SBINDIR) + $(INSTALL_PROG) xenpmd $(DESTDIR)$(SBINDIR) .PHONY: clean clean: - $(RM) -f $(BIN) $(DEPS) + $(RM) -f xenpmd $(DEPS) -%: %.o Makefile +xenpmd: xenpmd.o Makefile $(CC) $(LDFLAGS) $< -o $@ $(LDLIBS) -include $(DEPS) diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index 1ae9023845..0c7d3f5266 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -6,27 +6,12 @@ CFLAGS += -Werror CFLAGS += $(CFLAGS_libxenctrl) LDLIBS += $(LDLIBS_libxenctrl) -HDRS = $(wildcard *.h) -OBJS = $(patsubst %.c,%.o,$(wildcard *.c)) - BIN = xentrace xentrace_setsize -LIBBIN = +LIBBIN = xenctx SCRIPTS = xentrace_format MAN1 = $(wildcard *.1) MAN8 = $(wildcard *.8) -ifeq ($(XEN_TARGET_ARCH),x86_32) -LIBBIN += xenctx -endif - -ifeq ($(XEN_TARGET_ARCH),x86_64) -LIBBIN += xenctx -endif - -ifeq ($(XEN_TARGET_ARCH),ia64) -LIBBIN += xenctx -endif - .PHONY: all all: build @@ -49,9 +34,13 @@ install: build clean: $(RM) *.a *.so *.o *.rpm $(BIN) $(LIBBIN) $(DEPS) -%: %.o $(HDRS) Makefile +xentrace: xentrace.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS) -xentrace_%: %.o $(HDRS) Makefile + +xenctx: xenctx.o + $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS) + +xentrace_setsize: setsize.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS) -include $(DEPS) |