Update .gitignore

Fixes #22

3 files changed, 129 insertions, 16 deletions

diff --git a/.gitignore b/.gitignore
index 0754cd6..4333a9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,5 @@
-*.class
-*.log
-
 # sbt specific
-dist/*
 target/
-lib_managed/
-src_managed/
-project/boot/
-project/plugins/project/
 
 # Scala-IDE specific
 .settings
@@ -23,10 +15,6 @@ project/plugins/project/
 
 # Native
 lib_native/
-*.o
-*.so*
-*.jnilib
-*.dylib
 
 # Temporary files
 *~
diff --git a/flow-native/src/.gitignore b/flow-native/src/.gitignore
index b8d894c..e50ccf1 100644
--- a/flow-native/src/.gitignore
+++ b/flow-native/src/.gitignore
@@ -1,3 +1,4 @@
+# Autotools
 /autom4te.cache
 /libtool
 /aclocal.m4
@@ -14,11 +15,12 @@
 /missing
 /stamp-h1
 /compile
-/m4
+/m4/*
 !/m4/ax_jni_include_dir.m4
-
 Makefile.in
 Makefile
+
+# Binary files
 .deps
 .libs
 *.o
@@ -27,5 +29,4 @@ Makefile
 *.so*
 *.dylib
 *.a
-*~
-
+*~
\ No newline at end of file
diff --git a/flow-native/src/m4/ax_jni_include_dir.m4 b/flow-native/src/m4/ax_jni_include_dir.m4
new file mode 100644
index 0000000..159e4a1
--- /dev/null
+++ b/flow-native/src/m4/ax_jni_include_dir.m4
@@ -0,0 +1,124 @@
+# ===========================================================================
+#    http://www.gnu.org/software/autoconf-archive/ax_jni_include_dir.html
+# ===========================================================================
+a#
+# SYNOPSIS
+#
+#   AX_JNI_INCLUDE_DIR
+#
+# DESCRIPTION
+#
+#   AX_JNI_INCLUDE_DIR finds include directories needed for compiling
+#   programs using the JNI interface.
+#
+#   JNI include directories are usually in the Java distribution. This is
+#   deduced from the value of $JAVA_HOME, $JAVAC, or the path to "javac", in
+#   that order. When this macro completes, a list of directories is left in
+#   the variable JNI_INCLUDE_DIRS.
+#
+#   Example usage follows:
+#
+#     AX_JNI_INCLUDE_DIR
+#
+#     for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS
+#     do
+#             CPPFLAGS="$CPPFLAGS -I$JNI_INCLUDE_DIR"
+#     done
+#
+#   If you want to force a specific compiler:
+#
+#   - at the configure.in level, set JAVAC=yourcompiler before calling
+#   AX_JNI_INCLUDE_DIR
+#
+#   - at the configure level, setenv JAVAC
+#
+#   Note: This macro can work with the autoconf M4 macros for Java programs.
+#   This particular macro is not part of the original set of macros.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Don Anderson <dda@sleepycat.com>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 10
+
+AU_ALIAS([AC_JNI_INCLUDE_DIR], [AX_JNI_INCLUDE_DIR])
+AC_DEFUN([AX_JNI_INCLUDE_DIR],[
+
+JNI_INCLUDE_DIRS=""
+
+if test "x$JAVA_HOME" != x; then
+    _JTOPDIR="$JAVA_HOME"
+else
+    if test "x$JAVAC" = x; then
+        JAVAC=javac
+    fi
+    AC_PATH_PROG([_ACJNI_JAVAC], [$JAVAC], [no])
+    if test "x$_ACJNI_JAVAC" = xno; then
+        AC_MSG_ERROR([cannot find JDK; try setting \$JAVAC or \$JAVA_HOME])
+    fi
+    _ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC")
+    _JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'`
+fi
+
+_JINC="$_JTOPDIR/include"
+
+_AS_ECHO_LOG([_JTOPDIR=$_JTOPDIR])
+_AS_ECHO_LOG([_JINC=$_JINC])
+
+# On Mac OS X 10.6.4, jni.h is a symlink:
+# /System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers/jni.h
+# -> ../../CurrentJDK/Headers/jni.h.
+AC_CHECK_FILE([$_JINC/jni.h],
+    [JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $_JINC"],
+    [_JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`
+     AC_CHECK_FILE([$_JTOPDIR/include/jni.h],
+        [JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $_JTOPDIR/include"],
+                AC_MSG_ERROR([cannot find JDK header files]))
+    ])
+
+# get the likely subdirectories for system specific java includes
+case "$host_os" in
+bsdi*)          _JNI_INC_SUBDIRS="bsdos";;
+freebsd*)       _JNI_INC_SUBDIRS="freebsd";;
+linux*)         _JNI_INC_SUBDIRS="linux genunix";;
+osf*)           _JNI_INC_SUBDIRS="alpha";;
+solaris*)       _JNI_INC_SUBDIRS="solaris";;
+mingw*)     _JNI_INC_SUBDIRS="win32";;
+cygwin*)    _JNI_INC_SUBDIRS="win32";;
+darwin*)    _JNI_INC_SUBDIRS="darwin";;
+*)              _JNI_INC_SUBDIRS="genunix";;
+esac
+
+# add any subdirectories that are present
+for JINCSUBDIR in $_JNI_INC_SUBDIRS
+do
+    if test -d "$_JTOPDIR/include/$JINCSUBDIR"; then
+         JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $_JTOPDIR/include/$JINCSUBDIR"
+    fi
+done
+])
+
+# _ACJNI_FOLLOW_SYMLINKS <path>
+# Follows symbolic links on <path>,
+# finally setting variable _ACJNI_FOLLOWED
+# ----------------------------------------
+AC_DEFUN([_ACJNI_FOLLOW_SYMLINKS],[
+# find the include directory relative to the javac executable
+_cur="$1"
+while ls -ld "$_cur" 2>/dev/null | grep " -> " >/dev/null; do
+        AC_MSG_CHECKING([symlink for $_cur])
+        _slink=`ls -ld "$_cur" | sed 's/.* -> //'`
+        case "$_slink" in
+        /*) _cur="$_slink";;
+        # 'X' avoids triggering unwanted echo options.
+        *) _cur=`echo "X$_cur" | sed -e 's/^X//' -e 's:[[^/]]*$::'`"$_slink";;
+        esac
+        AC_MSG_RESULT([$_cur])
+done
+_ACJNI_FOLLOWED="$_cur"
+])# _ACJNI