Merge branch 'master' of /home/nchip/public_html/qemu into garage-push

[qemu] / rules.mak

diff --git a/rules.mak b/rules.mak
index fe06978..8d6d96e 100644 (file)
--- a/rules.mak
+++ b/rules.mak
@@ -1,10 +1,19 @@
 
 %.o: %.c
-       $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+       $(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<,"  CC    $(TARGET_DIR)$@")
 
 %.o: %.S
-       $(CC) $(CPPFLAGS) -c -o $@ $<
+       $(call quiet-command,$(CC) $(CPPFLAGS) -c -o $@ $<,"  AS    $(TARGET_DIR)$@")
 
 %.o: %.m
-       $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+       $(call quiet-command,$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<,"  OBJC  $(TARGET_DIR)$@")
 
+LINK = $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $(1) $(ARLIBS_BEGIN) $(ARLIBS) $(ARLIBS_END) $(LIBS),"  LINK  $(TARGET_DIR)$@")
+
+%$(EXESUF): %.o
+       $(call LINK,$^)
+
+%.a:
+       $(call quiet-command,rm -f $@ && $(AR) rcs $@ $^,"  AR    $(TARGET_DIR)$@")
+
+quiet-command = $(if $(V),$1,$(if $(2),@echo $2 && $1, @$1))