From: Anthony Liguori <anthony@codemonkey.ws>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [6377] Consolidate compiler invocations (Avi Kivity)
Date: Wed, 21 Jan 2009 18:12:45 +0000 [thread overview]
Message-ID: <E1LPhZF-0002k2-65@cvs.savannah.gnu.org> (raw)
Revision: 6377
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6377
Author: aliguori
Date: 2009-01-21 18:12:44 +0000 (Wed, 21 Jan 2009)
Log Message:
-----------
Consolidate compiler invocations (Avi Kivity)
Instead of specifying the compilation command over and over, use a single
rule and adjust it as necessary using target specific target overrides.
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Modified Paths:
--------------
trunk/Makefile
trunk/Makefile.target
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2009-01-21 18:12:27 UTC (rev 6376)
+++ trunk/Makefile 2009-01-21 18:12:44 UTC (rev 6377)
@@ -158,23 +158,19 @@
LIBS+=$(VDE_LIBS)
cocoa.o: cocoa.m
- $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
sdl.o: sdl.c keymaps.c sdl_keysym.h
- $(CC) $(CFLAGS) $(CPPFLAGS) $(SDL_CFLAGS) -c -o $@ $<
+sdl.o audio/sdlaudio.o: CFLAGS += $(SDL_CFLAGS)
+
vnc.o: vnc.c keymaps.c sdl_keysym.h vnchextile.h d3des.c d3des.h
- $(CC) $(CFLAGS) $(CPPFLAGS) $(CONFIG_VNC_TLS_CFLAGS) -c -o $@ $<
+vnc.o: CFLAGS += $(CONFIG_VNC_TLS_CFLAGS)
+
curses.o: curses.c keymaps.c curses_keys.h
- $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
-bt-host.o: bt-host.c
- $(CC) $(CFLAGS) $(CPPFLAGS) $(CONFIG_BLUEZ_CFLAGS) -c -o $@ $<
+bt-host.o: CFLAGS += $(CONFIG_BLUEZ_CFLAGS)
-audio/sdlaudio.o: audio/sdlaudio.c
- $(CC) $(CFLAGS) $(CPPFLAGS) $(SDL_CFLAGS) -c -o $@ $<
-
libqemu_common.a: $(OBJS)
rm -f $@
$(AR) rcs $@ $(OBJS)
@@ -195,6 +191,9 @@
%.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:27 UTC (rev 6376)
+++ trunk/Makefile.target 2009-01-21 18:12:44 UTC (rev 6377)
@@ -219,16 +219,11 @@
tcg/tcg.o: cpu.h
-machine.o: machine.c
- $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
-
# HELPER_CFLAGS is used for all the code compiled with static register
# variables
-op_helper.o: op_helper.c
- $(CC) $(HELPER_CFLAGS) $(CPPFLAGS) $(CFLAGS) $(I386_CFLAGS) -c -o $@ $<
+op_helper.o: CFLAGS += $(HELPER_CFLAGS) $(I386_CFLAGS)
-cpu-exec.o: cpu-exec.c
- $(CC) $(HELPER_CFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+cpu-exec.o: CFLAGS += $(HELPER_CFLAGS)
#########################################################
# Linux user emulator target
@@ -356,8 +351,7 @@
# Note: this is a workaround. The real fix is to avoid compiling
# cpu_signal_handler() in cpu-exec.c.
-signal.o: signal.c
- $(CC) $(HELPER_CFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+signal.o: CFLAGS += $(HELPER_CFLAGS)
$(QEMU_PROG): $(OBJS) ../libqemu_user.a
$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
@@ -392,8 +386,7 @@
# Note: this is a workaround. The real fix is to avoid compiling
# cpu_signal_handler() in cpu-exec.c.
-signal.o: signal.c
- $(CC) $(HELPER_CFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+signal.o: CFLAGS += $(HELPER_CFLAGS)
$(QEMU_PROG): $(OBJS)
$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
@@ -497,8 +490,7 @@
# Note: this is a workaround. The real fix is to avoid compiling
# cpu_signal_handler() in cpu-exec.c.
-signal.o: signal.c
- $(CC) $(HELPER_CFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+signal.o: CFLAGS += $(HELPER_CFLAGS)
$(QEMU_PROG): $(OBJS) ../libqemu_user.a
$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
reply other threads:[~2009-01-21 18:12 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1LPhZF-0002k2-65@cvs.savannah.gnu.org \
--to=anthony@codemonkey.ws \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).