Revision b6fc675b
b/Makefile | ||
---|---|---|
160 | 160 |
###################################################################### |
161 | 161 |
# Support building shared library libcacard |
162 | 162 |
|
163 |
ifeq ($(CONFIG_SMARTCARD_NSS),y) |
|
163 | 164 |
.PHONY: libcacard.la install-libcacard |
164 | 165 |
libcacard.la: $(oslib-obj-y) qemu-timer-common.o $(trace-obj-y) |
165 | 166 |
$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libcacard V="$(V)" TARGET_DIR="$*/" libcacard.la,) |
166 | 167 |
|
167 | 168 |
install-libcacard: libcacard.la |
168 | 169 |
$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libcacard V="$(V)" TARGET_DIR="$*/" install-libcacard,) |
170 |
endif |
|
169 | 171 |
|
170 | 172 |
###################################################################### |
171 | 173 |
|
b/configure | ||
---|---|---|
2824 | 2824 |
if test "$werror" = "yes"; then |
2825 | 2825 |
test_cflags="-Werror $test_cflags" |
2826 | 2826 |
fi |
2827 |
if $pkg_config --atleast-version=3.12.8 nss >/dev/null 2>&1 && \ |
|
2827 |
if test -n "$libtool" && |
|
2828 |
$pkg_config --atleast-version=3.12.8 nss >/dev/null 2>&1 && \ |
|
2828 | 2829 |
compile_prog "$test_cflags" "$libcacard_libs"; then |
2829 | 2830 |
smartcard_nss="yes" |
2830 | 2831 |
QEMU_CFLAGS="$QEMU_CFLAGS $libcacard_cflags" |
b/libcacard/Makefile | ||
---|---|---|
31 | 31 |
######################################################################### |
32 | 32 |
# Rules for building libcacard standalone library |
33 | 33 |
|
34 |
ifeq ($(LIBTOOL),) |
|
35 |
libcacard.la: |
|
36 |
@echo "libtool is missing, please install and rerun configure"; exit 1 |
|
37 |
|
|
38 |
install-libcacard: |
|
39 |
@echo "libtool is missing, please install and rerun configure"; exit 1 |
|
40 |
else |
|
41 | 34 |
libcacard.la: $(libcacard.lib-y) $(QEMU_OBJS_LIB) |
42 | 35 |
$(call quiet-command,$(LIBTOOL) --mode=link --tag=CC $(CC) -rpath $(libdir) -o $@ $^ $(libcacard_libs)," lt LINK $@") |
43 | 36 |
|
... | ... | |
63 | 56 |
for inc in *.h; do \ |
64 | 57 |
$(INSTALL_DATA) $(libcacard_srcpath)/$$inc "$(DESTDIR)$(libcacard_includedir)"; \ |
65 | 58 |
done |
66 |
endif |
b/rules.mak | ||
---|---|---|
21 | 21 |
$(call quiet-command,$(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," CC $(TARGET_DIR)$@") |
22 | 22 |
|
23 | 23 |
ifeq ($(LIBTOOL),) |
24 |
%.lo: %.c |
|
25 |
@echo "missing libtool. please install and rerun configure"; exit 1 |
|
26 |
%.lo: %.dtrace |
|
27 |
@echo "missing libtool. please install and rerun configure."; exit 1 |
|
28 |
|
|
24 |
LIBTOOL = /bin/false |
|
29 | 25 |
LINK = $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \ |
30 | 26 |
$(sort $(filter %.o, $1)) $(filter-out %.o, $1) \ |
31 | 27 |
$(LIBS)," LINK $(TARGET_DIR)$@") |
Also available in: Unified diff