Re: [Qemu-devel] [PATCH v3 22/22] qidl: unit tests and build infrastructure

[Paolo Bonzini <pbonzini@redhat.com>]

Il 04/10/2012 19:33, Michael Roth ha scritto:
> +
> +%.qidl.c: %.c $(SRC_PATH)/qidl.h $(addprefix $(SRC_PATH)/scripts/,lexer.py qidl.py qidl_parser.py qapi.py qapi_visit.py)
> +	$(call rm -f $(*D)/qidl-generated/$(*F).qidl.c)
> +	$(if $(strip $(shell grep "QIDL_ENABLE()" $< 1>/dev/null && echo "true")), \
> +	  $(call quiet-command, \
> +	    $(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(CFLAGS) -E -c -DQIDL_GEN $< | \
> +	    $(PYTHON) $(SRC_PATH)/scripts/qidl.py \
> +	    --output-filepath=$(*D)/qidl-generated/$(*F).qidl.c || [ "$$?" -eq 2 ], \
> +	    "qidl PP $(*D)/$(*F).c"),)
> +%.o: %.c %.qidl.c
> +	$(if $(strip $(shell test -f $(*D)/qidl-generated/$(*F).qidl.c && echo "true")), \
> +	  $(call quiet-command, \
> +	    $(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c \
> +		-DQIDL_ENABLED -include $< -o $@ $(*D)/qidl-generated/$(*F).qidl.c, \
> +		"qidl CC $@"), \
> +	  $(call quiet-command, \
> +	    $(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c \
> +	      -o $@ $<,"  CC    $@"))


Because the .qidl.c files are not created for files without a QIDL_ENABLE()
directive, all those files will be grepped on every invocation of the makefile.

It is better to define the list of QIDL_ENABLEd files in an auxiliary makefile
like this (untested):

QIDL_FILES =
-include qemu-idl-files.mak
qemu-idl-files.mak: $(obj-y) $(common-obj-y) $(hw-obj-y)
	(grep -l "QIDL_ENABLE()" $^ || :) | sed 's/^/QIDL_FILES += /' > $@

$(QIDL_FILES): %.qidl.c: %.c
	$(call quiet-command, \
	    $(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(CFLAGS) -E -c -DQIDL_GEN $< | \
	    $(PYTHON) $(SRC_PATH)/scripts/qidl.py \
	    --output-filepath=$(*D)/qidl-generated/tmp-$(*F).qidl.c || [ "$$?" -eq 2 ], \
	    "qidl PP $(*D)/$(*F).c"),)
	mv $(*D)/qidl-generated/tmp-$(*F).qidl.c $(*D)/qidl-generated/$(*F).qidl.c

$(QIDL_FILES): %.o: %.c %.qidl.c
	$(call quiet-command, \
	    $(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c \
		-DQIDL_ENABLED -include $< -o $@ $(*D)/qidl-generated/$(*F).qidl.c, \
		"qidl CC $@"), \

%.o: %.c
	$(call quiet-command, \
	    $(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c \
	      -o $@ $<,"  CC    $@"))

Paolo