summaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2009-02-12 14:45:22 -0800
committerBrian Behlendorf <[email protected]>2009-02-12 14:45:22 -0800
commitf6c5d4ff88937fd69c938e0bc6ea11ad541e0a48 (patch)
treef24c06457dc2508e4f59f417f69c0b9ec9cce33b /cmd
parent37db7d8cf9936e6d2851a4329c11efcd9f61305c (diff)
Build system update
- Added default build flags: -Wall -Wstrict-prototypes -Werror -Wshadow - Added missing Makefile's for include/ subdirectories.
Diffstat (limited to 'cmd')
-rw-r--r--cmd/Makefile.am6
-rw-r--r--cmd/Makefile.in11
2 files changed, 11 insertions, 6 deletions
diff --git a/cmd/Makefile.am b/cmd/Makefile.am
index 3d1a39297..5658d06c4 100644
--- a/cmd/Makefile.am
+++ b/cmd/Makefile.am
@@ -1,5 +1,7 @@
-DEFAULT_INCLUDES = -I. -I.. -I../lib
-AM_CFLAGS = -g -O2 -W -Wall -Wstrict-prototypes -Wshadow -D__USE_LARGEFILE64
+include $(top_srcdir)/config/Rules.am
+
+DEFAULT_INCLUDES += \
+ -I${top_srcdir}/lib
sbin_PROGRAMS = spl splat
diff --git a/cmd/Makefile.in b/cmd/Makefile.in
index e31c3bdcd..48d44a2b4 100644
--- a/cmd/Makefile.in
+++ b/cmd/Makefile.in
@@ -37,9 +37,10 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/config/Rules.am
sbin_PROGRAMS = spl$(EXEEXT) splat$(EXEEXT)
subdir = cmd
-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
@@ -191,8 +192,9 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-DEFAULT_INCLUDES = -I. -I.. -I../lib
-AM_CFLAGS = -g -O2 -W -Wall -Wstrict-prototypes -Wshadow -D__USE_LARGEFILE64
+DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib
+AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wshadow \
+ -D__USE_LARGEFILE64
spl_SOURCES = spl.c
splat_SOURCES = splat.c
splat_LDFLAGS = $(top_builddir)/lib/libcommon.la
@@ -201,7 +203,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*) \
@@ -354,6 +356,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 \