diff --git a/.gitignore b/.gitignore
index 0e6e534..c068ffd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,14 +7,6 @@ sites/*/files
 sites/*/private
 
 # Ignore default text files
-robots.txt
-/CHANGELOG.txt
-/COPYRIGHT.txt
-/INSTALL*.txt
-/LICENSE.txt
-/MAINTAINERS.txt
-/UPGRADE.txt
-/README.txt
 .deps
 config
 /AUTHORS
@@ -27,5 +19,12 @@ Makefile.in
 aclocal.m4
 autom4te.cache
 config.h.in
+config.log
 configure
 m4
+config.h
+config.status
+libtool
+stamp-h1
+# Ignore backup files
+*~
\ No newline at end of file
diff --git a/Makefile.am b/Makefile.am
index d189226..7f8c7ea 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,8 @@
 pkgconfig_DATA = pipecolors.pc
-AM_CXXFLAGS = -std=c++11 -fPIC -pipe
-ACLOCAL_AMFLAGS = -I m4
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
+
+AM_CXXFLAGS =+ -std=c++11 -fPIC -pipe
+ACLOCAL_AMFLAGS =+ -I m4
+LIBTOOL_DEPS += @LIBTOOL_DEPS@
 libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status libtool
 
diff --git a/configure.ac b/configure.ac
index 087410c..36e4688 100755
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,8 @@ gcc_micro_vers=`echo ${gcc_full_vers} | cut -f3 -d.`
 # Checks for functions
 
 AC_CHECK_CXX_ARGUMENT([-std=c++11], [], [AC_MSG_ERROR([C++11 support is required.])])
-
+AC_SUBST([ACLOCAL_AMFLAGS])
+AC_SUBST([AM_CXXFLAGS])
 
 AC_MSG_CHECKING([if ${CXX-c++} supports nullptr])
 AC_LINK_IFELSE(