Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
This commit is contained in:
commit
ad5697d303
|
@ -1 +1 @@
|
||||||
SUBDIRS = zdb zdump zfs zinject zpool ztest
|
SUBDIRS = zdb zdump zfs zinject zpool ztest zpios
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
include $(top_srcdir)/config/Rules.am
|
||||||
|
|
||||||
|
sbin_PROGRAMS = zpios
|
||||||
|
|
||||||
|
zpios_SOURCES = \
|
||||||
|
zpios.h \
|
||||||
|
zpios_main.c \
|
||||||
|
zpios_util.c
|
|
@ -2,15 +2,8 @@ DISTFILES = Makefile.in *.c
|
||||||
|
|
||||||
MODULE := zpios
|
MODULE := zpios
|
||||||
|
|
||||||
# Compile as kernel module. Needed symlinks created for all
|
|
||||||
# k* objects created by top level configure script.
|
|
||||||
|
|
||||||
EXTRA_CFLAGS = @KERNELCPPFLAGS@
|
EXTRA_CFLAGS = @KERNELCPPFLAGS@
|
||||||
EXTRA_CFLAGS += -I@LIBDIR@/libzpios/include
|
EXTRA_CFLAGS += -I@MODDIR@/zpios/include
|
||||||
EXTRA_CFLAGS += -I@LIBDIR@/libzcommon/include
|
|
||||||
EXTRA_CFLAGS += -I@LIBDIR@/libport/include
|
|
||||||
EXTRA_CFLAGS += -I@LIBDIR@/libavl/include
|
|
||||||
EXTRA_CFLAGS += -I@LIBDIR@/libnvpair/include
|
|
||||||
|
|
||||||
obj-m := ${MODULE}.o
|
obj-m := ${MODULE}.o
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue