diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-10-03 09:14:02 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-10-10 08:23:33 +1000 |
| commit | d4873441a0afc083963a392ad422e3187e60a159 (patch) | |
| tree | 61c064cc0152eb85968e08fd67ac134be0fc009a /Makefile.am | |
| parent | 34847188b63dccf3a9c2f49242eb42b5b3e9d642 (diff) | |
Fix up build system to use the googletest import build
Drop the CHECK_GTEST macro, we can assume it's there now. We
still build the gtest bits as convenience libraries, leave the various flags
in there.
Add $includedir/xorg to pgkconfig CPPFLAGS, as we install gtest.h in
includedir/xorg/gtest/gtest.h to avoid overwriting or conflicts with a
system-installed gtest.h
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@ubuntu.com>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index b984c8e..d2fdbb0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ # SOFTWARE. # -SUBDIRS = aclocal data doc include src examples test +SUBDIRS = aclocal data doc include src examples test gtest pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xorg-gtest.pc |