Improving build process

Change-Id: Ib22bbdcd7d7a6ffdda44d6379fd0022e2607bfc3
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>