Revision 3f534581

b/Makefile.objs
369 369
	@echo "missing libtool. please install and rerun configure."; exit 1
370 370
else
371 371
trace-dtrace.lo: trace-dtrace.dtrace
372
	$(call quiet-command,libtool --mode=compile --tag=CC dtrace -o $@ -G -s $<, "  lt GEN trace-dtrace.o")
372
	$(call quiet-command,$(LIBTOOL) --mode=compile --tag=CC dtrace -o $@ -G -s $<, "  lt GEN trace-dtrace.o")
373 373
endif
374 374

  
375 375
simpletrace.o: simpletrace.c $(GENERATED_HEADERS)
b/configure
225 225
ar="${AR-${cross_prefix}ar}"
226 226
objcopy="${OBJCOPY-${cross_prefix}objcopy}"
227 227
ld="${LD-${cross_prefix}ld}"
228
libtool="${LIBTOOL-${cross_prefix}libtool}"
228 229
strip="${STRIP-${cross_prefix}strip}"
229 230
windres="${WINDRES-${cross_prefix}windres}"
230 231
pkg_config="${PKG_CONFIG-${cross_prefix}pkg-config}"
......
1342 1343
##########################################
1343 1344
# libtool probe
1344 1345

  
1345
if ! has libtool; then
1346
if ! has $libtool; then
1346 1347
    libtool=
1347
else
1348
    libtool=libtool
1349 1348
fi
1350 1349

  
1351 1350
##########################################
b/libcacard/Makefile
39 39
	@echo "libtool is missing, please install and rerun configure"; exit 1
40 40
else
41 41
libcacard.la: $(libcacard.lib-y) $(QEMU_OBJS_LIB)
42
	$(call quiet-command,libtool --mode=link --quiet --tag=CC $(CC) -rpath $(libdir) -o $@ $^ $(libcacard_libs) -lrt,"  lt LINK $@")
42
	$(call quiet-command,$(LIBTOOL) --mode=link --quiet --tag=CC $(CC) -rpath $(libdir) -o $@ $^ $(libcacard_libs) -lrt,"  lt LINK $@")
43 43

  
44 44
libcacard.pc: $(libcacard_srcpath)/libcacard.pc.in
45 45
	sed -e 's|@LIBDIR@|$(libdir)|' \
......
55 55
	$(INSTALL_DIR) "$(DESTDIR)$(libdir)/pkgconfig"
56 56
	$(INSTALL_DIR) "$(DESTDIR)$(libcacard_includedir)"
57 57
	$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
58
	libtool --mode=install $(INSTALL_PROG) vscclient "$(DESTDIR)$(bindir)"
59
	libtool --mode=install $(INSTALL_PROG) libcacard.la "$(DESTDIR)$(libdir)"
60
	libtool --mode=install $(INSTALL_DATA) libcacard.pc "$(DESTDIR)$(libdir)/pkgconfig"
58
	$(LIBTOOL) --mode=install $(INSTALL_PROG) vscclient "$(DESTDIR)$(bindir)"
59
	$(LIBTOOL) --mode=install $(INSTALL_PROG) libcacard.la "$(DESTDIR)$(libdir)"
60
	$(LIBTOOL) --mode=install $(INSTALL_DATA) libcacard.pc "$(DESTDIR)$(libdir)/pkgconfig"
61 61
	for inc in *.h; do \
62
		libtool --mode=install $(INSTALL_DATA) $(libcacard_srcpath)/$$inc "$(DESTDIR)$(libcacard_includedir)"; \
62
		$(LIBTOOL) --mode=install $(INSTALL_DATA) $(libcacard_srcpath)/$$inc "$(DESTDIR)$(libcacard_includedir)"; \
63 63
	done
64 64
endif
b/rules.mak
22 22
	@echo "missing libtool. please install and rerun configure"; exit 1
23 23
else
24 24
%.lo: %.c
25
	$(call quiet-command,libtool --mode=compile --quiet --tag=CC $(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<,"  lt CC $@")
25
	$(call quiet-command,$(LIBTOOL) --mode=compile --quiet --tag=CC $(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<,"  lt CC $@")
26 26
endif
27 27

  
28 28
%.o: %.S

Also available in: Unified diff