summaryrefslogtreecommitdiff
path: root/sbin/nvmecontrol
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2018-12-06 22:58:55 +0000
committerWarner Losh <imp@FreeBSD.org>2018-12-06 22:58:55 +0000
commiteac8e82796f7c81772da27db2371707b8986bec8 (patch)
treea4aa161a19c81eefa3eac6582dd43beef6b62096 /sbin/nvmecontrol
parent0d095c23a0cda5cf912c103d31e11ba227cfce0b (diff)
downloadsrc-test2-eac8e82796f7c81772da27db2371707b8986bec8.tar.gz
src-test2-eac8e82796f7c81772da27db2371707b8986bec8.zip
Notes
Diffstat (limited to 'sbin/nvmecontrol')
-rw-r--r--sbin/nvmecontrol/Makefile3
-rw-r--r--sbin/nvmecontrol/modules/Makefile5
-rw-r--r--sbin/nvmecontrol/modules/Makefile.inc12
-rw-r--r--sbin/nvmecontrol/modules/intel/Makefile6
-rw-r--r--sbin/nvmecontrol/modules/intel/intel.c (renamed from sbin/nvmecontrol/intel.c)0
-rw-r--r--sbin/nvmecontrol/modules/wdc/Makefile6
-rw-r--r--sbin/nvmecontrol/modules/wdc/wdc.c (renamed from sbin/nvmecontrol/wdc.c)0
7 files changed, 31 insertions, 1 deletions
diff --git a/sbin/nvmecontrol/Makefile b/sbin/nvmecontrol/Makefile
index 4a53b3df6f9b..501dcaf8a5ec 100644
--- a/sbin/nvmecontrol/Makefile
+++ b/sbin/nvmecontrol/Makefile
@@ -4,10 +4,11 @@ PACKAGE=runtime
PROG= nvmecontrol
SRCS= nvmecontrol.c devlist.c firmware.c format.c identify.c identify_ext.c logpage.c \
perftest.c reset.c ns.c nvme_util.c power.c nc_util.c
-SRCS+= wdc.c intel.c
MAN= nvmecontrol.8
LDFLAGS+= -rdynamic
+SUBDIR= modules
.PATH: ${SRCTOP}/sys/dev/nvme
.include <bsd.prog.mk>
+.include <bsd.subdir.mk>
diff --git a/sbin/nvmecontrol/modules/Makefile b/sbin/nvmecontrol/modules/Makefile
new file mode 100644
index 000000000000..e615eaffb8c9
--- /dev/null
+++ b/sbin/nvmecontrol/modules/Makefile
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+SUBDIR= intel wdc
+
+.include <bsd.subdir.mk>
diff --git a/sbin/nvmecontrol/modules/Makefile.inc b/sbin/nvmecontrol/modules/Makefile.inc
new file mode 100644
index 000000000000..bdc25f711a67
--- /dev/null
+++ b/sbin/nvmecontrol/modules/Makefile.inc
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+PACKAGE=runtime
+NVMECONTROLDIR= ${SRCTOP}/sbin/nvmecontrol
+
+MK_INSTALLLIB= no
+MK_PROFILE= no
+
+CFLAGS+= -I${NVMECONTROLDIR}
+
+SHLIB_NAME?= ${LIB}.so
+LIBDIR= /lib/nvmecontrol
diff --git a/sbin/nvmecontrol/modules/intel/Makefile b/sbin/nvmecontrol/modules/intel/Makefile
new file mode 100644
index 000000000000..f2ba4f97aa3a
--- /dev/null
+++ b/sbin/nvmecontrol/modules/intel/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+LIB= intel
+SRCS= intel.c
+
+.include <bsd.lib.mk>
diff --git a/sbin/nvmecontrol/intel.c b/sbin/nvmecontrol/modules/intel/intel.c
index abc0374600ed..abc0374600ed 100644
--- a/sbin/nvmecontrol/intel.c
+++ b/sbin/nvmecontrol/modules/intel/intel.c
diff --git a/sbin/nvmecontrol/modules/wdc/Makefile b/sbin/nvmecontrol/modules/wdc/Makefile
new file mode 100644
index 000000000000..40c77254fbea
--- /dev/null
+++ b/sbin/nvmecontrol/modules/wdc/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+LIB= wdc
+SRCS= wdc.c
+
+.include <bsd.lib.mk>
diff --git a/sbin/nvmecontrol/wdc.c b/sbin/nvmecontrol/modules/wdc/wdc.c
index e6ec249addf8..e6ec249addf8 100644
--- a/sbin/nvmecontrol/wdc.c
+++ b/sbin/nvmecontrol/modules/wdc/wdc.c