Merge remote-tracking branch 'upstream/master'

Conflicts:
	Makefile.in
This commit is contained in:
neo committed 2015-05-27 10:41:33 +09:00
commit b99f2279c3
13 files changed
+1169 -356

No files matched your search

+1 -9
View File
@@ -1,11 +1,3 @@
# additional include paths necessary to compile the C++ library
AM_CXXFLAGS = -I$(top_srcdir)/
SUBDIRS = lib tests benchmarks docs
if DOXYGEN_DOC
directory = $(top_srcdir)/docs/
doxyfile:
(cd $(directory) && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
endif
SUBDIRS = lib tests benchmarks