From 2e0a5f5461a8ca8aec25167e237beca10fabe700 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 12 Dec 2008 09:30:42 -0800 Subject: [PATCH 1/2] Refresh makefiles and configure.ac --- configure.ac | 1 + lib/libspl/Makefile.am | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index d93d76bfe0..7ed602c7d3 100644 --- a/configure.ac +++ b/configure.ac @@ -100,6 +100,7 @@ AC_CONFIG_FILES([ Makefile doc/Makefile scripts/Makefile lib/Makefile + lib/libspl/Makefile lib/libavl/Makefile lib/libnvpair/Makefile lib/libuutil/Makefile diff --git a/lib/libspl/Makefile.am b/lib/libspl/Makefile.am index 451995830f..7a2f538c4b 100644 --- a/lib/libspl/Makefile.am +++ b/lib/libspl/Makefile.am @@ -1,14 +1,16 @@ include $(top_srcdir)/config/Rules.am -DEFAULT_INCLUDES = -I${libdir}/libspl/include +DEFAULT_INCLUDES = \ + -I${top_srcdir}/lib/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 +libspl_la_SOURCES = \ + ${top_srcdir}/lib/libspl/list.c \ + ${top_srcdir}/lib/libspl/mkdirp.c \ + ${top_srcdir}/lib/libspl/strlcat.c \ + ${top_srcdir}/lib/libspl/strlcpy.c \ + ${top_srcdir}/lib/libspl/strnlen.c \ + ${top_srcdir}/lib/libspl/u8_textprep.c \ + ${top_srcdir}/lib/libspl/include/sys/list.h \ + ${top_srcdir}/lib/libspl/include/sys/list_impl.h From 56f1015f8b7494048d887a7575907b305b85c336 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 12 Dec 2008 09:32:53 -0800 Subject: [PATCH 2/2] Refresh Makefile.am --- cmd/zpios/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/zpios/Makefile.am b/cmd/zpios/Makefile.am index 94a218d679..91029dbe70 100644 --- a/cmd/zpios/Makefile.am +++ b/cmd/zpios/Makefile.am @@ -3,6 +3,6 @@ include $(top_srcdir)/config/Rules.am sbin_PROGRAMS = zpios zpios_SOURCES = \ - zpios.h \ - zpios_main.c \ - zpios_util.c + $(top_srcdir)/cmd/zpios/zpios.h \ + $(top_srcdir)/cmd/zpios/zpios_main.c \ + $(top_srcdir)/cmd/zpios/zpios_util.c