Fix tags targets in module/Makefile.in + cleanup
These targets look to have been copied from an automake-generated Makefile.in, and can't work since none of the auto-generated automake variables are defined here. Moreover, ctags has been overridden in the top-level Makefile, so the target is pointless anyway, and gtags is not a recursive target. Fix cscopelist by moving it to the top-level Makefile as well, in line with ctags and etags. Also, add -a to ctags command as well, otherwise it won't work if more than one xargs invocation takes place. Add assembler files to ctags/etags, prune all dotted-dirs, and restrict the find to files only. Cleanup: add .PHONY to module/Makefile.in, and fix one recipe with a missing continuation character. Reviewed-by: Ryan Moeller <ryan@iXsystems.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu> Closes #10493
This commit is contained in:
parent
2989d1012a
commit
0b03254830
10
Makefile.am
10
Makefile.am
|
@ -194,11 +194,17 @@ flake8:
|
||||||
|
|
||||||
ctags:
|
ctags:
|
||||||
$(RM) tags
|
$(RM) tags
|
||||||
find $(top_srcdir) -name .git -prune -o -name '*.[hc]' | xargs ctags
|
find $(top_srcdir) -name '.?*' -prune \
|
||||||
|
-o -type f -name '*.[hcS]' -print | xargs ctags -a
|
||||||
|
|
||||||
etags:
|
etags:
|
||||||
$(RM) TAGS
|
$(RM) TAGS
|
||||||
find $(top_srcdir) -name .pc -prune -o -name '*.[hc]' | xargs etags -a
|
find $(top_srcdir) -name '.?*' -prune \
|
||||||
|
-o -type f -name '*.[hcS]' -print | xargs etags -a
|
||||||
|
|
||||||
|
cscopelist:
|
||||||
|
find $(top_srcdir) -name '.?*' -prune \
|
||||||
|
-o -type f -name '*.[hc]' -print >cscope.files
|
||||||
|
|
||||||
tags: ctags etags
|
tags: ctags etags
|
||||||
|
|
||||||
|
|
|
@ -10,6 +10,12 @@ install: modules_install
|
||||||
uninstall: modules_uninstall
|
uninstall: modules_uninstall
|
||||||
check:
|
check:
|
||||||
|
|
||||||
|
.PHONY: all distclean maintainer-clean install uninstall check distdir \
|
||||||
|
modules modules-Linux modules-FreeBSD modules-unknown \
|
||||||
|
clean clean-Linux clean-FreeBSD \
|
||||||
|
modules_install modules_install-Linux modules_install-FreeBSD \
|
||||||
|
modules_uninstall modules_uninstall-Linux modules_uninstall-FreeBSD
|
||||||
|
|
||||||
# Filter out options that FreeBSD make doesn't understand
|
# Filter out options that FreeBSD make doesn't understand
|
||||||
getflags = ( \
|
getflags = ( \
|
||||||
set -- \
|
set -- \
|
||||||
|
@ -82,33 +88,6 @@ modules_install-Linux:
|
||||||
depmod -ae -F $$sysmap @LINUX_VERSION@; \
|
depmod -ae -F $$sysmap @LINUX_VERSION@; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
CTAGS: ctags
|
|
||||||
ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
|
|
||||||
$(am__define_uniq_tagged_files); \
|
|
||||||
test -z "$(CTAGS_ARGS)$$unique" \
|
|
||||||
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|
||||||
$$unique
|
|
||||||
|
|
||||||
GTAGS:
|
|
||||||
here=`$(am__cd) $(top_builddir) && pwd` \
|
|
||||||
&& $(am__cd) $(top_srcdir) \
|
|
||||||
&& gtags -i $(GTAGS_ARGS) "$$here"
|
|
||||||
cscopelist: cscopelist-recursive
|
|
||||||
|
|
||||||
cscopelist-am: $(am__tagged_files)
|
|
||||||
list='$(am__tagged_files)'; \
|
|
||||||
case "$(srcdir)" in \
|
|
||||||
[\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
|
|
||||||
*) sdir=$(subdir)/$(srcdir) ;; \
|
|
||||||
esac; \
|
|
||||||
for i in $$list; do \
|
|
||||||
if test -f "$$i"; then \
|
|
||||||
echo "$(subdir)/$$i"; \
|
|
||||||
else \
|
|
||||||
echo "$$sdir/$$i"; \
|
|
||||||
fi; \
|
|
||||||
done >> $(top_builddir)/cscope.files
|
|
||||||
|
|
||||||
modules_install-FreeBSD:
|
modules_install-FreeBSD:
|
||||||
@# Install the kernel modules
|
@# Install the kernel modules
|
||||||
+$(FMAKE) install
|
+$(FMAKE) install
|
||||||
|
@ -117,7 +96,7 @@ modules_install: modules_install-@ac_system@
|
||||||
|
|
||||||
modules_uninstall-Linux:
|
modules_uninstall-Linux:
|
||||||
@# Uninstall the kernel modules
|
@# Uninstall the kernel modules
|
||||||
kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@
|
kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@ \
|
||||||
list='$(ZFS_MODULES)'; for objdir in $$list; do \
|
list='$(ZFS_MODULES)'; for objdir in $$list; do \
|
||||||
$(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$objdir; \
|
$(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$objdir; \
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in New Issue