Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem

This commit is contained in:
Brian Behlendorf 2009-01-05 12:41:15 -08:00
parent 774375d168 ce7115b807
commit 9c73332e81
13 changed files with 46 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/zdb/Makefile.am
View File

@ -8,7 +8,8 @@ DEFAULT_INCLUDES += \
-I${top_srcdir}/module/zfs/include \ -I${top_srcdir}/module/zfs/include \
-I${top_srcdir}/module/zcommon/include \ -I${top_srcdir}/module/zcommon/include \
-I${top_srcdir}/module/nvpair/include \ -I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/module/avl/include -I${top_srcdir}/module/avl/include \
-I${top_srcdir}/module/unicode/include
sbin_PROGRAMS = zdb sbin_PROGRAMS = zdb
@ -20,6 +21,7 @@ zdb_LDADD = \
$(top_builddir)/lib/libspl/libspl.la \ $(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \ $(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \ $(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la \ $(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la $(top_builddir)/lib/libzfs/libzfs.la

4
cmd/zfs/Makefile.am
View File

@ -7,7 +7,8 @@ DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libnvpair/include \ -I${top_srcdir}/lib/libnvpair/include \
-I${top_srcdir}/module/zcommon/include \ -I${top_srcdir}/module/zcommon/include \
-I${top_srcdir}/module/nvpair/include \ -I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/module/avl/include -I${top_srcdir}/module/avl/include \
-I${top_srcdir}/module/unicode/include
sbin_PROGRAMS = zfs sbin_PROGRAMS = zfs
@ -21,6 +22,7 @@ zfs_LDADD = \
$(top_builddir)/lib/libspl/libspl.la \ $(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \ $(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \ $(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la \ $(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la $(top_builddir)/lib/libzfs/libzfs.la

4
cmd/zinject/Makefile.am
View File

@ -10,7 +10,8 @@ DEFAULT_INCLUDES += \
-I${top_srcdir}/module/zfs/include \ -I${top_srcdir}/module/zfs/include \
-I${top_srcdir}/module/zcommon/include \ -I${top_srcdir}/module/zcommon/include \
-I${top_srcdir}/module/nvpair/include \ -I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/module/avl/include -I${top_srcdir}/module/avl/include \
-I${top_srcdir}/module/unicode/include
sbin_PROGRAMS = zinject sbin_PROGRAMS = zinject
@ -23,6 +24,7 @@ zinject_LDADD = \
$(top_builddir)/lib/libspl/libspl.la \ $(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \ $(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \ $(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la \ $(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la $(top_builddir)/lib/libzfs/libzfs.la

4
cmd/zpool/Makefile.am
View File

@ -7,7 +7,8 @@ DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libnvpair/include \ -I${top_srcdir}/lib/libnvpair/include \
-I${top_srcdir}/module/zcommon/include \ -I${top_srcdir}/module/zcommon/include \
-I${top_srcdir}/module/nvpair/include \ -I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/module/avl/include -I${top_srcdir}/module/avl/include \
-I${top_srcdir}/module/unicode/include
sbin_PROGRAMS = zpool sbin_PROGRAMS = zpool
@ -22,6 +23,7 @@ zpool_LDADD = \
$(top_builddir)/lib/libspl/libspl.la \ $(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \ $(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \ $(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la \ $(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la $(top_builddir)/lib/libzfs/libzfs.la

4
cmd/ztest/Makefile.am
View File

@ -10,7 +10,8 @@ DEFAULT_INCLUDES += \
-I${top_srcdir}/module/zfs/include \ -I${top_srcdir}/module/zfs/include \
-I${top_srcdir}/module/zcommon/include \ -I${top_srcdir}/module/zcommon/include \
-I${top_srcdir}/module/nvpair/include \ -I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/module/avl/include -I${top_srcdir}/module/avl/include \
-I${top_srcdir}/module/unicode/include
sbin_PROGRAMS = ztest sbin_PROGRAMS = ztest
@ -21,6 +22,7 @@ ztest_LDADD = \
$(top_builddir)/lib/libspl/libspl.la \ $(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \ $(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \ $(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la \ $(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la $(top_builddir)/lib/libzfs/libzfs.la

2
lib/Makefile.am
View File

@ -1 +1 @@
SUBDIRS = libavl libnvpair libuutil libzfs libzpool SUBDIRS = libavl libnvpair libunicode libuutil libzfs libzpool

13
lib/libunicode/Makefile.am Normal file
View File

@ -0,0 +1,13 @@
include $(top_srcdir)/config/Rules.am
DEFAULT_INCLUDES += \
-I${top_srcdir}/module/unicode/include \
-I${top_srcdir}/lib/libspl/include
lib_LTLIBRARIES = libunicode.la
libunicode_la_SOURCES = \
${top_srcdir}/module/unicode/u8_textprep.c \
${top_srcdir}/module/unicode/uconv.c \
${top_srcdir}/module/unicode/include/sys/u8_textprep.h \
${top_srcdir}/module/unicode/include/sys/u8_textprep_data.h

2
module/Makefile.in
View File

@ -1,4 +1,4 @@
subdir-m = avl nvpair zcommon zfs subdir-m = avl nvpair unicode zcommon zfs
# Make the exported SPL symbols available to these modules. # Make the exported SPL symbols available to these modules.
# Unfortunately there is not a cleaner way to do this, modpost # Unfortunately there is not a cleaner way to do this, modpost

12
module/unicode/Makefile.in Normal file
View File

@ -0,0 +1,12 @@
subdir-m += include
DISTFILES = u8_textprep.c uconv.c
MODULE := zunicode
EXTRA_CFLAGS = @KERNELCPPFLAGS@
EXTRA_CFLAGS += -I@MODDIR@/unicode/include
obj-m := ${MODULE}.o
${MODULE}-objs += u8_textprep.o
${MODULE}-objs += uconv.o

1
module/unicode/include/Makefile.in Normal file
View File

@ -0,0 +1 @@
subdir-m += sys

1
module/unicode/include/sys/Makefile.in Normal file
View File

@ -0,0 +1 @@
DISTFILES = u8_textprep.h u8_textprep_data.h

1
module/zcommon/Makefile.in
View File

@ -7,6 +7,7 @@ MODULE := zcommon
EXTRA_CFLAGS = @KERNELCPPFLAGS@ EXTRA_CFLAGS = @KERNELCPPFLAGS@
EXTRA_CFLAGS += -I@MODDIR@/avl/include EXTRA_CFLAGS += -I@MODDIR@/avl/include
EXTRA_CFLAGS += -I@MODDIR@/nvpair/include EXTRA_CFLAGS += -I@MODDIR@/nvpair/include
EXTRA_CFLAGS += -I@MODDIR@/unicode/include
EXTRA_CFLAGS += -I@MODDIR@/zcommon/include EXTRA_CFLAGS += -I@MODDIR@/zcommon/include
EXTRA_CFLAGS += -I@MODDIR@/zfs/include EXTRA_CFLAGS += -I@MODDIR@/zfs/include

1
module/zfs/Makefile.in
View File

@ -16,6 +16,7 @@ EXTRA_CFLAGS += -I@MODDIR@/zfs/include
EXTRA_CFLAGS += -I@MODDIR@/zcommon/include EXTRA_CFLAGS += -I@MODDIR@/zcommon/include
EXTRA_CFLAGS += -I@MODDIR@/avl/include EXTRA_CFLAGS += -I@MODDIR@/avl/include
EXTRA_CFLAGS += -I@MODDIR@/nvpair/include EXTRA_CFLAGS += -I@MODDIR@/nvpair/include
EXTRA_CFLAGS += -I@MODDIR@/unicode/include
obj-m := ${MODULE}.o obj-m := ${MODULE}.o