cligen: update git submodule

This also reverts commit fd0e28a3 and changes how the cligen python
files are included in the distribution.

Signed-off-by: Daiki Ueno <ueno@gnu.org>

11 files changed, 51 insertions, 58 deletions

diff --git a/.gitignore b/.gitignore
index 68181698a0..ef65e37fd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -271,9 +271,6 @@ Makefile.user
 *.o
 *.out
 *.plist
-python/__pycache__/
-python/cligen
-python/cli-*gen.py
 src/benchmark
 src/benchmark-cipher
 src/benchmark-tls
diff --git a/.gitmodules b/.gitmodules
index b5e27b90eb..2400cfb628 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -23,5 +23,5 @@
 	path = devel/abi-dump
 	url = https://gitlab.com/gnutls/abi-dump.git
 [submodule "devel/cligen"]
-	path = devel/cligen
+	path = cligen
 	url = https://gitlab.com/gnutls/cligen.git
diff --git a/Makefile.am b/Makefile.am
index 1cdbc1fae2..0f2ccdff0a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--with-guile-extension-dir='$$(libdir)/guile/$$(GUILE_EFFECTIVE_VERSION)/extensions' \
 	AUTOGEN=false
 
-SUBDIRS = gl lib extra python
+SUBDIRS = gl lib extra
 
 if ENABLE_DANE
 SUBDIRS += libdane
