Merge branch 'master' of ssh://gits.daterainc.com:2984/project/2013.MAIN/bcache-tools

Conflicts:
	.gitignore

.gitignore

@@ -5,3 +5,16 @@ probe-bcache
 *.o
 tags
 cscope*
+Makefile.in
+aclocal.m4
+autom4te.cache
+compile
+config.guess
+config.h.in
+config.sub
+configure
+depcomp
+install-sh
+ltmain.sh
+m4
+missing

Makefile.am

@@ -0,0 +1,37 @@
+
+AUTOMAKE_OPTIONS=subdir-objects
+
+PREFIX=/usr
+AM_CFLAGS=-O2 -Wall -g
+
+
+bin_PROGRAMS=make-bcache \
+	     probe-bcache \
+	     bcache-super-show
+
+noinst_PROGRAMS=bcache-test
+
+make_bcache_SOURCES=make-bcache.c bcache.c
+make_bcache_LDADD= -lm -lssl -lcrypto -luuid
+
+probe_bcache_SOURCES=probe-bcache.c bcache.c
+probe_bcache_LDADD=-luuid
+
+bcache_super_show_SOURCES=bcache-super-show.c bcache.c
+bcache_super_show_LDADD=-luuid
+
+bcache_test_SOURCE=bcache-test.c
+bcache_test_LDADD= -lm -lssl -lcrypto
+
+udevrule_DATA=61-bcache.rules
+udevruledir=$(prefix)/lib/udev/rules.d
+
+udevr_DATA=bcache-register
+udevrdir=$(prefix)/lib/udev/
+
+initramfs_SCRIPTS=initramfs/bcache
+initramfsdir=$(prefix)/etc/initramfs-tools/hooks/
+
+man8_MANS= bcache-super-show.8 \
+	   make-bcache.8 \
+	   probe-bcache.8

autogen.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+export ACLOCAL_FLAGS=""
+export ACLOCAL_AMFLAGS="-I m4"
+
+aclocal $ACLOCAL_FLAGS
+
+if glibtoolize -h > /dev/null 2>&1 ; then
+   glibtoolize --copy --force
+else
+   libtoolize --copy --force
+fi
+
+autoheader
+automake --copy --add-missing --foreign -Wall -Wno-portability
+autoconf

configure.ac

@@ -0,0 +1,24 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.61)
+AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
+AM_INIT_AUTOMAKE
+LT_INIT
+AC_CONFIG_HEADER([config.h])
+AC_CONFIG_MACRO_DIR([m4])
+
+# Checks for programs.
+AC_PROG_CC
+
+
+# Checks for libraries.
+
+# Checks for header files.
+
+# Checks for typedefs, structures, and compiler characteristics.
+
+# Checks for library functions.
+
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT