Merge commit 'refs/top-bases/linux-legacy' into linux-legacy

2008-12-11 15:37:21 -08:00 · 2008-12-11 15:37:21 -08:00 · 48089b4ae5
parent 707c548a35 cf06f2f58f
commit 48089b4ae5
3 changed files with 1 additions and 16 deletions
--- a/configure.ac
+++ b/configure.ac
@ -106,7 +106,6 @@ AC_CONFIG_FILES([ Makefile
                  doc/Makefile
                  scripts/Makefile
                  lib/Makefile
-                  lib/libspl/Makefile
                  lib/libavl/Makefile
                  lib/libnvpair/Makefile
                  lib/libuutil/Makefile
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@ -1 +1 @@
-SUBDIRS = libspl libavl libnvpair libuutil libzcommon libzpool libzfs
+SUBDIRS = libavl libnvpair libuutil libzcommon libzpool libzfs
--- a/lib/libspl/Makefile.am
+++ b/lib/libspl/Makefile.am
@ -1,14 +0,0 @@
-include $(top_srcdir)/config/Rules.am
-
-DEFAULT_INCLUDES  = -I${libdir}/libspl/include
-
-lib_LTLIBRARIES = libspl.la
-
-libspl_la_SOURCES = list.c \
-                    mkdirp.c \
-                    strlcat.c \
-                    strlcpy.c \
-                    strnlen.c \
-                    u8_textprep.c \
-                    include/sys/list.h \
-                    include/sys/list_impl.h