On Wed, Jan 13, 2016 at 01:53:27PM +0800, Fam Zheng wrote: > On Tue, 01/12 18:56, Daniel P. Berrange wrote: > > +#if defined CONFIG_NETTLE > > +#include "crypto/pbkdf-nettle.c" > > +#elif defined CONFIG_GCRYPT > > +#include "crypto/pbkdf-gcrypt.c" > > +#else /* ! CONFIG_GCRYPT */ > > +#include "crypto/pbkdf-stub.c" > > +#endif /* ! CONFIG_GCRYPT */ > > I think the convention in QEMU is in crypto/Makefile.objs: > > crypto-obj-$(CONFIG_NETTLE) += pbkdf-nettle.o > crypto-obj-$(if $(CONFIG_NETTLE),n,$(CONFIG_GCRYPT)) += pbkdf-gcrypt.o
Ok, that's fine. > And move pbkdf-stub.c to stub/pbkdf.c. I'd rather key the source in the crypto/ directory since it matches up with MAINTAINER file rules. I can still add it to stub-obj-y in the makefile though, so that has same end effect on the build. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|