aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/Rules.mk5
-rw-r--r--tools/libxc/ia64/Makefile6
2 files changed, 5 insertions, 6 deletions
diff --git a/tools/Rules.mk b/tools/Rules.mk
index 49eacb7921..c1a5e053b0 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -89,6 +89,11 @@ INSTALL_PYTHON_PROG = \
%.o: %.cc
$(CC) $(CPPFLAGS) $(CXXFLAGS) $(CXXFLAGS_$*.o) -c -o $@ $<
+%.o: %.S
+ $(CC) $(CFLAGS) $(CFLAGS_$*.o) -c $< -o $@
+%.opic: %.S
+ $(CC) $(CPPFLAGS) -DPIC $(CFLAGS) $(CFLAGS.opic) -fPIC -c -o $@ $<
+
subdirs-all subdirs-clean subdirs-install subdirs-distclean: .phony
@set -e; for subdir in $(SUBDIRS) $(SUBDIRS-y); do \
$(MAKE) subdir-$(patsubst subdirs-%,%,$@)-$$subdir; \
diff --git a/tools/libxc/ia64/Makefile b/tools/libxc/ia64/Makefile
index 9d4d5ebc77..81f472a78d 100644
--- a/tools/libxc/ia64/Makefile
+++ b/tools/libxc/ia64/Makefile
@@ -16,13 +16,7 @@ DOMFW_SRCS := $(addprefix ia64/, $(DOMFW_SRCS_BASE))
$(DOMFW_SRCS):
ln -sf $(XEN_ROOT)/xen/arch/ia64/xen/$(@F) $@
-# XXX kludge: libxc/Makefile doesn't understand .S.
GUEST_SRCS-y += $(patsubst %.S, %.c, $(DOMFW_SRCS))
-%.o: %.S
- $(CC) $(CFLAGS) -c $< -o $@
-%.opic: %.S
- $(CC) $(CPPFLAGS) -DPIC $(CFLAGS) -fPIC -c -o $@ $<
-
CFLAGS += -Iia64