X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fdepends.c;h=871a3e8712368a649dc3d2d478e696087496bd57;hp=dde2b3ae3673eef0094ae85c3fd8187a2d0dc78a;hb=9e207bca5bf5e0a1e3653a91649414fab793c801;hpb=8d9d288e9a77cc58bbc2a0cb9274962139638c5b

diff --git a/tools/depends.c b/tools/depends.c
index dde2b3ae..871a3e87 100644
--- a/tools/depends.c
+++ b/tools/depends.c
@@ -228,12 +228,12 @@ get_all_deps(const void *ctx, const char *dir, const char *style,
 }
 
 /* Can return NULL: _info may not support 'libs'. */
-static char **get_one_libs(const void *ctx, const char *dir,
+static char **get_one_prop(const void *ctx, const char *dir, const char *prop,
 			   char *(*get_info)(const void *ctx, const char *dir))
 {
 	char *cmd, **lines;
 
-	cmd = tal_fmt(ctx, "%s libs", get_info(ctx, dir));
+	cmd = tal_fmt(ctx, "%s %s", get_info(ctx, dir), prop);
 	lines = lines_from_cmd(cmd, "%s", cmd);
 	/* Strip final NULL. */
 	if (lines)
@@ -241,6 +241,18 @@ static char **get_one_libs(const void *ctx, const char *dir,
 	return lines;
 }
 
+static char **get_one_libs(const void *ctx, const char *dir,
+			   char *(*get_info)(const void *ctx, const char *dir))
+{
+	return get_one_prop(ctx, dir, "libs", get_info);
+}
+
+static char **get_one_cflags(const void *ctx, const char *dir,
+			   char *(*get_info)(const void *ctx, const char *dir))
+{
+	return get_one_prop(ctx, dir, "cflags", get_info);
+}
+
 /* O(n^2) but n is small. */
 static char **add_deps(char **deps1, char **deps2)
 {
@@ -258,6 +270,18 @@ static char **add_deps(char **deps1, char **deps2)
 	return deps1;
 }
 
+char **get_cflags(const void *ctx, const char *dir,
+        char *(*get_info)(const void *ctx, const char *dir))
+{
+	char **flags;
+	unsigned int len;
+	flags = get_one_cflags(ctx, dir, get_info);
+	len = tal_count(flags);
+	tal_resize(&flags, len + 1);
+	flags[len] = NULL;
+	return flags;
+}
+
 char **get_libs(const void *ctx, const char *dir, const char *style,
 		char *(*get_info)(const void *ctx, const char *dir))
 {