using standard name

.gitignore

@@ -6,7 +6,9 @@ js-*.h
 
 .libev-build-64
 .v8-build-64
+.icu-build-64
 .setup-js-directories
+
 Makefile
 Makefile.in
 aclocal.m4
@@ -16,10 +18,14 @@ config.log
 config.status
 
 Documentation/arango.template
+UnitTests/HttpInterface/logs/
+UnitTests/basics_suite
+UnitTests/geo_suite
 arangod/Ahuacatl/ahuacatl-grammar.c
 arangod/Ahuacatl/ahuacatl-grammar.h
 arangod/Ahuacatl/ahuacatl-grammar.output
 arangod/Ahuacatl/ahuacatl-tokens.c
+bin/
 config/config.guess
 config/config.h
 config/config.sub
@@ -29,7 +35,10 @@ configure
 etc/arangodb/arangod.conf
 etc/arangodb/arangoirb.conf
 etc/arangodb/arangosh.conf
+js/common/bootstrap/errors.js
 lib/BasicsC/local-configuration.h
 lib/BasicsC/stamp-h2
+lib/BasicsC/voc-errors.c
+lib/BasicsC/voc-errors.h
 lib/JsonParser/json-parser.c
 lib/V8/v8-json.cpp

3rdParty/.gitignore

@@ -1 +1,23 @@
+*.ao
+*.d
+*.1
+*.8
+*.pc
+
 libev/BUILD
+
+icu/BUILD
+icu/source/bin/
+icu/source/common/svchook.mk
+icu/source/config/Makefile.inc
+icu/source/config/icu-config
+icu/source/config/pkgdata.inc
+icu/source/config/pkgdataMakefile
+icu/source/data/icupkg.inc
+icu/source/data/out/
+icu/source/data/pkgdataMakefile
+icu/source/extra/uconv/pkgdataMakefile
+icu/source/icudefs.mk
+icu/source/test/testdata/pkgdataMakefile
+icu/source/tools/gentest/gentest
+icu/source/tools/icuinfo/icuinfo

Makefile.am

@@ -281,22 +281,26 @@ include UnitTests/Makefile.files
 ### @brief error code file
 ################################################################################
 
-.PHONY: errorfiles
-
 if ENABLE_MAINTAINER_MODE
 
-errorfiles: lib/BasicsC/errors.dat
-	@top_srcdir@/config/build_errorfile.sh @top_srcdir@/config/generateErrorfile.py lib/BasicsC/errors.dat lib/BasicsC/voc-errors.h
-	@top_srcdir@/config/build_errorfile.sh @top_srcdir@/config/generateErrorfile.py lib/BasicsC/errors.dat lib/BasicsC/voc-errors.c
-	@top_srcdir@/config/build_errorfile.sh @top_srcdir@/config/generateErrorfile.py lib/BasicsC/errors.dat js/common/bootstrap/errors.js
-
 BUILT_SOURCES += \
-	errorfiles
+	@top_srcdir@/lib/BasicsC/voc-errors.h \
+	@top_srcdir@/lib/BasicsC/voc-errors.c \
+	@top_srcdir@/js/common/bootstrap/errors.js
 
 CLEANUP += \
-	lib/BasicsC/voc-errors.h \
-	lib/BasicsC/voc-errors.c \
-	js/common/bootstrap/errors.js
+	@top_srcdir@/lib/BasicsC/voc-errors.h \
+	@top_srcdir@/lib/BasicsC/voc-errors.c \
+	@top_srcdir@/js/common/bootstrap/errors.js
+
+@top_srcdir@/lib/BasicsC/voc-errors.h: lib/BasicsC/errors.dat
+	@top_srcdir@/config/build_errorfile.sh @top_srcdir@/config/generateErrorfile.py lib/BasicsC/errors.dat @top_srcdir@/lib/BasicsC/voc-errors.h
+
+@top_srcdir@/lib/BasicsC/voc-errors.c: lib/BasicsC/errors.dat
+	@top_srcdir@/config/build_errorfile.sh @top_srcdir@/config/generateErrorfile.py lib/BasicsC/errors.dat @top_srcdir@/lib/BasicsC/voc-errors.c
+
+@top_srcdir@/js/common/bootstrap/errors.js: lib/BasicsC/errors.dat
+	@top_srcdir@/config/build_errorfile.sh @top_srcdir@/config/generateErrorfile.py lib/BasicsC/errors.dat js/common/bootstrap/errors.js
 
 endif
 
@@ -338,7 +342,7 @@ include Documentation/Makefile.doxygen
 ### @brief javascript
 ################################################################################
 
-include js/Makefile.javascript
+include js/Makefile.files
 
 ################################################################################
 ### @brief mruby

etc/Makefile.files

@@ -9,6 +9,11 @@ BUILT_SOURCES += \
 	etc/arangodb/arangoirb.conf \
 	etc/arangodb/arangosh.conf
 
+CLEANUP += \
+	etc/arangodb/arangod.conf \
+	etc/arangodb/arangoirb.conf \
+	etc/arangodb/arangosh.conf
+
 ################################################################################
 ### @brief config
 ################################################################################