mirror of https://gitee.com/openkylin/libvirt.git
build: merge all syntax-check logic into one file
The gnulib syntax-check rules are spread across GNUmakefile, cfg.mk and maint.mk. This made sense when we were getting two of the files from the gnulib submodule. Now that we own all files though, we can at least merge maint.mk and cfg.mk together. GNUmakefile can be eliminated when we switch to meson. Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
parent
1b4217b995
commit
22d8e27ccd
|
@ -35,8 +35,7 @@ export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner
|
||||||
ALL_RECURSIVE_TARGETS =
|
ALL_RECURSIVE_TARGETS =
|
||||||
|
|
||||||
include Makefile
|
include Makefile
|
||||||
include $(srcdir)/$(_build-aux)/cfg.mk
|
include $(srcdir)/$(_build-aux)/syntax-check.mk
|
||||||
include $(srcdir)/$(_build-aux)/maint.mk
|
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
|
@ -44,8 +43,7 @@ else
|
||||||
srcdir = .
|
srcdir = .
|
||||||
|
|
||||||
# The package can override .DEFAULT_GOAL to run actions like autoreconf.
|
# The package can override .DEFAULT_GOAL to run actions like autoreconf.
|
||||||
include $(srcdir)/$(_build-aux)/cfg.mk
|
include $(srcdir)/$(_build-aux)/syntax-check.mk
|
||||||
include $(srcdir)/$(_build-aux)/maint.mk
|
|
||||||
|
|
||||||
ifeq ($(.DEFAULT_GOAL),abort-due-to-no-makefile)
|
ifeq ($(.DEFAULT_GOAL),abort-due-to-no-makefile)
|
||||||
$(MAKECMDGOALS): abort-due-to-no-makefile
|
$(MAKECMDGOALS): abort-due-to-no-makefile
|
||||||
|
|
|
@ -46,13 +46,12 @@ EXTRA_DIST = \
|
||||||
README.md \
|
README.md \
|
||||||
AUTHORS.in \
|
AUTHORS.in \
|
||||||
build-aux/augeas-gentest.pl \
|
build-aux/augeas-gentest.pl \
|
||||||
build-aux/cfg.mk \
|
|
||||||
build-aux/check-spacing.pl \
|
build-aux/check-spacing.pl \
|
||||||
build-aux/header-ifdef.pl \
|
build-aux/header-ifdef.pl \
|
||||||
build-aux/maint.mk \
|
|
||||||
build-aux/minimize-po.pl \
|
build-aux/minimize-po.pl \
|
||||||
build-aux/mock-noinline.pl \
|
build-aux/mock-noinline.pl \
|
||||||
build-aux/prohibit-duplicate-header.pl \
|
build-aux/prohibit-duplicate-header.pl \
|
||||||
|
build-aux/syntax-check.mk \
|
||||||
build-aux/useless-if-before-free \
|
build-aux/useless-if-before-free \
|
||||||
build-aux/vc-list-files \
|
build-aux/vc-list-files \
|
||||||
ci/Makefile \
|
ci/Makefile \
|
||||||
|
|
1036
build-aux/maint.mk
1036
build-aux/maint.mk
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue