aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-09-24 17:04:31 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-09-24 17:04:31 +0100
commit9438fe9e56760e5e5e11d6c7d12ed9c64a0c8446 (patch)
treebb91f03e1bb65f7d48d9f6c927a87ce53d6d510a /Makefile
parenteb9d0ea063fc7bdfab76b84085602a9e48d13ec7 (diff)
parent7b02f5447c64d1854468f758398c9f6fe9e5721f (diff)
Merge remote-tracking branch 'remotes/elmarco/tags/rm-libcacard' into staging
Remove libcacard # gpg: Signature made Wed 23 Sep 2015 22:37:11 BST using RSA key ID 75969CE5 # gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>" # gpg: aka "Marc-André Lureau <marcandre.lureau@gmail.com>" # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 87A9 BD93 3F87 C606 D276 F62D DAE8 E109 7596 9CE5 * remotes/elmarco/tags/rm-libcacard: libcacard: use the standalone project Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 0 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 8ec9b69b2f..9e753620e6 100644
--- a/Makefile
+++ b/Makefile
@@ -163,9 +163,6 @@ dummy := $(call unnest-vars,, \
ifneq ($(wildcard config-host.mak),)
include $(SRC_PATH)/tests/Makefile
endif
-ifeq ($(CONFIG_SMARTCARD_NSS),y)
-include $(SRC_PATH)/libcacard/Makefile
-endif
all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules