From dfaef68d7d11193d4bf30252030659f04c355f3a Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Wed, 24 Nov 2021 17:00:49 +0100
Subject: Generated meson.build: also include cargs

---
 gen-meson.build        | 8 ++++++++
 meson.am               | 2 +-
 src/base64/Makefile.am | 2 +-
 src/client/Makefile.am | 2 +-
 src/hash/Makefile.am   | 2 +-
 src/jwk/Makefile.am    | 2 +-
 src/jws/Makefile.am    | 2 +-
 src/random/Makefile.am | 2 +-
 8 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/gen-meson.build b/gen-meson.build
index 2847eb6..1f2ac2d 100755
--- a/gen-meson.build
+++ b/gen-meson.build
@@ -28,4 +28,12 @@ do
     printf "%sdependency('%s')" "$COMMA" "$dep"
     COMMA=","
 done
+printf "], c_args: ["
+
+COMMA=""
+for c_arg in $src_ui_disfluid_gui_CFLAGS
+do
+    printf "%s'%s'" "$COMMA" "$c_arg"
+    COMMA=","
+done
 printf "])\n"
diff --git a/meson.am b/meson.am
index 95920d6..22e75ce 100644
--- a/meson.am
+++ b/meson.am
@@ -17,5 +17,5 @@
 EXTRA_DIST += %reldir%/gen-meson.build
 
 meson.build: %reldir%/gen-meson.build config.status
-	$(AM_V_GEN) PACKAGE="$(PACKAGE)" src_ui_disfluid_gui_VALASOURCES="$(src_ui_disfluid_gui_VALASOURCES)" dist_vapi_DATA="$(dist_vapi_DATA)" AM_VALAFLAGS="$(AM_VALAFLAGS)" $(SHELL) $< > $@-t
+	$(AM_V_GEN) PACKAGE="$(PACKAGE)" src_ui_disfluid_gui_VALASOURCES="$(src_ui_disfluid_gui_VALASOURCES)" src_ui_disfluid_gui_CFLAGS="$(src_ui_disfluid_gui_CFLAGS)" src_ui_disfluid_gui_LDADD="$(src_ui_difsluid_gui_LDADD)" dist_vapi_DATA="$(dist_vapi_DATA)" AM_VALAFLAGS="$(AM_VALAFLAGS)" $(SHELL) $< > $@-t
 	@mv $@-t $@
diff --git a/src/base64/Makefile.am b/src/base64/Makefile.am
index c049520..83cfc22 100644
--- a/src/base64/Makefile.am
+++ b/src/base64/Makefile.am
@@ -20,7 +20,7 @@ BUILT_SOURCES += %reldir%/libwebidoidc-base64.x
 
 %canon_reldir%_libwebidoidc_base64_la_LIBADD = $(GUILE_LIBS) $(NETTLE_LIBS)
 
-AM_CFLAGS += -I %reldir% -I $(srcdir)/%reldir%
+AM_CFLAGS += -I%reldir% -I$(srcdir)/%reldir%
 
 INDENTED += %reldir%/libwebidoidc-base64.c
 
diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index 4773e11..04b5bc9 100644
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -20,7 +20,7 @@ include_HEADERS += %reldir%/Disfluid-0.h
 
 %canon_reldir%_libwebidoidc_client_la_LIBADD = $(GUILE_LIBS)
 
-AM_CFLAGS += -I %reldir% -I $(srcdir)/%reldir%
+AM_CFLAGS += -I%reldir% -I$(srcdir)/%reldir%
 
 INDENTED += %reldir%/libwebidoidc-client.c %reldir%/Disfluid-0.h
 
diff --git a/src/hash/Makefile.am b/src/hash/Makefile.am
index 5ecdd14..8814ab9 100644
--- a/src/hash/Makefile.am
+++ b/src/hash/Makefile.am
@@ -20,7 +20,7 @@ BUILT_SOURCES += %reldir%/libwebidoidc-hash.x
 
 %canon_reldir%_libwebidoidc_hash_la_LIBADD = $(GUILE_LIBS) $(NETTLE_LIBS)
 
-AM_CFLAGS += -I %reldir% -I $(srcdir)/%reldir%
+AM_CFLAGS += -I%reldir% -I$(srcdir)/%reldir%
 
 INDENTED += %reldir%/libwebidoidc-hash.c
 
diff --git a/src/jwk/Makefile.am b/src/jwk/Makefile.am
index 25f89b4..d7979bf 100644
--- a/src/jwk/Makefile.am
+++ b/src/jwk/Makefile.am
@@ -22,7 +22,7 @@ BUILT_SOURCES += %reldir%/libwebidoidc-jwk.x
 %canon_reldir%_libwebidoidc_jwk_la_LIBADD = $(GUILE_LIBS) $(NETTLE_LIBS) $(HOGWEED_LIBS)
 %canon_reldir%_generate_key_LDADD = src/libwebidoidc.la $(GUILE_LIBS)
 
-AM_CFLAGS += -I %reldir% -I $(srcdir)/%reldir%
+AM_CFLAGS += -I%reldir% -I$(srcdir)/%reldir%
 
 INDENTED += %reldir%/libwebidoidc-jwk.c %reldir%/generate-key.c
 
diff --git a/src/jws/Makefile.am b/src/jws/Makefile.am
index a0cd924..98e89e4 100644
--- a/src/jws/Makefile.am
+++ b/src/jws/Makefile.am
@@ -20,7 +20,7 @@ BUILT_SOURCES += %reldir%/libwebidoidc-jws.x
 
 %canon_reldir%_libwebidoidc_jws_la_LIBADD = $(GUILE_LIBS) $(NETTLE_LIBS) $(HOGWEED_LIBS)
 
-AM_CFLAGS += -I %reldir% -I $(srcdir)/%reldir%
+AM_CFLAGS += -I%reldir% -I$(srcdir)/%reldir%
 
 INDENTED += %reldir%/libwebidoidc-jws.c
 
diff --git a/src/random/Makefile.am b/src/random/Makefile.am
index 79708b3..1e19194 100644
--- a/src/random/Makefile.am
+++ b/src/random/Makefile.am
@@ -27,7 +27,7 @@ include_HEADERS += %reldir%/webid-oidc/random.h
   %reldir%/webid-oidc/random.h
 %canon_reldir%_generate_random_LDADD = %reldir%/libwebidoidc-random.la $(GUILE_LIBS)
 
-AM_CFLAGS += -I %reldir% -I $(srcdir)/%reldir%
+AM_CFLAGS += -I%reldir% -I$(srcdir)/%reldir%
 
 INDENTED += \
   %reldir%/generate-random.c \
-- 
cgit v1.2.3