htable: allow htable_type keys to be non-pointers.

[ccan] / Makefile

diff --git a/Makefile b/Makefile
index 5d4b701c868bdfc62ae9ea8c325c4a958611d681..127b8757808eedeabec2c53425ef0850c89ce5c6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,18 +15,21 @@ SCOREDIR=scores/$(shell whoami)/$(shell uname -s)-$(shell uname -m)-$(CC)-$(shel
 CCANLINT=tools/ccanlint/ccanlint --deps-fail-ignore
 CCANLINT_FAST=$(CCANLINT) -x tests_pass_valgrind -x tests_compile_coverage
 
-default: libccan.a
+default: all_info libccan.a
 
 ALL_DEPENDS=$(patsubst %, ccan/%/.depends, $(MODS))
 
 # By default, we skip modules with external deps (or plaform specific)
 MODS_EXCLUDE:=altstack generator jmap jset nfs ogg_to_pcm tal/talloc wwviaudio
+# This randomly fails, and reliably fails under Jenkins :(
+MODS_FLAKY:=altstack
+MODS_RELIABLE=$(filter-out $(MODS_FLAKY),$(MODS))
 
 include Makefile-ccan
 
-fastcheck: $(MODS:%=summary-fastcheck/%)
+fastcheck: $(MODS_RELIABLE:%=summary-fastcheck/%)
 
-check: $(MODS:%=summary-check/%)
+check: $(MODS_RELIABLE:%=summary-check/%)
 
 distclean: clean
        rm -f $(ALL_DEPENDS)
@@ -60,8 +63,10 @@ summary-check/%: tools/ccanlint/ccanlint $(OBJFILES)
 summary-fastcheck/%: tools/ccanlint/ccanlint $(OBJFILES)
        $(CCANLINT_FAST) -s ccan/$*
 
-ccan/%/info: ccan/%/_info
-       $(CC) $(CCAN_CFLAGS) -o $@ -x c $<
+ccan/%/info: ccan/%/_info config.h
+       $(CC) $(CCAN_CFLAGS) -I. -o $@ -x c $<
+
+all_info: $(MODS:%=ccan/%/info)
 
 clean: tools-clean
        rm -f `find * -name '*.o'` `find * -name '.depends'` `find * -name '*.a'`  `find * -name info` `find * -name '*.d'` `find ccan -name '*-Makefile'`