diff options
| author | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-01-31 11:32:10 +0000 |
|---|---|---|
| committer | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-01-31 11:32:10 +0000 |
| commit | 40293e580daecf40309b9df2f48ba9b62b4bdef9 (patch) | |
| tree | b60a11ef55ba3b6cfd75ff4d83fd0e947fc72373 /Makefile | |
| parent | 111f061b8ffb4abb82b9cd61056b7f3ee203d916 (diff) | |
| download | qemu-40293e580daecf40309b9df2f48ba9b62b4bdef9.zip qemu-40293e580daecf40309b9df2f48ba9b62b4bdef9.tar.gz qemu-40293e580daecf40309b9df2f48ba9b62b4bdef9.tar.bz2 | |
Makefile cleanup - more generic support of 32 bit compilation on x86_64
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3937 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 29 |
1 files changed, 11 insertions, 18 deletions
@@ -7,17 +7,14 @@ include config-host.mak VPATH=$(SRC_PATH):$(SRC_PATH)/hw -BASE_CFLAGS= -BASE_LDFLAGS= - -BASE_CFLAGS += $(OS_CFLAGS) $(ARCH_CFLAGS) -BASE_LDFLAGS += $(OS_LDFLAGS) $(ARCH_LDFLAGS) +CFLAGS += $(OS_CFLAGS) $(ARCH_CFLAGS) +LDFLAGS += $(OS_LDFLAGS) $(ARCH_LDFLAGS) CPPFLAGS += -I. -I$(SRC_PATH) -MMD -MP CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE LIBS= ifdef CONFIG_STATIC -BASE_LDFLAGS += -static +LDFLAGS += -static endif ifdef BUILD_DOCS DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 @@ -117,16 +114,16 @@ OBJS+=$(addprefix slirp/, $(SLIRP_OBJS)) endif cocoa.o: cocoa.m - $(CC) $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) -c -o $@ $< + $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< sdl.o: sdl.c keymaps.c sdl_keysym.h - $(CC) $(CFLAGS) $(CPPFLAGS) $(SDL_CFLAGS) $(BASE_CFLAGS) -c -o $@ $< + $(CC) $(CFLAGS) $(CPPFLAGS) $(SDL_CFLAGS) -c -o $@ $< vnc.o: vnc.c keymaps.c sdl_keysym.h vnchextile.h d3des.c d3des.h - $(CC) $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) $(CONFIG_VNC_TLS_CFLAGS) -c -o $@ $< + $(CC) $(CFLAGS) $(CPPFLAGS) $(CONFIG_VNC_TLS_CFLAGS) -c -o $@ $< audio/sdlaudio.o: audio/sdlaudio.c - $(CC) $(CFLAGS) $(CPPFLAGS) $(SDL_CFLAGS) $(BASE_CFLAGS) -c -o $@ $< + $(CC) $(CFLAGS) $(CPPFLAGS) $(SDL_CFLAGS) -c -o $@ $< libqemu_common.a: $(OBJS) rm -f $@ @@ -142,17 +139,17 @@ endif ###################################################################### qemu-img$(EXESUF): qemu-img.o qemu-img-block.o $(QEMU_IMG_BLOCK_OBJS) - $(CC) $(LDFLAGS) $(BASE_LDFLAGS) -o $@ $^ -lz $(LIBS) + $(CC) $(LDFLAGS) -o $@ $^ -lz $(LIBS) qemu-img-%.o: %.c - $(CC) $(CFLAGS) $(CPPFLAGS) -DQEMU_IMG $(BASE_CFLAGS) -c -o $@ $< + $(CC) $(CFLAGS) $(CPPFLAGS) -DQEMU_IMG -c -o $@ $< %.o: %.c - $(CC) $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) -c -o $@ $< + $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< # dyngen host tool dyngen$(EXESUF): dyngen.c - $(HOST_CC) $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) -o $@ $^ + $(HOST_CC) $(CFLAGS) $(CPPFLAGS) -o $@ $^ clean: # avoid old build problems by removing potentially incorrect old files @@ -300,9 +297,5 @@ tarbin: $(docdir)/qemu-tech.html \ $(mandir)/man1/qemu.1 $(mandir)/man1/qemu-img.1 ) -ifneq ($(wildcard .depend),) -include .depend -endif - # Include automatically generated dependency files -include $(wildcard *.d audio/*.d slirp/*.d) |