pkcs11-json: Make use of Meson subprojects feature

This moves the pkcs11-json submodule under "subprojects", following
the Meson subprojects convention.  This allows the submodule to be
automatically initialized when running meson setup.

Signed-off-by: Daiki Ueno <[email protected]>

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "pkcs11-json"]
-	path = pkcs11-json
+	path = subprojects/pkcs11-json
 	url = https://github.com/p11-glue/pkcs11-json.git

Makefile.am

@@ -27,7 +27,7 @@ CLEANFILES =
 EXTRA_DIST = CONTRIBUTING.md meson.build meson_options.txt po/meson.build \
 	doc/manual/meson.build doc/manual/userdir.xml.in \
 	doc/manual/sysdir.xml.in doc/manual/version.xml.in \
-	bash-completion pkcs11-json
+	bash-completion subprojects
 
 incdir = $(includedir)/p11-kit-1/p11-kit
 inc_HEADERS =
@@ -57,7 +57,7 @@ endif
 
 PKCS11_JSON_INPUT = $(srcdir)/common/pkcs11.h
 
-include pkcs11-json/Makefile.am
+include subprojects/pkcs11-json/Makefile.am
 
 SUBDIRS = . doc po
 

meson.build

@@ -440,7 +440,9 @@ if not python_version.version_compare(python_version_req)
   error('Requires Python @0@, @1@ found.'.format(python_version_req, python_version))
 endif
 
-subdir('pkcs11-json')
+pkcs11_json_project = subproject('pkcs11-json')
+pkcs11_json = pkcs11_json_project.get_variable('pkcs11_json')
+
 subdir('common')
 subdir('p11-kit')
 subdir('fuzz')

p11-kit/Makefile.am

@@ -44,35 +44,35 @@ CLEANFILES += \
 	$(VIRTUAL_GENERATED) \
 	$(NULL)
 
-p11-kit/virtual-ffi-generated.h: Makefile p11-kit/gen-wrappers.py pkcs11-json/pkcs11.json
+p11-kit/virtual-ffi-generated.h: Makefile p11-kit/gen-wrappers.py subprojects/pkcs11-json/pkcs11.json
 	$(AM_V_GEN)$(PYTHON) $(srcdir)/p11-kit/gen-wrappers.py \
 		--template $(srcdir)/p11-kit/templates/binding-wrappers.py \
 		--excludes $(srcdir)/p11-kit/templates/virtual-excludes.list \
-		--infile $(srcdir)/pkcs11-json/pkcs11.json --outfile $@
+		--infile $(srcdir)/subprojects/pkcs11-json/pkcs11.json --outfile $@
 
-p11-kit/virtual-fixed-wrappers.h: Makefile p11-kit/gen-wrappers.py pkcs11-json/pkcs11.json
+p11-kit/virtual-fixed-wrappers.h: Makefile p11-kit/gen-wrappers.py subprojects/pkcs11-json/pkcs11.json
 	$(AM_V_GEN)$(PYTHON) $(srcdir)/p11-kit/gen-wrappers.py \
 		--template $(srcdir)/p11-kit/templates/fixed-wrappers.py \
 		--excludes $(srcdir)/p11-kit/templates/virtual-excludes.list \
 		--renames C_GetFunctionStatus:short C_CancelFunction:short \
 		--concat-lines \
-		--infile $(srcdir)/pkcs11-json/pkcs11.json --outfile $@
+		--infile $(srcdir)/subprojects/pkcs11-json/pkcs11.json --outfile $@
 
 p11-kit/virtual-fixed-closures.h: Makefile p11-kit/gen-fixed-closures.py
 	$(AM_V_GEN)$(PYTHON) $(srcdir)/p11-kit/gen-fixed-closures.py \
 		--closures $(closures) --outfile $@
 
-p11-kit/virtual-stack-generated.h: Makefile p11-kit/gen-wrappers.py pkcs11-json/pkcs11.json
+p11-kit/virtual-stack-generated.h: Makefile p11-kit/gen-wrappers.py subprojects/pkcs11-json/pkcs11.json
 	$(AM_V_GEN)$(PYTHON) $(srcdir)/p11-kit/gen-wrappers.py \
 		--template $(srcdir)/p11-kit/templates/stack-wrappers.py \
 		--excludes $(srcdir)/p11-kit/templates/virtual-excludes.list \
-		--infile $(srcdir)/pkcs11-json/pkcs11.json --outfile $@
+		--infile $(srcdir)/subprojects/pkcs11-json/pkcs11.json --outfile $@
 
-p11-kit/virtual-base-generated.h: Makefile p11-kit/gen-wrappers.py pkcs11-json/pkcs11.json
+p11-kit/virtual-base-generated.h: Makefile p11-kit/gen-wrappers.py subprojects/pkcs11-json/pkcs11.json
 	$(AM_V_GEN)$(PYTHON) $(srcdir)/p11-kit/gen-wrappers.py \
 		--template $(srcdir)/p11-kit/templates/base-wrappers.py \
 		--excludes $(srcdir)/p11-kit/templates/virtual-excludes.list \
-		--infile $(srcdir)/pkcs11-json/pkcs11.json --outfile $@
+		--infile $(srcdir)/subprojects/pkcs11-json/pkcs11.json --outfile $@
 
 lib_LTLIBRARIES += \
 	libp11-kit.la