@@ -202,3 +202,6 @@ dist-hook:
 	touch -c $(distdir)/doc/*.html $(distdir)/doc/*.pdf $(distdir)/doc/*.info
 
 .PHONY: abi-check abi-dump-versioned abi-dump-latest pic-check symbol-check local-code-coverage-output files-update AUTHORS
+
+include $(top_srcdir)/cligen/cligen.mk
+noinst_PYTHON = $(cligen_sources)
diff --git a/bootstrap.conf b/bootstrap.conf
index efbf7f485e..d922baeae3 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -23,7 +23,7 @@ gnulib_tool_option_extras="--without-tests --avoid=alignof-tests --avoid=lock-te
 use_libtool=1
 checkout_only_file=
 local_gl_dir=gl/override/
-required_submodules="tests/suite/tls-fuzzer/python-ecdsa tests/suite/tls-fuzzer/tlsfuzzer tests/suite/tls-fuzzer/tlslite-ng devel/abi-dump devel/cligen devel/nettle devel/openssl devel/libtasn1"
+required_submodules="tests/suite/tls-fuzzer/python-ecdsa tests/suite/tls-fuzzer/tlsfuzzer tests/suite/tls-fuzzer/tlslite-ng cligen devel/abi-dump devel/nettle devel/openssl devel/libtasn1"
 
 # Those modules are common to lib/ and src/.
 common_modules="
@@ -95,8 +95,3 @@ EOF
   devel/import-from-nettle.sh
   devel/import-minitasn1.sh
 }
-
-bootstrap_epilogue ()
-{
-  make -C devel/cligen install DESTDIR=$PWD/python INSTALL=$PWD/build-aux/install-sh || return 1
-}
diff --git a/cligen b/cligen
new file mode 160000
+Subproject 2e0eaec5a719c14cf9935c4038ef7b0bcfde717
diff --git a/configure.ac b/configure.ac
index 9152173573..f4f2a59d9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1366,7 +1366,6 @@ AC_CONFIG_FILES([
   tests/slow/Makefile
   tests/suite/Makefile
   fuzz/Makefile
-  python/Makefile
 ])
 
 AC_OUTPUT
diff --git a/devel/cligen b/devel/cligen
deleted file mode 160000
-Subproject 47766b53d5d09266c105b0dd94e2b87d9d7022e
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a7a54df465..59472b1a3f 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -52,8 +52,8 @@ INVOKE_GNUTLS_CLI_TEXI_DEPS = gnutls-cli-see-also.texi gnutls-cli-examples.texi
 EXTRA_DIST += $(INVOKE_GNUTLS_CLI_TEXI_DEPS)
 invoke-gnutls-cli.texi: $(INVOKE_GNUTLS_CLI_TEXI_DEPS)
 invoke-gnutls-cli.texi: $(top_srcdir)/src/gnutls-cli-options.json
-	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/python' \
-		$(PYTHON) $(top_srcdir)/python/cli-docgen.py \
+	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/cligen' \
+		$(PYTHON) $(top_srcdir)/cligen/cli-docgen.py \
 		--format texi $(CLIGEN_ARGS) \
 		--include see-also=$(srcdir)/gnutls-cli-see-also.texi \
 		--include examples=$(srcdir)/gnutls-cli-examples.texi \
@@ -63,8 +63,8 @@ INVOKE_GNUTLS_CLI_DEBUG_TEXI_DEPS = gnutls-cli-debug-see-also.texi gnutls-cli-de
 EXTRA_DIST += $(INVOKE_GNUTLS_CLI_DEBUG_TEXI_DEPS)
 invoke-gnutls-cli-debug.texi: $(INVOKE_GNUTLS_CLI_DEBUG_TEXI_DEPS)
 invoke-gnutls-cli-debug.texi: $(top_srcdir)/src/gnutls-cli-debug-options.json
-	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/python' \
-		$(PYTHON) $(top_srcdir)/python/cli-docgen.py \
+	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/cligen' \
+		$(PYTHON) $(top_srcdir)/cligen/cli-docgen.py \
 		--format texi $(CLIGEN_ARGS) \
 		--include see-also=$(srcdir)/gnutls-cli-debug-see-also.texi \
 		--include examples=$(srcdir)/gnutls-cli-debug-examples.texi \
@@ -74,8 +74,8 @@ INVOKE_GNUTLS_SERV_TEXI_DEPS = gnutls-serv-see-also.texi gnutls-serv-examples.te
 EXTRA_DIST += $(INVOKE_GNUTLS_SERV_TEXI_DEPS)
 invoke-gnutls-serv.texi: $(INVOKE_GNUTLS_SERV_TEXI_DEPS)
 invoke-gnutls-serv.texi: $(top_srcdir)/src/gnutls-serv-options.json
-	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/python' \
-		$(PYTHON) $(top_srcdir)/python/cli-docgen.py \
+	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/cligen' \
+		$(PYTHON) $(top_srcdir)/cligen/cli-docgen.py \
 		--format texi $(CLIGEN_ARGS) \
 		--include see-also=$(srcdir)/gnutls-serv-see-also.texi \
 		--include examples=$(srcdir)/gnutls-serv-examples.texi \
@@ -85,8 +85,8 @@ INVOKE_CERTTOOL_TEXI_DEPS = certtool-see-also.texi certtool-examples.texi certto
 EXTRA_DIST += $(INVOKE_CERTTOOL_TEXI_DEPS)
 invoke-certtool.texi: $(INVOKE_CERTTOOL_TEXI_DEPS)
 invoke-certtool.texi: $(top_srcdir)/src/certtool-options.json
-	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/python' \
-		$(PYTHON) $(top_srcdir)/python/cli-docgen.py \
+	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/cligen' \
+		$(PYTHON) $(top_srcdir)/cligen/cli-docgen.py \
 		--format texi $(CLIGEN_ARGS) \
 		--include see-also=$(srcdir)/certtool-see-also.texi \
 		--include examples=$(srcdir)/certtool-examples.texi \
@@ -99,8 +99,8 @@ INVOKE_OCSPTOOL_TEXI_DEPS = ocsptool-see-also.texi ocsptool-examples.texi ocspto
 EXTRA_DIST += $(INVOKE_OCSPTOOL_TEXI_DEPS)
 invoke-ocsptool.texi: $(INVOKE_OCSPTOOL_TEXI_DEPS)
 invoke-ocsptool.texi: $(top_srcdir)/src/ocsptool-options.json
-	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/python' \
-		$(PYTHON) $(top_srcdir)/python/cli-docgen.py \
+	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/cligen' \
+		$(PYTHON) $(top_srcdir)/cligen/cli-docgen.py \
 		--format texi $(CLIGEN_ARGS) \
 		--include see-also=$(srcdir)/ocsptool-see-also.texi \
 		--include examples=$(srcdir)/ocsptool-examples.texi \
@@ -113,8 +113,8 @@ INVOKE_DANETOOL_TEXI_DEPS = danetool-see-also.texi danetool-examples.texi
 EXTRA_DIST += $(INVOKE_DANETOOL_TEXI_DEPS)
 invoke-danetool.texi: $(INVOKE_DANETOOL_TEXI_DEPS)
 invoke-danetool.texi: $(top_srcdir)/src/danetool-options.json
-	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/python' \
-		$(PYTHON) $(top_srcdir)/python/cli-docgen.py \
+	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/cligen' \
+		$(PYTHON) $(top_srcdir)/cligen/cli-docgen.py \
 		--format texi $(CLIGEN_ARGS) \
 		--include see-also=$(srcdir)/danetool-see-also.texi \
 		--include examples=$(srcdir)/danetool-examples.texi \
@@ -126,8 +126,8 @@ INVOKE_SRPTOOL_TEXI_DEPS = srptool-see-also.texi srptool-examples.texi
 EXTRA_DIST += $(INVOKE_SRPTOOL_TEXI_DEPS)
 invoke-srptool.texi: $(INVOKE_SRPTOOL_TEXI_DEPS)
 invoke-srptool.texi: $(top_srcdir)/src/srptool-options.json
-	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/python' \
-		$(PYTHON) $(top_srcdir)/python/cli-docgen.py \
+	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/cligen' \
+		$(PYTHON) $(top_srcdir)/cligen/cli-docgen.py \
 		--format texi $(CLIGEN_ARGS) \
 		--include see-also=$(srcdir)/srptool-see-also.texi \
 		--include examples=$(srcdir)/srptool-examples.texi \
@@ -139,8 +139,8 @@ INVOKE_PSKTOOL_TEXI_DEPS = psktool-see-also.texi psktool-examples.texi
 EXTRA_DIST += $(INVOKE_PSKTOOL_TEXI_DEPS)
 invoke-psktool.texi: $(INVOKE_PSKTOOL_TEXI_DEPS)
 invoke-psktool.texi: $(top_srcdir)/src/psktool-options.json
-	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/python' \
-		$(PYTHON) $(top_srcdir)/python/cli-docgen.py \
+	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/cligen' \
+		$(PYTHON) $(top_srcdir)/cligen/cli-docgen.py \
 		--format texi $(CLIGEN_ARGS) \
 		--include see-also=$(srcdir)/psktool-see-also.texi \
 		--include examples=$(srcdir)/psktool-examples.texi \
@@ -152,8 +152,8 @@ INVOKE_P11TOOL_TEXI_DEPS = p11tool-see-also.texi p11tool-examples.texi
 EXTRA_DIST += $(INVOKE_P11TOOL_TEXI_DEPS)
 invoke-p11tool.texi: $(INVOKE_P11TOOL_TEXI_DEPS)
 invoke-p11tool.texi: $(top_srcdir)/src/p11tool-options.json
-	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/python' \
-		$(PYTHON) $(top_srcdir)/python/cli-docgen.py \
+	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/cligen' \
+		$(PYTHON) $(top_srcdir)/cligen/cli-docgen.py \
 		--format texi $(CLIGEN_ARGS) \
 		--include see-also=$(srcdir)/p11tool-see-also.texi \
 		--include examples=$(srcdir)/p11tool-examples.texi \
@@ -165,8 +165,8 @@ INVOKE_TPMTOOL_TEXI_DEPS = tpmtool-see-also.texi tpmtool-examples.texi
 EXTRA_DIST += $(INVOKE_TPMTOOL_TEXI_DEPS)
 invoke-tpmtool.texi: $(INVOKE_TPMTOOL_TEXI_DEPS)
 invoke-tpmtool.texi: $(top_srcdir)/src/tpmtool-options.json
-	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/python' \
-		$(PYTHON) $(top_srcdir)/python/cli-docgen.py \
+	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/cligen' \
+		$(PYTHON) $(top_srcdir)/cligen/cli-docgen.py \
 		--format texi $(CLIGEN_ARGS) \
 		--include see-also=$(srcdir)/tpmtool-see-also.texi \
 		--include examples=$(srcdir)/tpmtool-examples.texi \
@@ -190,7 +190,7 @@ AUTOGENED_DOC = invoke-gnutls-cli.texi invoke-gnutls-cli-debug.texi \
 	invoke-ocsptool.texi invoke-psktool.texi invoke-p11tool.texi \
 	invoke-tpmtool.texi invoke-danetool.texi
 
-$(AUTOGENED_DOC): $(top_srcdir)/python/cli-docgen.py
+$(AUTOGENED_DOC): $(top_srcdir)/cligen/cli-docgen.py
 
 gnutls_TEXINFOS += stamp_functions
 
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index b4c5654a06..f6ab114fdc 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -43,7 +43,7 @@ endif
 EXTRA_DIST += $(TOOLS_MANS) $(SRP_MANS) $(DANE_MANS)
 MAINTAINERCLEANFILES += $(TOOLS_MANS) $(SRP_MANS) $(DANE_MANS)
 
-$(man_MANS): $(top_srcdir)/python/cli-docgen.py
+$(man_MANS): $(top_srcdir)/cligen/cli-docgen.py
 
 CLIGEN_ARGS = \
 	--license=gpl3+ \
@@ -56,8 +56,8 @@ CLIGEN_ARGS = \
 
 certtool.1: $(top_srcdir)/doc/certtool-see-also.texi $(top_srcdir)/doc/certtool-examples.texi $(top_srcdir)/doc/certtool-files.texi
 certtool.1: $(top_srcdir)/src/certtool-options.json
-	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/python' \
-		$(PYTHON) $(top_srcdir)/python/cli-docgen.py \
+	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/cligen' \
+		$(PYTHON) $(top_srcdir)/cligen/cli-docgen.py \
 		--format man $(CLIGEN_ARGS) \
 		--include see-also=$(top_srcdir)/doc/certtool-see-also.texi \
 		--include examples=$(top_srcdir)/doc/certtool-examples.texi \
@@ -66,8 +66,8 @@ certtool.1: $(top_srcdir)/src/certtool-options.json
 
 ocsptool.1: $(top_srcdir)/doc/ocsptool-see-also.texi $(top_srcdir)/doc/ocsptool-examples.texi $(top_srcdir)/doc/ocsptool-description.texi
 ocsptool.1: $(top_srcdir)/src/ocsptool-options.json
-	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/python' \
-		$(PYTHON) $(top_srcdir)/python/cli-docgen.py \
+	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/cligen' \
+		$(PYTHON) $(top_srcdir)/cligen/cli-docgen.py \
 		--format man $(CLIGEN_ARGS) \
 		--include see-also=$(top_srcdir)/doc/ocsptool-see-also.texi \
 		--include examples=$(top_srcdir)/doc/ocsptool-examples.texi \
@@ -76,8 +76,8 @@ ocsptool.1: $(top_srcdir)/src/ocsptool-options.json
 
 danetool.1: $(top_srcdir)/doc/danetool-see-also.texi $(top_srcdir)/doc/danetool-examples.texi
 danetool.1: $(top_srcdir)/src/danetool-options.json
-	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/python' \
-		$(PYTHON) $(top_srcdir)/python/cli-docgen.py \
+	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/cligen' \
+		$(PYTHON) $(top_srcdir)/cligen/cli-docgen.py \
 		--format man $(CLIGEN_ARGS) \
 		--include see-also=$(top_srcdir)/doc/danetool-see-also.texi \
 		--include examples=$(top_srcdir)/doc/danetool-examples.texi \
@@ -85,8 +85,8 @@ danetool.1: $(top_srcdir)/src/danetool-options.json
 
 gnutls-cli.1: $(top_srcdir)/doc/gnutls-cli-see-also.texi $(top_srcdir)/doc/gnutls-cli-examples.texi
 gnutls-cli.1: $(top_srcdir)/src/gnutls-cli-options.json
-	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/python' \
-		$(PYTHON) $(top_srcdir)/python/cli-docgen.py \
+	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/cligen' \
+		$(PYTHON) $(top_srcdir)/cligen/cli-docgen.py \
 		--format man $(CLIGEN_ARGS) \
 		--include see-also=$(top_srcdir)/doc/gnutls-cli-see-also.texi \
 		--include examples=$(top_srcdir)/doc/gnutls-cli-examples.texi \
@@ -94,8 +94,8 @@ gnutls-cli.1: $(top_srcdir)/src/gnutls-cli-options.json
 
 gnutls-serv.1: $(top_srcdir)/doc/gnutls-serv-see-also.texi $(top_srcdir)/doc/gnutls-serv-examples.texi
 gnutls-serv.1: $(top_srcdir)/src/gnutls-serv-options.json
-	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/python' \
-		$(PYTHON) $(top_srcdir)/python/cli-docgen.py \
+	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/cligen' \
+		$(PYTHON) $(top_srcdir)/cligen/cli-docgen.py \
 		--format man $(CLIGEN_ARGS) \
 		--include see-also=$(top_srcdir)/doc/gnutls-serv-see-also.texi \
 		--include examples=$(top_srcdir)/doc/gnutls-serv-examples.texi \
@@ -103,8 +103,8 @@ gnutls-serv.1: $(top_srcdir)/src/gnutls-serv-options.json
 
 gnutls-cli-debug.1: $(top_srcdir)/doc/gnutls-cli-debug-see-also.texi $(top_srcdir)/doc/gnutls-cli-debug-examples.texi
 gnutls-cli-debug.1: $(top_srcdir)/src/gnutls-cli-debug-options.json
-	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/python' \
-		$(PYTHON) $(top_srcdir)/python/cli-docgen.py \
+	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/cligen' \
+		$(PYTHON) $(top_srcdir)/cligen/cli-docgen.py \
 		--format man $(CLIGEN_ARGS) \
 		--include see-also=$(top_srcdir)/doc/gnutls-cli-debug-see-also.texi \
 		--include examples=$(top_srcdir)/doc/gnutls-cli-debug-examples.texi \
@@ -112,8 +112,8 @@ gnutls-cli-debug.1: $(top_srcdir)/src/gnutls-cli-debug-options.json
 
 srptool.1: $(top_srcdir)/doc/srptool-see-also.texi $(top_srcdir)/doc/srptool-examples.texi
 srptool.1: $(top_srcdir)/src/srptool-options.json
-	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/python' \
-		$(PYTHON) $(top_srcdir)/python/cli-docgen.py \
+	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/cligen' \
+		$(PYTHON) $(top_srcdir)/cligen/cli-docgen.py \
 		--format man $(CLIGEN_ARGS) \
 		--include see-also=$(top_srcdir)/doc/srptool-see-also.texi \
 		--include examples=$(top_srcdir)/doc/srptool-examples.texi \
@@ -121,8 +121,8 @@ srptool.1: $(top_srcdir)/src/srptool-options.json
 
 p11tool.1: $(top_srcdir)/doc/p11tool-see-also.texi $(top_srcdir)/doc/p11tool-examples.texi
 p11tool.1: $(top_srcdir)/src/p11tool-options.json
-	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/python' \
-		$(PYTHON) $(top_srcdir)/python/cli-docgen.py \
+	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/cligen' \
+		$(PYTHON) $(top_srcdir)/cligen/cli-docgen.py \
 		--format man $(CLIGEN_ARGS) \
 		--include see-also=$(top_srcdir)/doc/p11tool-see-also.texi \
 		--include examples=$(top_srcdir)/doc/p11tool-examples.texi \
@@ -130,8 +130,8 @@ p11tool.1: $(top_srcdir)/src/p11tool-options.json
 
 tpmtool.1: $(top_srcdir)/doc/tpmtool-see-also.texi $(top_srcdir)/doc/tpmtool-examples.texi
 tpmtool.1: $(top_srcdir)/src/tpmtool-options.json
-	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/python' \
-		$(PYTHON) $(top_srcdir)/python/cli-docgen.py \
+	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/cligen' \
+		$(PYTHON) $(top_srcdir)/cligen/cli-docgen.py \
 		--format man $(CLIGEN_ARGS) \
 		--include see-also=$(top_srcdir)/doc/tpmtool-see-also.texi \
 		--include examples=$(top_srcdir)/doc/tpmtool-examples.texi \
@@ -139,8 +139,8 @@ tpmtool.1: $(top_srcdir)/src/tpmtool-options.json
 
 psktool.1: $(top_srcdir)/doc/psktool-see-also.texi $(top_srcdir)/doc/psktool-examples.texi
 psktool.1: $(top_srcdir)/src/psktool-options.json
-	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/python' \
-		$(PYTHON) $(top_srcdir)/python/cli-docgen.py \
+	$(AM_V_GEN) PYTHONPATH='$(top_srcdir)/cligen' \
+		$(PYTHON) $(top_srcdir)/cligen/cli-docgen.py \
 		--format man $(CLIGEN_ARGS) \
 		--include see-also=$(top_srcdir)/doc/psktool-see-also.texi \
 		--include examples=$(top_srcdir)/doc/psktool-examples.texi \
diff --git a/python/Makefile.am b/python/Makefile.am
deleted file mode 100644
index 4d210feb47..0000000000
--- a/python/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = cligen cli-codegen.py cli-docgen.py
diff --git a/src/Makefile.am b/src/Makefile.am
index 628e45a92a..3080f90cd6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -236,7 +236,7 @@ dumpcfg_LDADD = ../gl/libgnu.la gl/libgnu_gpl.la
 
 SUFFIXES = .stamp .json
 
-OPTIONS_STAMP: $(top_srcdir)/python/cli-codegen.py
+OPTIONS_STAMP: $(top_srcdir)/cligen/cli-codegen.py
 
 CLIGEN_ARGS = \
 	--bug-email bugs@gnutls.org \
@@ -249,8 +249,8 @@ CLIGEN_ARGS = \
 .json.stamp:
 	$(AM_V_GEN) { \
 		b=`echo $@ | sed 's/.stamp$$//'`; \
-		PYTHONPATH='$(top_srcdir)/python' \
-		$(PYTHON) $(top_srcdir)/python/cli-codegen.py $(CLIGEN_ARGS) \
+		PYTHONPATH='$(top_srcdir)/cligen' \
+		$(PYTHON) $(top_srcdir)/cligen/cli-codegen.py $(CLIGEN_ARGS) \
 			$< $${b}.c $${b}.h; \
 		echo "#define optionProcess(a,b,c) process_options(b,c)" >> $${b}.h; \
 		echo "#define STACKCT_OPT OPTS_COUNT" >> $${b}.h; \