diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2018-11-06 14:42:56 +0300 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2018-11-10 00:24:31 +0300 |
| commit | 2066ac17615d1c9eeaf6413ed08ad98997f975c7 (patch) | |
| tree | f7d16e59608200f64b07047162691762258a9be0 | |
| parent | db18d40f1fefca9becdab70f85c6332ae85e44a7 (diff) | |
| download | gnutls-2066ac17615d1c9eeaf6413ed08ad98997f975c7.tar.gz | |
src: include .bak files in EXTRA_DIST
Including .bak files in EXTRA_DIST allows us to stop hand-generating
these files in distribution. Instead they are directly copied from the
source tree.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | src/Makefile.am | 36 |
2 files changed, 29 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index c0b44a1bc6..828a2b4e8f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -166,15 +166,9 @@ dist-hook: libopts-check symbol-check $(MAKE) -C doc/ compare-makefile $(MAKE) -C doc/ compare-exported $(MAKE) -C doc/manpages compare-makefile + $(MAKE) -C src/ files-update $(MAKE) ChangeLog mv ChangeLog $(distdir) - cd $(distdir)/src/ && for i in *.def;do \ - if test x"$$i" = x"args-std.def";then continue; fi; \ - autogen $$i; \ - done - cd $(distdir)/src/ && for i in *-args.c *-args.h;do \ - mv $$i $$i.bak; \ - done touch $(distdir)/doc/*.html $(distdir)/doc/*.pdf $(distdir)/doc/*.info .PHONY: abi-check abi-dump pic-check symbol-check local-code-coverage-output files-update libopts-check diff --git a/src/Makefile.am b/src/Makefile.am index be313f47ea..8d5804ccaf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,22 +20,42 @@ # src/gl is being added by the top level makefile SUBDIRS = -BUILT_SOURCES = srptool-args.c srptool-args.h \ - 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 \ - tpmtool-args.c tpmtool-args.h systemkey-args.c systemkey-args.h \ - mech-list.h +ARGS_BUILT = \ + srptool-args.c srptool-args.h \ + 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 \ + tpmtool-args.c tpmtool-args.h \ + systemkey-args.c systemkey-args.h + +ARGS_BAK = \ + srptool-args.c.bak srptool-args.h.bak \ + psktool-args.c.bak psktool-args.h.bak \ + ocsptool-args.h.bak ocsptool-args.c.bak \ + serv-args.c.bak serv-args.h.bak \ + cli-args.c.bak cli-args.h.bak \ + cli-debug-args.c.bak cli-debug-args.h.bak \ + certtool-args.c.bak certtool-args.h.bak \ + danetool-args.c.bak danetool-args.h.bak \ + p11tool-args.c.bak p11tool-args.h.bak \ + tpmtool-args.c.bak tpmtool-args.h.bak \ + systemkey-args.c.bak systemkey-args.h.bak ARGS_STAMPS = \ certtool-args.stamp cli-debug-args.stamp cli-args.stamp tpmtool-args.stamp \ systemkey-args.stamp srptool-args.stamp ocsptool-args.stamp p11tool-args.stamp \ danetool-args.stamp serv-args.stamp psktool-args.stamp +BUILT_SOURCES = $(ARGS_BUILT) mech-list.h + DISTCLEANFILES = $(BUILT_SOURCES) $(ARGS_STAMPS) -EXTRA_DIST = gen-mech-list.sh args-bak-upd.sh +EXTRA_DIST = gen-mech-list.sh args-bak-upd.sh $(ARGS_BAK) AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) AM_CPPFLAGS = \ |