diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2011-03-31 19:34:56 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2011-03-31 19:34:56 +0100 |
| commit | 9ac650d825b140cbd1c2eac378ccdd7b3c52c86e (patch) | |
| tree | 65dff2e3ba741c62e96e3240585e9e65c717373c /tools/tests | |
| parent | 61d0fe74c6d60cd184afdf4f4566f421c90816ce (diff) | |
| download | xen-9ac650d825b140cbd1c2eac378ccdd7b3c52c86e.tar.gz xen-9ac650d825b140cbd1c2eac378ccdd7b3c52c86e.tar.bz2 xen-9ac650d825b140cbd1c2eac378ccdd7b3c52c86e.zip | |
tools: remove pattern matched linking rules
Most subdirs only build a single tool to start with and those which
build multiple tools often have different linkage requirements.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/tests')
| -rw-r--r-- | tools/tests/mce-test/tools/Makefile | 9 | ||||
| -rw-r--r-- | tools/tests/xen-access/Makefile | 10 |
2 files changed, 7 insertions, 12 deletions
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) |