diff options
author | Juan Quintela <quintela@redhat.com> | 2009-08-03 14:46:21 +0200 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-08-10 13:05:39 -0500 |
commit | a558ee17761c3c9ef22792bd5097880ab92f1bf5 (patch) | |
tree | fee2782d1652d2c4610432fd31a666173de77737 /Makefile | |
parent | edc0edf0c6bdaf51a952c333527b0b9c3bf371d6 (diff) |
Rename CPPFLAGS to QEMU_CFLAGS
Now we have to variables: QEMU_CFLAGS: flags without which we can't compile
CFLAGS: "-g -O2"
We can now run:
make CFLAGS="-fbar" foo.o
make CFLAGS="" foo.o
make CFLAGS="-O3" foo.o
And it all should work.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -16,9 +16,9 @@ endif VPATH=$(SRC_PATH):$(SRC_PATH)/hw -CPPFLAGS += -I. -I$(SRC_PATH) -MMD -MP -MT $@ -CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -CPPFLAGS += -U_FORTIFY_SOURCE +QEMU_CFLAGS += -I. -I$(SRC_PATH) -MMD -MP -MT $@ +QEMU_CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE +QEMU_CFLAGS += -U_FORTIFY_SOURCE LIBS+=-lz ifdef BUILD_DOCS @@ -105,7 +105,7 @@ ifdef CONFIG_COREAUDIO AUDIO_PT = y endif ifdef CONFIG_FMOD -audio/audio.o audio/fmodaudio.o: CPPFLAGS := $(FMOD_CFLAGS) $(CPPFLAGS) +audio/audio.o audio/fmodaudio.o: QEMU_CFLAGS := $(FMOD_CFLAGS) $(QEMU_CFLAGS) endif ifdef CONFIG_ESD AUDIO_PT = y @@ -142,7 +142,7 @@ obj-$(CONFIG_COCOA) += cocoa.o obj-$(CONFIG_IOTHREAD) += qemu-thread.o ifdef CONFIG_SLIRP -CPPFLAGS+=-I$(SRC_PATH)/slirp +QEMU_CFLAGS+=-I$(SRC_PATH)/slirp endif slirp-obj-y = cksum.o if.o ip_icmp.o ip_input.o ip_output.o @@ -156,7 +156,7 @@ LIBS+=$(VDE_LIBS) obj-$(CONFIG_XEN) += xen_backend.o xen_devconfig.o obj-$(CONFIG_XEN) += xen_console.o xenfb.o xen_disk.o xen_nic.o -CPPFLAGS+=$(CURL_CFLAGS) +QEMU_CFLAGS+=$(CURL_CFLAGS) LIBS+=$(CURL_LIBS) cocoa.o: cocoa.m @@ -167,7 +167,7 @@ sdl_zoom.o: sdl_zoom.c sdl_zoom.h sdl_zoom_template.h sdl.o: sdl.c keymaps.h sdl_keysym.h sdl_zoom.h -sdl.o audio/sdlaudio.o sdl_zoom.o baum.o: CFLAGS += $(SDL_CFLAGS) +sdl.o audio/sdlaudio.o sdl_zoom.o baum.o: QEMU_CFLAGS += $(SDL_CFLAGS) acl.o: acl.h acl.c @@ -175,7 +175,7 @@ vnc.h: vnc-tls.h vnc-auth-vencrypt.h vnc-auth-sasl.h keymaps.h vnc.o: vnc.c vnc.h vnc_keysym.h vnchextile.h d3des.c d3des.h acl.h -vnc.o: CFLAGS += $(VNC_TLS_CFLAGS) +vnc.o: QEMU_CFLAGS += $(VNC_TLS_CFLAGS) vnc-tls.o: vnc-tls.c vnc.h @@ -185,7 +185,7 @@ vnc-auth-sasl.o: vnc-auth-sasl.c vnc.h curses.o: curses.c keymaps.h curses_keys.h -bt-host.o: CFLAGS += $(BLUEZ_CFLAGS) +bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS) libqemu_common.a: $(obj-y) |