2 files changed, 8 insertions, 6 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 24ba72913..0f2826bb2 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,5 +1,4 @@
-DEFAULT_INCLUDES = -I. -I..
-AM_CFLAGS = -g -O2 -W -Wall -Wstrict-prototypes -Wshadow
+include $(top_srcdir)/config/Rules.am
 
 noinst_LTLIBRARIES = libcommon.la
 libcommon_la_SOURCES = list.c
diff --git a/lib/Makefile.in b/lib/Makefile.in
index e4097785b..76ac90bc9 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -37,8 +37,9 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/config/Rules.am
 subdir = lib
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/spl-build.m4 \
 	$(top_srcdir)/config/spl-meta.m4 $(top_srcdir)/configure.ac
@@ -185,8 +186,9 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-DEFAULT_INCLUDES = -I. -I..
-AM_CFLAGS = -g -O2 -W -Wall -Wstrict-prototypes -Wshadow
+DEFAULT_INCLUDES = -I${top_srcdir}
+AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wshadow \
+	-D__USE_LARGEFILE64
 noinst_LTLIBRARIES = libcommon.la
 libcommon_la_SOURCES = list.c
 EXTRA_DIST = list.h
@@ -194,7 +196,7 @@ all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/Rules.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -323,6 +325,7 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
+	$(mkdir_p) $(distdir)/../config
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \