diff options
| author | Jörg Frings-Fürst <debian@jff-webhsoting.net> | 2018-11-16 07:16:51 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhsoting.net> | 2018-11-16 07:16:51 +0100 |
| commit | cd9c1ea3e9c54da1a211563736d6f84664058da8 (patch) | |
| tree | f1d883b562a669deb6bfd59b4de27bfaaa63d8a5 /doc/Makefile.in | |
| parent | 71a38df59b7b10358477073c9bc053055aa394ce (diff) | |
| parent | 5ef83547e904e4d411239ea0a27571e7d1a0b5b4 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'doc/Makefile.in')
| -rw-r--r-- | doc/Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/Makefile.in b/doc/Makefile.in index b8bbff5..801fbe3 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -97,7 +97,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/test/config.h +CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = Doxyfile release.sh CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) @@ -136,8 +136,6 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CPPTEST_CFLAGS = @CPPTEST_CFLAGS@ -CPPTEST_LIBS = @CPPTEST_LIBS@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -158,6 +156,8 @@ FGREP = @FGREP@ GENERATE_HTMLHELP = @GENERATE_HTMLHELP@ GRAPHVIZ_CHECK = @GRAPHVIZ_CHECK@ GREP = @GREP@ +GTEST_CFLAGS = @GTEST_CFLAGS@ +GTEST_LIBS = @GTEST_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ |