summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKevin Cernekee <cernekee@gmail.com>2014-03-06 22:35:08 -0800
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2014-03-07 08:13:32 +0100
commit0725ad38511343a91e506b53cd931f630bd259a8 (patch)
tree23ab923f8e70a34545f5ca3c585097fac7ba403e /src
parentfdd10532c0b81f54c5c09d52aa7867cf490e9f0a (diff)
downloadgnutls-0725ad38511343a91e506b53cd931f630bd259a8.tar.gz
Rename psk-args.def to psktool-args.def
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@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am4
-rw-r--r--src/psk.c2
-rw-r--r--src/psktool-args.def (renamed from src/psk-args.def)0
3 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index a768f5778e..1082bdba3e 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 7bf7ae7524..e7dba82040 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
index 819acdb327..819acdb327 100644
--- a/src/psk-args.def
+++ b/src/psktool-args.def