From: Jan Sarenik Date: Fri, 23 Feb 2018 05:44:25 +0000 (+0100) Subject: Makefile: Fix asort multiple definition error X-Git-Url: http://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=7a75cff74ecfc0ee6b9f226231b21856ab960674;hp=e1de84670da2c94900bb3638dedc3e4c18f5dd61;ds=sidebyside Makefile: Fix asort multiple definition error Error I experienced on Alpine Linux without this patch: In file included from ccan/generator/generator.c:8:0: ./ccan/generator/generator.h:23:2: error: #error Generators require coroutines #error Generators require coroutines ^~~~~ make: *** [Makefile:32: ccan/generator/generator.o] Error 1 --- diff --git a/Makefile b/Makefile index dff35230..c507b746 100644 --- a/Makefile +++ b/Makefile @@ -59,7 +59,7 @@ LINT_OPTS.ok := -s LINT_OPTS.fast-ok := -s -x tests_pass_valgrind -x tests_compile_coverage LINT_SRCS := $(filter-out $(LINT).c, $(wildcard tools/ccanlint/*.c tools/ccanlint/tests/*.c)) LINT_DEPS := $(LINT_SRCS:%.c=%.d) $(LINT).d -LINT_CCAN_MODULES := asort autodata dgraph ilog lbalance ptr_valid strmap +LINT_CCAN_MODULES := autodata dgraph ilog lbalance ptr_valid strmap LINT_CCAN_SRCS := $(wildcard $(LINT_CCAN_MODULES:%=ccan/%/*.c)) LINT_OBJS := $(LINT_SRCS:%.c=%.o) $(LINT_CCAN_SRCS:%.c=%.o) $(TOOLS_OBJS) ifneq ($(GCOV),)