diff options
| author | Brint E. Kriebel <bekit@cyngn.com> | 2014-11-03 18:57:56 -0800 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-11-03 18:57:56 -0800 |
| commit | f25e7804729d25bcfde575b78b501e06a8cbb708 (patch) | |
| tree | d98e3220a7522671e6ce82a2d40bf878dfa3eccc /lib/Makefile.am | |
| parent | 5668a2234ad79ffd45838679692d10236a3e965f (diff) | |
| parent | 4f5a66a6eb77baa896d3adfb12139a830573f609 (diff) | |
| download | android_external_f2fs-tools-f25e7804729d25bcfde575b78b501e06a8cbb708.tar.gz android_external_f2fs-tools-f25e7804729d25bcfde575b78b501e06a8cbb708.tar.bz2 android_external_f2fs-tools-f25e7804729d25bcfde575b78b501e06a8cbb708.zip | |
Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0
Conflicts:
Android.mk
VERSION
fsck/dump.c
fsck/f2fs.h
fsck/fsck.c
fsck/main.c
fsck/mount.c
include/f2fs_fs.h
include/f2fs_version.h
lib/libf2fs.c
mkfs/Makefile.am
mkfs/f2fs_format.c
mkfs/f2fs_format_utils.c
mkfs/f2fs_format_utils.h
tools/f2fstat.c
tools/fibmap.c
Change-Id: I5cc044a6fe47bac6cab8d845f8d63729f765de50
Diffstat (limited to 'lib/Makefile.am')
| -rw-r--r-- | lib/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 6498df9..a6b304c 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -2,6 +2,6 @@ lib_LTLIBRARIES = libf2fs.la -libf2fs_la_SOURCES = libf2fs.c +libf2fs_la_SOURCES = libf2fs.c libf2fs_io.c libf2fs_la_CFLAGS = -Wall libf2fs_la_CPPFLAGS = -I$(top_srcdir)/include |