c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-11-17 01:51:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

autoconf: use include directives instead of recursing down udev

Browse Source 
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13316
This commit is contained in:
наб 2022-04-09 20:05:18 +02:00 committed by Brian Behlendorf
parent 2820719800
commit 674a9f3727
4 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -24,7 +24,7 @@ include $(srcdir)/%D%/lib/Makefile.am
include $(srcdir)/%D%/man/Makefile.am include $(srcdir)/%D%/man/Makefile.am
include $(srcdir)/%D%/scripts/Makefile.am include $(srcdir)/%D%/scripts/Makefile.am
if BUILD_LINUX if BUILD_LINUX
SUBDIRS += udev include $(srcdir)/%D%/udev/Makefile.am
endif endif
endif endif
CPPCHECKDIRS += module CPPCHECKDIRS += module

2
configure.ac
View File

@ -290,8 +290,6 @@ AC_CONFIG_FILES([
tests/zfs-tests/tests/perf/regression/Makefile tests/zfs-tests/tests/perf/regression/Makefile
tests/zfs-tests/tests/perf/scripts/Makefile tests/zfs-tests/tests/perf/scripts/Makefile
tests/zfs-tests/tests/stress/Makefile tests/zfs-tests/tests/stress/Makefile
udev/Makefile
udev/rules.d/Makefile
zfs.release zfs.release
]) ])

7
udev/Makefile.am
View File

@ -1 +1,6 @@
SUBDIRS = rules.d udevrule_DATA = \
%D%/rules.d/69-vdev.rules \
%D%/rules.d/60-zvol.rules \
%D%/rules.d/90-zfs.rules
SUBSTFILES += $(udevrule_DATA)

10
udev/rules.d/Makefile.am
View File

@ -1,10 +0,0 @@
CLEANFILES =
EXTRA_DIST =
include $(top_srcdir)/config/Substfiles.am
udevrule_DATA = \
69-vdev.rules \
60-zvol.rules \
90-zfs.rules
SUBSTFILES += $(udevrule_DATA)