[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/6] Introduce rules.mak
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 3/6] Introduce rules.mak |
Date: |
Wed, 21 Jan 2009 19:10:06 +0200 |
Add a file for common makefile rules.
Signed-off-by: Avi Kivity <address@hidden>
(Don't forget to 'svn add')
---
Makefile | 8 ++------
Makefile.target | 7 +------
rules.mak | 10 ++++++++++
3 files changed, 13 insertions(+), 12 deletions(-)
create mode 100644 rules.mak
diff --git a/Makefile b/Makefile
index 92a77ba..ea76b69 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,14 @@
# Makefile for QEMU.
include config-host.mak
+include $(SRC_PATH)/rules.mak
.PHONY: all clean cscope distclean dvi html info install install-doc \
recurse-all speed tar tarbin test
VPATH=$(SRC_PATH):$(SRC_PATH)/hw
+
CFLAGS += $(OS_CFLAGS) $(ARCH_CFLAGS)
LDFLAGS += $(OS_LDFLAGS) $(ARCH_LDFLAGS)
@@ -188,12 +190,6 @@ libqemu_user.a: $(USER_OBJS)
qemu-img$(EXESUF): qemu-img.o qemu-tool.o osdep.o $(BLOCK_OBJS)
$(CC) $(LDFLAGS) -o $@ $^ -lz $(LIBS)
-%.o: %.c
- $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
-
-%.o: %.m
- $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
-
qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o osdep.o $(BLOCK_OBJS)
$(CC) $(LDFLAGS) -o $@ $^ -lz $(LIBS)
diff --git a/Makefile.target b/Makefile.target
index 5f41a3d..b6d5590 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -1,4 +1,5 @@
include config.mak
+include $(SRC_PATH)/rules.mak
TARGET_BASE_ARCH:=$(TARGET_ARCH)
ifeq ($(TARGET_ARCH), x86_64)
@@ -731,12 +732,6 @@ else
$(SHELL) $(SRC_PATH)/feature_to_c.sh $@ $(TARGET_XML_FILES)
endif
-%.o: %.c
- $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
-
-%.o: %.S
- $(CC) $(CPPFLAGS) -c -o $@ $<
-
clean:
rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o
rm -f *.d */*.d tcg/*.o
diff --git a/rules.mak b/rules.mak
new file mode 100644
index 0000000..fe06978
--- /dev/null
+++ b/rules.mak
@@ -0,0 +1,10 @@
+
+%.o: %.c
+ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+
+%.o: %.S
+ $(CC) $(CPPFLAGS) -c -o $@ $<
+
+%.o: %.m
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+
--
1.6.0.6
- [Qemu-devel] [PATCH 0/6] Makefile enhancements (v2), Avi Kivity, 2009/01/21
- [Qemu-devel] [PATCH 1/6] Drop OP_CFLAGS, Avi Kivity, 2009/01/21
- [Qemu-devel] [PATCH 2/6] Consolidate compiler invocations, Avi Kivity, 2009/01/21
- [Qemu-devel] [PATCH 5/6] Make make output quieter, Avi Kivity, 2009/01/21
- [Qemu-devel] [PATCH 6/6] Consolidate library creation, Avi Kivity, 2009/01/21
- [Qemu-devel] [PATCH 3/6] Introduce rules.mak,
Avi Kivity <=
- [Qemu-devel] [PATCH 4/6] Consolidate linker rules, Avi Kivity, 2009/01/21
- [Qemu-devel] Re: [PATCH 0/6] Makefile enhancements (v2), Anthony Liguori, 2009/01/21