1
0
mirror of https://github.com/paboyle/Grid.git synced 2025-06-13 04:37:05 +01:00

Merge remote-tracking branch 'upstream/master'

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

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