[gnutls-devel] [PATCH 4/5] Rename psk-args.def to psktool-args.def

[Kevin Cernekee]

Other utilities generate invoke-%.texi from %-args.def, but currently
invoke-psktool.texi is generated from psk-args.def.  If we make psktool
conform to the same convention as the other utilities, we can use a
generic pattern to handle all of them the same way.

Signed-off-by: Kevin Cernekee <cernekee at gmail.com>
---
 .gitignore                             | 4 ++--
 doc/manpages/Makefile.am               | 2 +-
 src/Makefile.am                        | 4 ++--
 src/psk.c                              | 2 +-
 src/{psk-args.def => psktool-args.def} | 0
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename src/{psk-args.def => psktool-args.def} (100%)

diff --git a/.gitignore b/.gitignore
index 31bc5f6..6b50937 100644
--- a/.gitignore
+++ b/.gitignore
@@ -662,8 +662,8 @@ src/ocsptool-args.c
 src/ocsptool-args.h
 src/p11tool-args.c
 src/p11tool-args.h
-src/psk-args.c
-src/psk-args.h
+src/psktool-args.c
+src/psktool-args.h
 src/serv-args.c
 src/serv-args.h
 src/srptool-args.c
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index 31d0d56..dfdf9ab 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -84,7 +84,7 @@ tpmtool.1: ../../src/tpmtool-args.def
 	autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \
 	rm -f "$<".tmp
 
-psktool.1: ../../src/psk-args.def
+psktool.1: ../../src/psktool-args.def
 	-sed 's/@subheading \(.*\)/@*\n at var{\1}\n@*/' $< > "$<".tmp && \
 	autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \
 	rm -f "$<".tmp
diff --git a/src/Makefile.am b/src/Makefile.am
index a14c021..fcb8e84 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,7 +20,7 @@
 SUBDIRS = gl
 
 BUILT_SOURCES = srptool-args.c srptool-args.h \
-	psk-args.c psk-args.h ocsptool-args.h ocsptool-args.c \
+	psktool-args.c psktool-args.h ocsptool-args.h ocsptool-args.c \
 	serv-args.c serv-args.h cli-args.c cli-args.h \
 	cli-debug-args.c cli-debug-args.h certtool-args.c certtool-args.h \
 	danetool-args.c danetool-args.h p11tool-args.c p11tool-args.h \
@@ -90,7 +90,7 @@ psktool_LDADD = ../lib/libgnutls.la libcmd-psk.la $(LIBOPTS) ../gl/libgnu.la
 psktool_LDADD += $(LTLIBINTL) gl/libgnu_gpl.la
 noinst_LTLIBRARIES += libcmd-psk.la
 libcmd_psk_la_CFLAGS = 
-libcmd_psk_la_SOURCES = psk-args.def psk-args.c psk-args.h
+libcmd_psk_la_SOURCES = psktool-args.def psktool-args.c psktool-args.h
 
 
 if ENABLE_OCSP
diff --git a/src/psk.c b/src/psk.c
index 7bf7ae7..e7dba82 100644
--- a/src/psk.c
+++ b/src/psk.c
@@ -38,7 +38,7 @@ int main(int argc, char **argv)
 #include <string.h>
 #include <stdlib.h>
 #include <gnutls/gnutls.h>
-#include <psk-args.h>
+#include <psktool-args.h>
 
 #include <gnutls/crypto.h>	/* for random */
 
diff --git a/src/psk-args.def b/src/psktool-args.def
similarity index 100%
rename from src/psk-args.def
rename to src/psktool-args.def
-- 
1.8.3.2