[ccan] [PATCH 2/2] Build info files
David Gibson
david at gibson.dropbear.id.au
Tue May 10 05:59:41 AEST 2016
All modules have a _info file (a C file, despite the lack of extension)
giving metadata for the module. The Makefiles have a rule to build these..
but it's broken (missing an include directive).
This patch fixes the rule, and builds the info binaries for all modules by
default. This is a useful check and also useful for manually inspecting
a module's metadata.
Signed-off-by: David Gibson <david at gibson.dropbear.id.au>
---
Makefile | 8 +++++---
ccan/.gitignore | 2 ++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 2ce0145..127b875 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ 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))
@@ -63,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'`
diff --git a/ccan/.gitignore b/ccan/.gitignore
index 714e66a..e497e74 100644
--- a/ccan/.gitignore
+++ b/ccan/.gitignore
@@ -1 +1,3 @@
*-Makefile
+info
+
--
2.5.5
More information about the ccan
mailing list