mirror of
https://github.com/paboyle/Grid.git
synced 2026-10-17 13:03:18 +01:00
Merge remote-tracking branch 'upstream/master'
Conflicts: Makefile.in
This commit is contained in:
commit
b99f2279c3
13 files changed
+1169
-356
No files matched your search
+1
-9
@@ -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
|
||||
Reference in new issue
Block a user