diff mbox

[03/24] Remove merge artifacts

Message ID 7a065921ac07a105934c2741ec8a7e4cc65c9f6b.1253272938.git.quintela@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Juan Quintela Sept. 18, 2009, 11:41 a.m. UTC 
CFLAGS and LDFLAGS are defined on config.mak
LDFLAGS_BASE is not used anywhere
DEPLIBS are not defined anywhere

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile.target |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)
diff mbox

Patch

diff --git a/Makefile.target b/Makefile.target
index a08e432..5fad812 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -1,13 +1,8 @@ 
 # -*- Mode: makefile -*-

-CFLAGS=
-LDFLAGS=
-
 include config.mak
 include $(SRC_PATH)/rules.mak

-LDFLAGS_BASE:=$(LDFLAGS)
-
 TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH)
 VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw
 QEMU_CFLAGS+= -I.. -I$(TARGET_PATH) -DNEED_CPU_H
@@ -347,9 +342,6 @@  monitor.o: qemu-monitor.h

 ARLIBS=../libqemu_common.a libqemu.a $(HWLIB)

-$(QEMU_PROG): ARLIBS += $(DEPLIBS)
-$(QEMU_PROG): $(DEPLIBS)
-
 endif # CONFIG_SOFTMMU

 $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) $(ARLIBS)