Merge branch 'develop' into feature/gpu-port

This commit is contained in:
Peter Boyle committed 2018-12-13 05:11:34 +00:00
commit b57a4d32aa
647 files changed
+49155 -11160

No files matched your search

+2 -3
View File
@@ -1,17 +1,16 @@
# additional include paths necessary to compile the C++ library
SUBDIRS = lib benchmarks tests extras
SUBDIRS = Grid Hadrons benchmarks tests
include $(top_srcdir)/doxygen.inc
bin_SCRIPTS=grid-config
.PHONY: bench check tests doxygen-run doxygen-doc $(DX_PS_GOAL) $(DX_PDF_GOAL)
tests-local: all
bench-local: all
check-local: all
AM_CXXFLAGS += -I$(top_builddir)/include
AM_CXXFLAGS += -I$(top_builddir)
ACLOCAL_AMFLAGS = -I m4