Commit 17759187b64c59096313ac4455b157a89990ad83
1 parent
807544e2
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> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6378 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
3 changed files
with
13 additions
and
12 deletions
Makefile
| 1 | # Makefile for QEMU. | 1 | # Makefile for QEMU. |
| 2 | 2 | ||
| 3 | include config-host.mak | 3 | include config-host.mak |
| 4 | +include $(SRC_PATH)/rules.mak | ||
| 4 | 5 | ||
| 5 | .PHONY: all clean cscope distclean dvi html info install install-doc \ | 6 | .PHONY: all clean cscope distclean dvi html info install install-doc \ |
| 6 | recurse-all speed tar tarbin test | 7 | recurse-all speed tar tarbin test |
| 7 | 8 | ||
| 8 | VPATH=$(SRC_PATH):$(SRC_PATH)/hw | 9 | VPATH=$(SRC_PATH):$(SRC_PATH)/hw |
| 9 | 10 | ||
| 11 | + | ||
| 10 | CFLAGS += $(OS_CFLAGS) $(ARCH_CFLAGS) | 12 | CFLAGS += $(OS_CFLAGS) $(ARCH_CFLAGS) |
| 11 | LDFLAGS += $(OS_LDFLAGS) $(ARCH_LDFLAGS) | 13 | LDFLAGS += $(OS_LDFLAGS) $(ARCH_LDFLAGS) |
| 12 | 14 | ||
| @@ -188,12 +190,6 @@ libqemu_user.a: $(USER_OBJS) | @@ -188,12 +190,6 @@ libqemu_user.a: $(USER_OBJS) | ||
| 188 | qemu-img$(EXESUF): qemu-img.o qemu-tool.o osdep.o $(BLOCK_OBJS) | 190 | qemu-img$(EXESUF): qemu-img.o qemu-tool.o osdep.o $(BLOCK_OBJS) |
| 189 | $(CC) $(LDFLAGS) -o $@ $^ -lz $(LIBS) | 191 | $(CC) $(LDFLAGS) -o $@ $^ -lz $(LIBS) |
| 190 | 192 | ||
| 191 | -%.o: %.c | ||
| 192 | - $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< | ||
| 193 | - | ||
| 194 | -%.o: %.m | ||
| 195 | - $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< | ||
| 196 | - | ||
| 197 | qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o osdep.o $(BLOCK_OBJS) | 193 | qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o osdep.o $(BLOCK_OBJS) |
| 198 | $(CC) $(LDFLAGS) -o $@ $^ -lz $(LIBS) | 194 | $(CC) $(LDFLAGS) -o $@ $^ -lz $(LIBS) |
| 199 | 195 |
Makefile.target
| 1 | include config.mak | 1 | include config.mak |
| 2 | +include $(SRC_PATH)/rules.mak | ||
| 2 | 3 | ||
| 3 | TARGET_BASE_ARCH:=$(TARGET_ARCH) | 4 | TARGET_BASE_ARCH:=$(TARGET_ARCH) |
| 4 | ifeq ($(TARGET_ARCH), x86_64) | 5 | ifeq ($(TARGET_ARCH), x86_64) |
| @@ -731,12 +732,6 @@ else | @@ -731,12 +732,6 @@ else | ||
| 731 | $(SHELL) $(SRC_PATH)/feature_to_c.sh $@ $(TARGET_XML_FILES) | 732 | $(SHELL) $(SRC_PATH)/feature_to_c.sh $@ $(TARGET_XML_FILES) |
| 732 | endif | 733 | endif |
| 733 | 734 | ||
| 734 | -%.o: %.c | ||
| 735 | - $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< | ||
| 736 | - | ||
| 737 | -%.o: %.S | ||
| 738 | - $(CC) $(CPPFLAGS) -c -o $@ $< | ||
| 739 | - | ||
| 740 | clean: | 735 | clean: |
| 741 | rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o | 736 | rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o |
| 742 | rm -f *.d */*.d tcg/*.o | 737 | rm -f *.d */*.d tcg/*.o |