diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2012-06-10 10:18:54 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-06-21 20:04:24 +0000 |
| commit | 47ecbdf07ed2c37bdfd2d77137d01bb319ce13da (patch) | |
| tree | 62cd20084d1e2c0a7888f8159642f78d72405b8c /libcacard | |
| parent | 3359847e9dbdf4531ed17e86ef55be8b8676e329 (diff) | |
| download | qemu-47ecbdf07ed2c37bdfd2d77137d01bb319ce13da.zip qemu-47ecbdf07ed2c37bdfd2d77137d01bb319ce13da.tar.gz qemu-47ecbdf07ed2c37bdfd2d77137d01bb319ce13da.tar.bz2 | |
libcacard: build fixes
Link trace objects to fix these errors:
LINK vscclient
oslib-posix.o: In function `trace_qemu_vfree':
/src/qemu/obj-amd64/./trace.h:39: undefined reference to `trace1'
oslib-posix.o: In function `trace_qemu_memalign':
/src/qemu/obj-amd64/./trace.h:31: undefined reference to `trace3'
oslib-posix.o: In function `trace_qemu_vmalloc':
/src/qemu/obj-amd64/./trace.h:35: undefined reference to `trace2'
Add LDFLAGS to vscclient link command.
Clean up also in subdirectories of libcacard.
Use quiet-command for sed invocation.
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Acked-by: Alon Levy <alevy@redhat.com>
Diffstat (limited to 'libcacard')
| -rw-r--r-- | libcacard/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libcacard/Makefile b/libcacard/Makefile index fdc2873..63990b7 100644 --- a/libcacard/Makefile +++ b/libcacard/Makefile @@ -15,8 +15,8 @@ QEMU_CFLAGS+=-I../ libcacard.lib-y=$(patsubst %.o,%.lo,$(libcacard-y)) clean: - rm -f *.o */*.o *.d */*.d *.a */*.a *~ */*~ vscclient *.lo .libs/* *.la *.pc - rm -Rf .libs + rm -f *.o */*.o *.d */*.d *.a */*.a *~ */*~ vscclient *.lo */*.lo .libs/* */.libs/* *.la */*.la *.pc + rm -Rf .libs */.libs all: libcacard.la libcacard.pc # Dummy command so that make thinks it has done something @@ -37,11 +37,12 @@ libcacard.la: $(libcacard.lib-y) $(QEMU_OBJS_LIB) libcacard_srcpath=$(SRC_PATH)/libcacard libcacard.pc: $(libcacard_srcpath)/libcacard.pc.in - sed -e 's|@LIBDIR@|$(libdir)|' \ + $(call quiet-command,sed -e 's|@LIBDIR@|$(libdir)|' \ -e 's|@INCLUDEDIR@|$(libcacard_includedir)|' \ -e 's|@VERSION@|$(shell cat $(SRC_PATH)/VERSION)|' \ -e 's|@PREFIX@|$(prefix)|' \ - < $(libcacard_srcpath)/libcacard.pc.in > libcacard.pc + < $(libcacard_srcpath)/libcacard.pc.in > libcacard.pc,\ + " GEN $@") .PHONY: install-libcacard |