From 7726ecc89015edb49057473a605c63ac9354f5cb Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Tue, 6 Sep 2022 08:54:56 -0700 Subject: Small bug fixes (#364) * build: move utils/sysdeps to top-level The routines here are used by iscsiuio, so move them to the top level. * libopeniscsiusr: fix kernel-doc bugs There were errors in four places, effecting the generated manual pages. * libopeniscsiusr: clean up kernel-doc usage Simplify generation of library interface documentation using the kernel-doc script: * make the kernel-doc perl script executble (the only visible change) * remove mention of sed (not used) * stop compressing man pages -- let distros do that * improve kernel-doc so that doc-preclean.pl and split-man.pl are no longer needed * add list-man-pages.sh to simplify things (copied from libnvme) * build: keep current version number in one place Move the current version number (now 2.1.7) into the top-level Makefile, and out of usr/version.h and libopeniscsiusr/version.h, completely eliminating the need for the latter. Note that this ties the libopeniscsiusr library idea of "version" to the usr/ (iscsid, etc) idea of version, even though they used to be defined separately. But they always had the same value, so nothing lost. * build: insteall man pages uncompressed We were delivering some man pages compressed and other not, and it turns out distros know how to install man pages using the compression they prefer, so stop doing it for them. --- Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 826eb49..83db9d3 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,9 @@ # that you want everything installed into. DESTDIR ?= +# our VERSION String +ISCSI_VERSION_STR ?= 2.1.7 + prefix = /usr exec_prefix = mandir = $(prefix)/share/man @@ -19,7 +22,7 @@ RULESDIR = $(etcdir)/udev/rules.d INSTALL = /usr/bin/install # pass these on to sub-Makefiles -export DESTDIR prefix INSTALL SBINDIR HOMEDIR DBROOT RULESDIR +export DESTDIR prefix INSTALL SBINDIR HOMEDIR DBROOT RULESDIR ISCSI_VERSION_STR # Compatibility: parse old OPTFLAGS argument ifdef OPTFLAGS @@ -51,7 +54,7 @@ make_utils: user: iscsiuio/Makefile $(MAKE) $(MFLAGS) -C libopeniscsiusr - $(MAKE) $(MFLAGS) -C utils/sysdeps + $(MAKE) $(MFLAGS) -C sysdeps $(MAKE) $(MFLAGS) -C usr $(MAKE) $(MFLAGS) -C utils $(MAKE) $(MFLAGS) -C etc @@ -77,7 +80,7 @@ iscsiuio/configure: iscsiuio/configure.ac iscsiuio/Makefile.am force: ; clean distclean: - $(MAKE) $(MFLAGS) -C utils/sysdeps $@ + $(MAKE) $(MFLAGS) -C sysdeps $@ $(MAKE) $(MFLAGS) -C utils $@ $(MAKE) $(MFLAGS) -C usr $@ $(MAKE) $(MFLAGS) -C etc $@ @@ -121,7 +124,7 @@ install_libopeniscsiusr: $(MAKE) $(MFLAGS) -C libopeniscsiusr install depend: - for dir in usr utils utils/fwparam_ibft utils/sysdeps; do \ + for dir in usr utils utils/fwparam_ibft sysdeps; do \ $(MAKE) $(MFLAGS) -C $$dir $@; \ done -- cgit v1.2.1