Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch

2009-03-10 22:03:06 -07:00 · 2009-03-10 22:03:06 -07:00 · d9480e2bd0
parent cb3248510d cab2e23bb8
commit d9480e2bd0
5 changed files with 12 additions and 0 deletions
--- a/configure.ac
+++ b/configure.ac
@ -56,6 +56,9 @@ AC_CONFIG_FILES([
 	doc/Makefile
 	lib/Makefile
 	lib/libspl/Makefile
+	lib/libspl/asm-i686/Makefile
+	lib/libspl/asm-x86_64/Makefile
+	lib/libspl/include/Makefile
 	lib/libavl/Makefile
 	lib/libnvpair/Makefile
 	lib/libunicode/Makefile
--- a/lib/libspl/Makefile.am
+++ b/lib/libspl/Makefile.am
@ -1,5 +1,6 @@
 include $(top_srcdir)/config/Rules.am

+SUBDIRS = asm-i686 asm-x86_64 include
 DEFAULT_INCLUDES += \
 	-I${top_srcdir}/lib/libspl/include

--- a/lib/libspl/asm-i686/Makefile.am
+++ b/lib/libspl/asm-i686/Makefile.am
@ -0,0 +1 @@
+noinst_HEADERS = *.S
--- a/lib/libspl/asm-x86_64/Makefile.am
+++ b/lib/libspl/asm-x86_64/Makefile.am
@ -0,0 +1 @@
+noinst_HEADERS = *.S
--- a/lib/libspl/include/Makefile.am
+++ b/lib/libspl/include/Makefile.am
@ -0,0 +1,6 @@
+noinst_HEADERS  = *.h
+noinst_HEADERS += ia32/sys/*.h
+noinst_HEADERS += sys/*.h
+noinst_HEADERS += sys/fm/*.h
+noinst_HEADERS += sys/sysevent/*.h
+noinst_HEADERS += tsol/*.h