Re: [PATCH i2c-tools] tools/Module.mk: Add missing dependencies

[Angelo Compagnucci <angelo@xxxxxxxxxxxxxxxxxxxx>]

On Tue, Dec 12, 2017 at 9:33 PM, Jean Delvare <jdelvare@xxxxxxx> wrote:
> Better build the library before building the tools which link against
> it, otherwise parallel builds could run into a race and break.

Tested-by: Angelo Compagnucci <angelo@xxxxxxxxxxxxxxxxxxxx>
Acked-by: Angelo Compagnucci <angelo@xxxxxxxxxxxxxxxxxxxx>

> ---
>  lib/Module.mk   |    7 +++++++
>  tools/Module.mk |   10 +++++-----
>  2 files changed, 12 insertions(+), 5 deletions(-)
>
> --- a/lib/Module.mk
> +++ b/lib/Module.mk
> @@ -35,6 +35,13 @@ LIB_TARGETS  += $(LIB_STLIBNAME)
>  LIB_OBJECTS    += smbus.ao
>  endif
>
> +# Library file to link against (static or dynamic)
> +ifeq ($(USE_STATIC_LIB),1)
> +LIB_DEPS       := $(LIB_DIR)/$(LIB_STLIBNAME)
> +else
> +LIB_DEPS       := $(LIB_DIR)/$(LIB_SHBASENAME)
> +endif
> +
>  #
>  # Libraries
>  #
> --- a/tools/Module.mk
> +++ b/tools/Module.mk
> @@ -24,19 +24,19 @@ TOOLS_TARGETS       := i2cdetect i2cdump i2cse
>  # Programs
>  #
>
> -$(TOOLS_DIR)/i2cdetect: $(TOOLS_DIR)/i2cdetect.o $(TOOLS_DIR)/i2cbusses.o
> +$(TOOLS_DIR)/i2cdetect: $(TOOLS_DIR)/i2cdetect.o $(TOOLS_DIR)/i2cbusses.o $(LIB_DEPS)
>         $(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
>
> -$(TOOLS_DIR)/i2cdump: $(TOOLS_DIR)/i2cdump.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o
> +$(TOOLS_DIR)/i2cdump: $(TOOLS_DIR)/i2cdump.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o $(LIB_DEPS)
>         $(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
>
> -$(TOOLS_DIR)/i2cset: $(TOOLS_DIR)/i2cset.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o
> +$(TOOLS_DIR)/i2cset: $(TOOLS_DIR)/i2cset.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o $(LIB_DEPS)
>         $(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
>
> -$(TOOLS_DIR)/i2cget: $(TOOLS_DIR)/i2cget.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o
> +$(TOOLS_DIR)/i2cget: $(TOOLS_DIR)/i2cget.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o $(LIB_DEPS)
>         $(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
>
> -$(TOOLS_DIR)/i2ctransfer: $(TOOLS_DIR)/i2ctransfer.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o
> +$(TOOLS_DIR)/i2ctransfer: $(TOOLS_DIR)/i2ctransfer.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o $(LIB_DEPS)
>         $(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
>
>  #
>
>
> --
> Jean Delvare
> SUSE L3 Support