Skip to content

Commit

Permalink
build: do not call boilerplate ourself
Browse files Browse the repository at this point in the history
Rationale see section 3.5 "Using `autoreconf' to Update `configure'
Scripts" of the autoconf manual.

Signed-off-by: Jan Engelhardt <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
  • Loading branch information
jengelh authored and behlendorf committed Apr 2, 2013
1 parent a9e86ac commit 83918ae
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
3 changes: 3 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@

ACLOCAL_AMFLAGS = -I config

include $(top_srcdir)/config/rpm.am
include $(top_srcdir)/config/deb.am
include $(top_srcdir)/config/tgz.am
Expand Down
7 changes: 2 additions & 5 deletions autogen.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
#!/bin/sh

aclocal -I config
libtoolize --automake --copy
autoheader
automake --add-missing --include-deps --copy
autoconf
autoreconf -fiv
rm -Rf autom4te.cache
2 changes: 2 additions & 0 deletions config/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@
/install-sh
/ltmain.sh
/missing
/libtool.m4
/lt*.m4
1 change: 1 addition & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ AC_INIT
AC_LANG(C)
SPL_AC_META
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([config])
AC_CANONICAL_SYSTEM
AM_MAINTAINER_MODE
AM_SILENT_RULES
Expand Down

0 comments on commit 83918ae

Please sign in to comment.