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 | |
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>
-rw-r--r-- | cfg.mk | 2 | ||||
-rw-r--r-- | configure.ac | 9 | ||||
-rw-r--r-- | src/Makefile.am | 43 |
3 files changed, 18 insertions, 36 deletions
@@ -41,7 +41,7 @@ local-checks-to-skip = sc_GPL_version sc_bindtextdomain \ sc_unmarked_diagnostics sc_useless_cpp_parens \ sc_two_space_separator_in_usage -VC_LIST_ALWAYS_EXCLUDE_REGEX = ^maint.mk|gtk-doc.make|m4/pkg|doc/fdl-1.3.texi|src/.*\.bak|src/crywrap/|(devel/perlasm/|lib/accelerated/x86/|build-aux/|gl/|src/libopts/|tests/suite/ecore/|doc/protocol/).*$$ +VC_LIST_ALWAYS_EXCLUDE_REGEX = ^maint.mk|gtk-doc.make|m4/pkg|doc/fdl-1.3.texi|src/crywrap/|(devel/perlasm/|lib/accelerated/x86/|build-aux/|gl/|src/libopts/|tests/suite/ecore/|doc/protocol/).*$$ update-copyright-env = UPDATE_COPYRIGHT_USE_INTERVALS=1 # Explicit syntax-check exceptions. diff --git a/configure.ac b/configure.ac index 0926ed1094..44f6f7c20d 100644 --- a/configure.ac +++ b/configure.ac @@ -724,9 +724,11 @@ AM_MISSING_PROG([AUTOGEN], [autogen]) included_libopts=no if test "$enable_tools" != "no" || test "$enable_doc" != "no"; then - AC_CHECK_PROGS([autogen], [autogen]) - - if test -z "$autogen"; then + AC_MSG_CHECKING([whether autogen is recent enough]) + if $PKG_CONFIG --atleast-version=41.1.16 autoopts 2>&1 >/dev/null; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) AC_MSG_WARN([[ *** *** autogen not found. Will not link against system libopts. @@ -998,7 +1000,6 @@ 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 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 |