diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2018-11-04 14:29:11 +0300 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2018-11-10 00:24:30 +0300 |
| commit | 14eb2e28f83a78573225bd6910f4048e17090564 (patch) | |
| tree | 95ecf1872dcb7a9ce5e92207741966ef26991271 | |
| parent | 4151d1173f1937f64813222faca710410fe4ec14 (diff) | |
| download | gnutls-14eb2e28f83a78573225bd6910f4048e17090564.tar.gz | |
src: args-std.def: substitute variables using configure
Use standard way (configure script) to substiture variables in
args-std.def file, instead of manually replacing them in dist-hook.
Fixes #567
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 24 | ||||
| -rw-r--r-- | src/args-std.def.in (renamed from src/args-std.def) | 0 |
4 files changed, 13 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index f4f7e3b43f..0e51dcec6f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -168,9 +168,6 @@ dist-hook: libopts-check symbol-check $(MAKE) -C doc/manpages compare-makefile $(MAKE) ChangeLog mv ChangeLog $(distdir) - $(SED) 's/\@VERSION\@/$(VERSION)/g' -i $(distdir)/src/args-std.def - $(SED) 's/\@YEAR\@/$(YEAR)/g' -i $(distdir)/src/args-std.def - $(SED) 's/\@PACKAGE_BUGREPORT\@/$(PACKAGE_BUGREPORT)/g' -i $(distdir)/src/args-std.def cd $(distdir)/src/ && for i in *.def;do \ if test x"$$i" = x"args-std.def";then continue; fi; \ autogen $$i; \ diff --git a/configure.ac b/configure.ac index 3f87907516..0836c0bc39 100644 --- a/configure.ac +++ b/configure.ac @@ -997,6 +997,7 @@ AC_CONFIG_FILES([ lib/unistring/Makefile po/Makefile.in src/Makefile + src/args-std.def src/gl/Makefile tests/Makefile tests/windows/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 75fef1d556..7af738fe8e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,7 +33,7 @@ DISTCLEANFILES =$(BUILT_SOURCES) \ systemkey-args.stamp srptool-args.stamp ocsptool-args.stamp p11tool-args.stamp \ danetool-args.stamp serv-args.stamp psktool-args.stamp -EXTRA_DIST = args-std.def gen-mech-list.sh +EXTRA_DIST = gen-mech-list.sh AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) AM_CPPFLAGS = \ @@ -231,67 +231,67 @@ libcmd_systemkey_la_LIBADD += $(LTLIBREADLINE) $(INET_PTON_LIB) $(LIB_CLOCK_GETT danetool-args.h: danetool-args.stamp danetool-args.c: danetool-args.stamp -danetool-args.stamp: $(srcdir)/danetool-args.def $(srcdir)/args-std.def +danetool-args.stamp: $(srcdir)/danetool-args.def args-std.def -$(AUTOGEN) $< touch $@ ocsptool-args.h: ocsptool-args.stamp ocsptool-args.c: ocsptool-args.stamp -ocsptool-args.stamp: $(srcdir)/ocsptool-args.def $(srcdir)/args-std.def +ocsptool-args.stamp: $(srcdir)/ocsptool-args.def args-std.def -$(AUTOGEN) $< touch $@ tpmtool-args.h: tpmtool-args.stamp tpmtool-args.c: tpmtool-args.stamp -tpmtool-args.stamp: $(srcdir)/tpmtool-args.def $(srcdir)/args-std.def +tpmtool-args.stamp: $(srcdir)/tpmtool-args.def args-std.def -$(AUTOGEN) $< touch $@ p11tool-args.h: p11tool-args.stamp p11tool-args.c: p11tool-args.stamp -p11tool-args.stamp: $(srcdir)/p11tool-args.def $(srcdir)/args-std.def +p11tool-args.stamp: $(srcdir)/p11tool-args.def args-std.def -$(AUTOGEN) $< touch $@ psktool-args.h: psktool-args.stamp psktool-args.c: psktool-args.stamp -psktool-args.stamp: $(srcdir)/psktool-args.def $(srcdir)/args-std.def +psktool-args.stamp: $(srcdir)/psktool-args.def args-std.def -$(AUTOGEN) $< touch $@ cli-debug-args.h: cli-debug-args.stamp cli-debug-args.c: cli-debug-args.stamp -cli-debug-args.stamp: $(srcdir)/cli-debug-args.def $(srcdir)/args-std.def +cli-debug-args.stamp: $(srcdir)/cli-debug-args.def args-std.def -$(AUTOGEN) $< touch $@ cli-args.h: cli-args.stamp cli-args.c: cli-args.stamp -cli-args.stamp: $(srcdir)/cli-args.def $(srcdir)/args-std.def +cli-args.stamp: $(srcdir)/cli-args.def args-std.def -$(AUTOGEN) $< touch $@ serv-args.h: serv-args.stamp serv-args.c: serv-args.stamp -serv-args.stamp: $(srcdir)/serv-args.def $(srcdir)/args-std.def +serv-args.stamp: $(srcdir)/serv-args.def args-std.def -$(AUTOGEN) $< touch $@ srptool-args.h: srptool-args.stamp srptool-args.c: srptool-args.stamp -srptool-args.stamp: $(srcdir)/srptool-args.def $(srcdir)/args-std.def +srptool-args.stamp: $(srcdir)/srptool-args.def args-std.def -$(AUTOGEN) $< touch $@ certtool-args.h: certtool-args.stamp certtool-args.c: certtool-args.stamp -certtool-args.stamp: $(srcdir)/certtool-args.def $(srcdir)/args-std.def +certtool-args.stamp: $(srcdir)/certtool-args.def args-std.def -$(AUTOGEN) $< touch $@ systemkey-args.h: systemkey-args.stamp systemkey-args.c: systemkey-args.stamp -systemkey-args.stamp: $(srcdir)/systemkey-args.def $(srcdir)/args-std.def +systemkey-args.stamp: $(srcdir)/systemkey-args.def args-std.def -$(AUTOGEN) $< touch $@ diff --git a/src/args-std.def b/src/args-std.def.in index 93634a1857..93634a1857 100644 --- a/src/args-std.def +++ b/src/args-std.def.in |