From ced77c2f1b1e158a198cbc7cfce6ebecd103cc9c Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 5 Jan 2009 12:32:55 -0800 Subject: [PATCH 1/2] Add unicode makefile references and support --- lib/libunicode/Makefile.am | 13 +++++++++++++ module/unicode/Makefile.in | 12 ++++++++++++ module/unicode/include/Makefile.in | 1 + module/unicode/include/sys/Makefile.in | 1 + 4 files changed, 27 insertions(+) create mode 100644 lib/libunicode/Makefile.am create mode 100644 module/unicode/Makefile.in create mode 100644 module/unicode/include/Makefile.in create mode 100644 module/unicode/include/sys/Makefile.in diff --git a/lib/libunicode/Makefile.am b/lib/libunicode/Makefile.am new file mode 100644 index 0000000000..fe1f39219f --- /dev/null +++ b/lib/libunicode/Makefile.am @@ -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 diff --git a/module/unicode/Makefile.in b/module/unicode/Makefile.in new file mode 100644 index 0000000000..aa2120d604 --- /dev/null +++ b/module/unicode/Makefile.in @@ -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 diff --git a/module/unicode/include/Makefile.in b/module/unicode/include/Makefile.in new file mode 100644 index 0000000000..6611e4143d --- /dev/null +++ b/module/unicode/include/Makefile.in @@ -0,0 +1 @@ +subdir-m += sys diff --git a/module/unicode/include/sys/Makefile.in b/module/unicode/include/sys/Makefile.in new file mode 100644 index 0000000000..fb0057c0dd --- /dev/null +++ b/module/unicode/include/sys/Makefile.in @@ -0,0 +1 @@ +DISTFILES = u8_textprep.h u8_textprep_data.h From ce7115b80785cf6f2f655abd178b11e3c8d206b0 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 5 Jan 2009 12:33:09 -0800 Subject: [PATCH 2/2] Add unicode makefile references and support --- cmd/zdb/Makefile.am | 4 +++- cmd/zfs/Makefile.am | 4 +++- cmd/zinject/Makefile.am | 4 +++- cmd/zpool/Makefile.am | 4 +++- cmd/ztest/Makefile.am | 4 +++- lib/Makefile.am | 2 +- module/Makefile.in | 2 +- module/zcommon/Makefile.in | 1 + module/zfs/Makefile.in | 1 + 9 files changed, 19 insertions(+), 7 deletions(-) diff --git a/cmd/zdb/Makefile.am b/cmd/zdb/Makefile.am index 31cf855ef2..e58a2a1f43 100644 --- a/cmd/zdb/Makefile.am +++ b/cmd/zdb/Makefile.am @@ -8,7 +8,8 @@ DEFAULT_INCLUDES += \ -I${top_srcdir}/module/zfs/include \ -I${top_srcdir}/module/zcommon/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 @@ -20,6 +21,7 @@ zdb_LDADD = \ $(top_builddir)/lib/libspl/libspl.la \ $(top_builddir)/lib/libavl/libavl.la \ $(top_builddir)/lib/libnvpair/libnvpair.la \ + $(top_builddir)/lib/libunicode/libunicode.la \ $(top_builddir)/lib/libuutil/libuutil.la \ $(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzfs/libzfs.la diff --git a/cmd/zfs/Makefile.am b/cmd/zfs/Makefile.am index 49f5cf1515..8b2dfd6be6 100644 --- a/cmd/zfs/Makefile.am +++ b/cmd/zfs/Makefile.am @@ -7,7 +7,8 @@ DEFAULT_INCLUDES += \ -I${top_srcdir}/lib/libnvpair/include \ -I${top_srcdir}/module/zcommon/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 @@ -21,6 +22,7 @@ zfs_LDADD = \ $(top_builddir)/lib/libspl/libspl.la \ $(top_builddir)/lib/libavl/libavl.la \ $(top_builddir)/lib/libnvpair/libnvpair.la \ + $(top_builddir)/lib/libunicode/libunicode.la \ $(top_builddir)/lib/libuutil/libuutil.la \ $(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzfs/libzfs.la diff --git a/cmd/zinject/Makefile.am b/cmd/zinject/Makefile.am index d595af82cf..861d5933ad 100644 --- a/cmd/zinject/Makefile.am +++ b/cmd/zinject/Makefile.am @@ -10,7 +10,8 @@ DEFAULT_INCLUDES += \ -I${top_srcdir}/module/zfs/include \ -I${top_srcdir}/module/zcommon/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 @@ -23,6 +24,7 @@ zinject_LDADD = \ $(top_builddir)/lib/libspl/libspl.la \ $(top_builddir)/lib/libavl/libavl.la \ $(top_builddir)/lib/libnvpair/libnvpair.la \ + $(top_builddir)/lib/libunicode/libunicode.la \ $(top_builddir)/lib/libuutil/libuutil.la \ $(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzfs/libzfs.la diff --git a/cmd/zpool/Makefile.am b/cmd/zpool/Makefile.am index 5763320e15..e7fdbd09d8 100644 --- a/cmd/zpool/Makefile.am +++ b/cmd/zpool/Makefile.am @@ -7,7 +7,8 @@ DEFAULT_INCLUDES += \ -I${top_srcdir}/lib/libnvpair/include \ -I${top_srcdir}/module/zcommon/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 @@ -22,6 +23,7 @@ zpool_LDADD = \ $(top_builddir)/lib/libspl/libspl.la \ $(top_builddir)/lib/libavl/libavl.la \ $(top_builddir)/lib/libnvpair/libnvpair.la \ + $(top_builddir)/lib/libunicode/libunicode.la \ $(top_builddir)/lib/libuutil/libuutil.la \ $(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzfs/libzfs.la diff --git a/cmd/ztest/Makefile.am b/cmd/ztest/Makefile.am index f4094347c6..c1dae8f592 100644 --- a/cmd/ztest/Makefile.am +++ b/cmd/ztest/Makefile.am @@ -10,7 +10,8 @@ DEFAULT_INCLUDES += \ -I${top_srcdir}/module/zfs/include \ -I${top_srcdir}/module/zcommon/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 @@ -21,6 +22,7 @@ ztest_LDADD = \ $(top_builddir)/lib/libspl/libspl.la \ $(top_builddir)/lib/libavl/libavl.la \ $(top_builddir)/lib/libnvpair/libnvpair.la \ + $(top_builddir)/lib/libunicode/libunicode.la \ $(top_builddir)/lib/libuutil/libuutil.la \ $(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzfs/libzfs.la diff --git a/lib/Makefile.am b/lib/Makefile.am index 3a759bce54..46382dc189 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1 +1 @@ -SUBDIRS = libavl libnvpair libuutil libzfs libzpool +SUBDIRS = libavl libnvpair libunicode libuutil libzfs libzpool diff --git a/module/Makefile.in b/module/Makefile.in index 031d97adfc..d470487a9a 100644 --- a/module/Makefile.in +++ b/module/Makefile.in @@ -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. # Unfortunately there is not a cleaner way to do this, modpost diff --git a/module/zcommon/Makefile.in b/module/zcommon/Makefile.in index 4e84b335ee..010e77a855 100644 --- a/module/zcommon/Makefile.in +++ b/module/zcommon/Makefile.in @@ -7,6 +7,7 @@ MODULE := zcommon EXTRA_CFLAGS = @KERNELCPPFLAGS@ EXTRA_CFLAGS += -I@MODDIR@/avl/include EXTRA_CFLAGS += -I@MODDIR@/nvpair/include +EXTRA_CFLAGS += -I@MODDIR@/unicode/include EXTRA_CFLAGS += -I@MODDIR@/zcommon/include EXTRA_CFLAGS += -I@MODDIR@/zfs/include diff --git a/module/zfs/Makefile.in b/module/zfs/Makefile.in index 558cfac22b..bd72636ccf 100644 --- a/module/zfs/Makefile.in +++ b/module/zfs/Makefile.in @@ -16,6 +16,7 @@ EXTRA_CFLAGS += -I@MODDIR@/zfs/include EXTRA_CFLAGS += -I@MODDIR@/zcommon/include EXTRA_CFLAGS += -I@MODDIR@/avl/include EXTRA_CFLAGS += -I@MODDIR@/nvpair/include +EXTRA_CFLAGS += -I@MODDIR@/unicode/include obj-m := ${MODULE}.o