diff options
| author | Anthony G. Basile <blueness@gentoo.org> | 2015-03-07 11:16:54 -0500 |
|---|---|---|
| committer | Dan Pasanen <dan.pasanen@gmail.com> | 2015-11-12 09:37:17 -0600 |
| commit | ebf25ff6ab2f99390c3610cc7df9cdffba9208bd (patch) | |
| tree | fecd81f94bbe7010abffd5976f25f8ca24c7e117 | |
| parent | a193072dd426356fdeb6109d20226f26d56fe450 (diff) | |
| download | android_external_f2fs-tools-ebf25ff6ab2f99390c3610cc7df9cdffba9208bd.tar.gz android_external_f2fs-tools-ebf25ff6ab2f99390c3610cc7df9cdffba9208bd.tar.bz2 android_external_f2fs-tools-ebf25ff6ab2f99390c3610cc7df9cdffba9208bd.zip | |
f2fs-tools: fix build system to make distcheck correctly
The current build system fails to `make distcheck` correctly
for two reasons: 1) Some header files are not listed in the
source files for fsck.f2fs and mkfs.f2fs, and so don't make it
into the dist tarball. 2) By setting a default prefix in
configure.ac, the mock install doesn't add the correct prefix
and instead tries to install directly to the file system.
This patch corrects those problems and also adds an autogen.sh
script for convenience.
Change-Id: I0d169a4114664465ce6722707ecfaece65ae157b
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | autogen.sh | 7 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | fsck/Makefile.am | 2 | ||||
| -rw-r--r-- | mkfs/Makefile.am | 2 |
4 files changed, 13 insertions, 6 deletions
diff --git a/autogen.sh b/autogen.sh new file mode 100644 index 0000000..2b0945d --- /dev/null +++ b/autogen.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +aclocal && \ +autoheader && \ +autoconf && \ +libtoolize && \ +automake -a -c diff --git a/configure.ac b/configure.ac index ae451b8..7c54808 100644 --- a/configure.ac +++ b/configure.ac @@ -76,10 +76,10 @@ AS_IF([test "$ac_cv_header_byteswap_h" = "yes"], [AC_CHECK_DECLS([bswap_64],,,[#include <byteswap.h>])]) # Install directories -AC_PREFIX_DEFAULT([/usr]) -AC_SUBST([sbindir], [/sbin]) -AC_SUBST([sysconfdir], [/etc]) -AC_SUBST([localstatedir], [/var]) +#AC_PREFIX_DEFAULT([/usr]) +#AC_SUBST([sbindir], [/sbin]) +#AC_SUBST([sysconfdir], [/etc]) +#AC_SUBST([localstatedir], [/var]) AC_CONFIG_FILES([ Makefile man/Makefile diff --git a/fsck/Makefile.am b/fsck/Makefile.am index 3258e47..6c19e11 100644 --- a/fsck/Makefile.am +++ b/fsck/Makefile.am @@ -3,7 +3,7 @@ AM_CPPFLAGS = ${libuuid_CFLAGS} -I$(top_srcdir)/include AM_CFLAGS = -Wall sbin_PROGRAMS = fsck.f2fs -fsck_f2fs_SOURCES = main.c fsck.c dump.c mount.c +fsck_f2fs_SOURCES = main.c fsck.c dump.c mount.c f2fs.h fsck.h $(top_srcdir)/include/f2fs_fs.h fsck_f2fs_LDADD = ${libuuid_LIBS} $(top_builddir)/lib/libf2fs.la install-data-hook: diff --git a/mkfs/Makefile.am b/mkfs/Makefile.am index fa48699..7343f23 100644 --- a/mkfs/Makefile.am +++ b/mkfs/Makefile.am @@ -3,5 +3,5 @@ AM_CPPFLAGS = ${libuuid_CFLAGS} -I$(top_srcdir)/include AM_CFLAGS = -Wall -DWITH_BLKDISCARD sbin_PROGRAMS = mkfs.f2fs -mkfs_f2fs_SOURCES = f2fs_format_main.c f2fs_format.c f2fs_format_utils.c +mkfs_f2fs_SOURCES = f2fs_format_main.c f2fs_format.c f2fs_format_utils.c f2fs_format_utils.h $(top_srcdir)/include/f2fs_fs.h mkfs_f2fs_LDADD = ${libuuid_LIBS} $(top_builddir)/lib/libf2fs.la |