[Qemu-devel] [6378] Introduce rules.mak (Avi Kivity)

[Qemu-devel] [6378] Introduce rules.mak (Avi Kivity)

[Anthony Liguori]

Revision: 6378
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6378
Author:   aliguori
Date:     2009-01-21 18:12:52 +0000 (Wed, 21 Jan 2009)

Log Message:
-----------
Introduce rules.mak (Avi Kivity)

Add a file for common makefile rules.

Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/Makefile
    trunk/Makefile.target

Added Paths:
-----------
    trunk/rules.mak

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2009-01-21 18:12:44 UTC (rev 6377)
+++ trunk/Makefile	2009-01-21 18:12:52 UTC (rev 6378)
@@ -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 @@
 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)
 

Modified: trunk/Makefile.target
===================================================================
--- trunk/Makefile.target	2009-01-21 18:12:44 UTC (rev 6377)
+++ trunk/Makefile.target	2009-01-21 18:12:52 UTC (rev 6378)
@@ -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 @@
 	$(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

Added: trunk/rules.mak
===================================================================
--- trunk/rules.mak	                        (rev 0)
+++ trunk/rules.mak	2009-01-21 18:12:52 UTC (rev 6378)
@@ -0,0 +1,10 @@
+
+%.o: %.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+
+%.o: %.S
+	$(CC) $(CPPFLAGS) -c -o $@ $<
+
+%.o: %.m
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+