diff options
| author | Tim Rühsen <tim.ruehsen@gmx.de> | 2018-11-15 10:44:20 +0100 |
|---|---|---|
| committer | Daiki Ueno <dueno@redhat.com> | 2018-12-12 18:20:30 +0100 |
| commit | 9ba397aa841730e4824d2bf8537aa15e711ad9b3 (patch) | |
| tree | a311e4dc40b73c15dd5a205ab8efdd0882ade72e /src | |
| parent | 92a2f3d439fcdbee304937328758a55971fd67b4 (diff) | |
| download | gnutls-9ba397aa841730e4824d2bf8537aa15e711ad9b3.tar.gz | |
build: remove src/*.bak from distribution
Instead, include the autogen-generated *.c, *.h and the stamp files in
the distribution.
To prevent the bundled files being linked with incompatible autogen
libopts, this adds an extra check in configure. If the detected
system libopts version is too old, it will use the included libopts
implementation.
Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
Signed-off-by: Daiki Ueno <dueno@redhat.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 43 |
1 files changed, 12 insertions, 31 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 9d0af9aae2..329cfdfd0f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,19 +33,6 @@ ARGS_BUILT = \ 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 \ @@ -53,11 +40,11 @@ ARGS_STAMPS = \ BUILT_SOURCES = $(ARGS_BUILT) mech-list.h -DISTCLEANFILES = $(BUILT_SOURCES) $(ARGS_STAMPS) +DISTCLEANFILES = mech-list.h -EXTRA_DIST = gen-mech-list.sh $(ARGS_BAK) +EXTRA_DIST = gen-mech-list.sh args-std.def.in args-std.def $(ARGS_BUILT) $(ARGS_STAMPS) -MAINTAINERCLEANFILES = $(ARGS_BAK) +MAINTAINERCLEANFILES = args-std.def $(ARGS_BUILT) $(ARGS_STAMPS) AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) AM_CPPFLAGS = \ @@ -264,23 +251,17 @@ nodist_libcmd_systemkey_la_SOURCES = systemkey-args.c systemkey-args.h libcmd_systemkey_la_LIBADD = ../lib/libgnutls.la gl/libgnu_gpl.la ../gl/libgnu.la libcmd_systemkey_la_LIBADD += $(LTLIBREADLINE) $(INET_PTON_LIB) $(LIB_CLOCK_GETTIME) -SUFFIXES = .stamp .def .c.bak .h.bak +args-std.def: args-std.def.in + $(AM_V_GEN) sed \ + -e 's|@VERSION[@]|$(VERSION)|g' \ + -e 's|@YEAR[@]|$(YEAR)|g' \ + -e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \ + $< > $@.tmp && mv $@.tmp $@ + +SUFFIXES = .stamp .def .def.stamp: - $(AM_V_GEN) $(AUTOGEN) $< || { \ - srcdir=''; \ - b=`echo $@ | sed 's/.stamp$$//'`; \ - test -f ./$${b}.def || srcdir=$(srcdir)/; \ - cp -p $${srcdir}$${b}.c.bak $${b}.c; \ - cp -p $${srcdir}$${b}.h.bak $${b}.h; \ - } && \ - touch $@ - -.c.c.bak: - $(AM_V_GEN) cp -p $< $@ - -.h.h.bak: - $(AM_V_GEN) cp -p $< $@ + $(AM_V_GEN) $(AUTOGEN) $< && touch $@ danetool-args.h: danetool-args.stamp danetool-args.c: danetool-args.stamp |