diff --git a/ftk/configure.ac b/ftk/configure.ac
index c297927..3f0e550 100644
--- a/ftk/configure.ac
+++ b/ftk/configure.ac
@@ -7,7 +7,7 @@ AM_INIT_AUTOMAKE([-Wall -Werror])
 LT_PREREQ([2.2])
 LT_INIT([dlopen])
 
-AC_LANG(C++)
+AC_LANG([C++])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([src/flaimtk.h])
@@ -154,3 +154,4 @@ echo "
   Linker.........: $LD $LDFLAGS $LIBS
   Doxygen........: ${DOXYGEN:-NONE}
 "
+
diff --git a/xflaim/src/Makefile.am b/xflaim/src/Makefile.am
index 7b16a83..25129b2 100644
--- a/xflaim/src/Makefile.am
+++ b/xflaim/src/Makefile.am
@@ -1,11 +1,11 @@
 if HAVE_JAVA
   JAVADIR = java
-  JNI_LIBADD=java/libxfjni.la
+  JNI_LIBADD = java/libxfjni.la
 endif
 
 if HAVE_CSHARP
   CSDIR = cs
-  CSI_LIBADD=cs/libxfcsi.la
+  CSI_LIBADD = cs/libxfcsi.la
 endif
 
 SUBDIRS = $(JAVADIR) $(CSDIR)
diff --git a/xflaim/src/cs/Makefile.am b/xflaim/src/cs/Makefile.am
index 13b8cca..a4e19de 100644
--- a/xflaim/src/cs/Makefile.am
+++ b/xflaim/src/cs/Makefile.am
@@ -17,3 +17,4 @@ libxfcsi_la_SOURCES = \
  Query.cpp
 
 libxfcsi_la_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)
+
diff --git a/xflaim/src/cs/wrapper/Makefile.am b/xflaim/src/cs/wrapper/Makefile.am
index 528b997..2a8826d 100644
--- a/xflaim/src/cs/wrapper/Makefile.am
+++ b/xflaim/src/cs/wrapper/Makefile.am
@@ -95,3 +95,4 @@ cstest_script: cstest.exe libxflaim.so
 	echo "#!/bin/sh" > cstest_script
 	echo "$(CSVM) cstest.exe" >> cstest_script
 	chmod 0755 cstest_script
+
diff --git a/xflaim/src/java/wrapper/Makefile.am b/xflaim/src/java/wrapper/Makefile.am
index e368338..ff47de9 100644
--- a/xflaim/src/java/wrapper/Makefile.am
+++ b/xflaim/src/java/wrapper/Makefile.am
@@ -92,3 +92,4 @@ dist_noinst_JAVA = \
  $(pkgpath)/UTransStats.java \
  $(pkgpath)/XFlaimException.java \
  $(pkgpath)/XPathAxis.java
+