From: Paolo Bonzini <pbonzini@redhat.com>
Date: Thu, 27 Sep 2012 07:51:55 +0000 (+0200)
Subject: libcacard: simplify rules for recursive build
X-Git-Tag: v1.4.0-rc0~251^2~5^2~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5f0cef1aa92b98610a99125d1d1d80e9339ac7c5;p=thirdparty%2Fqemu.git

libcacard: simplify rules for recursive build

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/Makefile b/Makefile
index 9ecbcbb0a7c..d06fbad6c95 100644
--- a/Makefile
+++ b/Makefile
@@ -169,19 +169,11 @@ libqemustub.a: $(stub-obj-y)
 # Support building shared library libcacard
 
 .PHONY: libcacard.la install-libcacard
-ifeq ($(LIBTOOL),)
-libcacard.la:
-	@echo "libtool is missing, please install and rerun configure"; exit 1
-
-install-libcacard:
-	@echo "libtool is missing, please install and rerun configure"; exit 1
-else
-libcacard.la: $(oslib-obj-y) qemu-timer-common.o $(addsuffix .lo, $(basename $(trace-obj-y)))
+libcacard.la: $(oslib-obj-y) qemu-timer-common.o $(trace-obj-y)
 	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libcacard V="$(V)" TARGET_DIR="$*/" libcacard.la,)
 
 install-libcacard: libcacard.la
 	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libcacard V="$(V)" TARGET_DIR="$*/" install-libcacard,)
-endif
 
 ######################################################################