Improvements to libtool support.
Improvements to the libtool support in QEMU. Replace hard coded libtool in the infrastructure with $(LIBTOOL) and allow overriding the libtool binary used via the configure script. Reviewed-by: Andreas F=E4rber <andreas.faerber@web.de> Signed-off-by: Brad Smith <brad@comstyle.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
2c993ec294
commit
3f53458137
|
@ -369,7 +369,7 @@ trace-dtrace.lo: trace-dtrace.dtrace
|
||||||
@echo "missing libtool. please install and rerun configure."; exit 1
|
@echo "missing libtool. please install and rerun configure."; exit 1
|
||||||
else
|
else
|
||||||
trace-dtrace.lo: trace-dtrace.dtrace
|
trace-dtrace.lo: trace-dtrace.dtrace
|
||||||
$(call quiet-command,libtool --mode=compile --tag=CC dtrace -o $@ -G -s $<, " lt GEN trace-dtrace.o")
|
$(call quiet-command,$(LIBTOOL) --mode=compile --tag=CC dtrace -o $@ -G -s $<, " lt GEN trace-dtrace.o")
|
||||||
endif
|
endif
|
||||||
|
|
||||||
simpletrace.o: simpletrace.c $(GENERATED_HEADERS)
|
simpletrace.o: simpletrace.c $(GENERATED_HEADERS)
|
||||||
|
|
|
@ -225,6 +225,7 @@ cc="${CC-${cross_prefix}gcc}"
|
||||||
ar="${AR-${cross_prefix}ar}"
|
ar="${AR-${cross_prefix}ar}"
|
||||||
objcopy="${OBJCOPY-${cross_prefix}objcopy}"
|
objcopy="${OBJCOPY-${cross_prefix}objcopy}"
|
||||||
ld="${LD-${cross_prefix}ld}"
|
ld="${LD-${cross_prefix}ld}"
|
||||||
|
libtool="${LIBTOOL-${cross_prefix}libtool}"
|
||||||
strip="${STRIP-${cross_prefix}strip}"
|
strip="${STRIP-${cross_prefix}strip}"
|
||||||
windres="${WINDRES-${cross_prefix}windres}"
|
windres="${WINDRES-${cross_prefix}windres}"
|
||||||
pkg_config="${PKG_CONFIG-${cross_prefix}pkg-config}"
|
pkg_config="${PKG_CONFIG-${cross_prefix}pkg-config}"
|
||||||
|
@ -1342,10 +1343,8 @@ fi
|
||||||
##########################################
|
##########################################
|
||||||
# libtool probe
|
# libtool probe
|
||||||
|
|
||||||
if ! has libtool; then
|
if ! has $libtool; then
|
||||||
libtool=
|
libtool=
|
||||||
else
|
|
||||||
libtool=libtool
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
##########################################
|
##########################################
|
||||||
|
|
|
@ -39,7 +39,7 @@ install-libcacard:
|
||||||
@echo "libtool is missing, please install and rerun configure"; exit 1
|
@echo "libtool is missing, please install and rerun configure"; exit 1
|
||||||
else
|
else
|
||||||
libcacard.la: $(libcacard.lib-y) $(QEMU_OBJS_LIB)
|
libcacard.la: $(libcacard.lib-y) $(QEMU_OBJS_LIB)
|
||||||
$(call quiet-command,libtool --mode=link --quiet --tag=CC $(CC) -rpath $(libdir) -o $@ $^ $(libcacard_libs) -lrt," lt LINK $@")
|
$(call quiet-command,$(LIBTOOL) --mode=link --quiet --tag=CC $(CC) -rpath $(libdir) -o $@ $^ $(libcacard_libs) -lrt," lt LINK $@")
|
||||||
|
|
||||||
libcacard.pc: $(libcacard_srcpath)/libcacard.pc.in
|
libcacard.pc: $(libcacard_srcpath)/libcacard.pc.in
|
||||||
sed -e 's|@LIBDIR@|$(libdir)|' \
|
sed -e 's|@LIBDIR@|$(libdir)|' \
|
||||||
|
@ -55,10 +55,10 @@ install-libcacard: libcacard.pc libcacard.la vscclient
|
||||||
$(INSTALL_DIR) "$(DESTDIR)$(libdir)/pkgconfig"
|
$(INSTALL_DIR) "$(DESTDIR)$(libdir)/pkgconfig"
|
||||||
$(INSTALL_DIR) "$(DESTDIR)$(libcacard_includedir)"
|
$(INSTALL_DIR) "$(DESTDIR)$(libcacard_includedir)"
|
||||||
$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
|
$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
|
||||||
libtool --mode=install $(INSTALL_PROG) vscclient "$(DESTDIR)$(bindir)"
|
$(LIBTOOL) --mode=install $(INSTALL_PROG) vscclient "$(DESTDIR)$(bindir)"
|
||||||
libtool --mode=install $(INSTALL_PROG) libcacard.la "$(DESTDIR)$(libdir)"
|
$(LIBTOOL) --mode=install $(INSTALL_PROG) libcacard.la "$(DESTDIR)$(libdir)"
|
||||||
libtool --mode=install $(INSTALL_DATA) libcacard.pc "$(DESTDIR)$(libdir)/pkgconfig"
|
$(LIBTOOL) --mode=install $(INSTALL_DATA) libcacard.pc "$(DESTDIR)$(libdir)/pkgconfig"
|
||||||
for inc in *.h; do \
|
for inc in *.h; do \
|
||||||
libtool --mode=install $(INSTALL_DATA) $(libcacard_srcpath)/$$inc "$(DESTDIR)$(libcacard_includedir)"; \
|
$(LIBTOOL) --mode=install $(INSTALL_DATA) $(libcacard_srcpath)/$$inc "$(DESTDIR)$(libcacard_includedir)"; \
|
||||||
done
|
done
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -22,7 +22,7 @@ ifeq ($(LIBTOOL),)
|
||||||
@echo "missing libtool. please install and rerun configure"; exit 1
|
@echo "missing libtool. please install and rerun configure"; exit 1
|
||||||
else
|
else
|
||||||
%.lo: %.c
|
%.lo: %.c
|
||||||
$(call quiet-command,libtool --mode=compile --quiet --tag=CC $(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," lt CC $@")
|
$(call quiet-command,$(LIBTOOL) --mode=compile --quiet --tag=CC $(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," lt CC $@")
|
||||||
endif
|
endif
|
||||||
|
|
||||||
%.o: %.S
|
%.o: %.S
|
||||||
|
|
Loading…
Reference in New Issue