libnvme: Add libnvme submodule

Signed-off-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Hannes Reinecke <hare@suse.de>

diff --git a/.gitmodules b/.gitmodules
new file mode 100644 (file)
index 0000000..90cf4e6
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "libnvme"]
+       path = libnvme
+       url = https://github.com/linux-nvme/libnvme

diff --git a/Makefile b/Makefile
index 86eb7c65ec8d9e726086d64e0bd0ef941d5dc012..7fe731de7414a6666f6c266c0b8ddf547b36a6a5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,7 @@ SYSTEMDDIR ?= $(LIBDIR)/systemd
 UDEVDIR ?= $(SYSCONFDIR)/udev
 UDEVRULESDIR ?= $(UDEVDIR)/rules.d
 DRACUTDIR ?= $(LIBDIR)/dracut
+LIBNVMEDIR = libnvme/
 LIB_DEPENDS =
 
 ifeq ($(LIBUUID),0)
@@ -95,7 +96,10 @@ PLUGIN_OBJS :=                                       \
        plugins/nvidia/nvidia-nvme.o        \
        plugins/ymtc/ymtc-nvme.o
 
-nvme: nvme.c nvme.h $(OBJS) $(PLUGIN_OBJS) $(UTIL_OBJS) NVME-VERSION-FILE
+libnvme:
+       $(MAKE) -C $(LIBNVMEDIR)
+
+nvme: nvme.c nvme.h libnvme $(OBJS) $(PLUGIN_OBJS) $(UTIL_OBJS) NVME-VERSION-FILE
        $(QUIET_CC)$(CC) $(CPPFLAGS) $(CFLAGS) $(INC) $< -o $(NVME) $(OBJS) $(PLUGIN_OBJS) $(UTIL_OBJS) $(LDFLAGS)
 
 verify-no-dep: nvme.c nvme.h $(OBJS) $(UTIL_OBJS) NVME-VERSION-FILE
@@ -121,6 +125,7 @@ all: doc
 clean:
        $(RM) $(NVME) $(OBJS) $(PLUGIN_OBJS) $(UTIL_OBJS) *~ a.out NVME-VERSION-FILE *.tar* nvme.spec version control nvme-*.deb 70-nvmf-autoconnect.conf
        $(MAKE) -C Documentation clean
+       $(MAKE) -C libnvme clean
        $(RM) tests/*.pyc
        $(RM) verify-no-dep
 
@@ -249,4 +254,4 @@ rpm: dist
        -ta nvme-$(NVME_VERSION).tar.gz
 
 .PHONY: default doc all clean clobber install-man install-bin install
-.PHONY: dist pkg dist-orig deb deb-light rpm FORCE test
+.PHONY: dist pkg dist-orig deb deb-light rpm FORCE test libnvme

diff --git a/libnvme b/libnvme
new file mode 160000 (submodule)
index 0000000..8bd0e38
--- /dev/null
+++ b/libnvme
@@ -0,0 +1 @@
+Subproject commit 8bd0e3843d7be56edf5a64be8413d09c73b565ff