Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol

This commit is contained in:
Brian Behlendorf 2008-12-12 10:12:47 -08:00
commit 87935f5077
2 changed files with 2 additions and 1 deletions

View File

@ -1,6 +1,6 @@
# Default build options # Default build options
AM_FLAGS = -ggdb -O2 -std=c99 AM_FLAGS = -ggdb -O2 -std=c99
AM_FLAGS += -Wall -Wstrict-prototypes -Wshadow AM_FLAGS += -Wall -Wstrict-prototypes -Wshadow -Werror
# FIXME: Quiet warnings not covered by the gcc-* patches. We should # FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can. # FIXME: consider removing this as soon as we reasonably can.

View File

@ -2,6 +2,7 @@ include $(top_srcdir)/config/Rules.am
DEFAULT_INCLUDES = \ DEFAULT_INCLUDES = \
-I${top_srcdir}/module/zcommon/include \ -I${top_srcdir}/module/zcommon/include \
-I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/lib/libspl/include -I${top_srcdir}/lib/libspl/include
lib_LTLIBRARIES = libzcommon.la lib_LTLIBRARIES = libzcommon.la