projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merging Trond
[m6w6/libmemcached]
/
unittests
/
include.am
diff --git
a/unittests/include.am
b/unittests/include.am
index fc67e93762e7bde86dc62adc2d1ef33aaf816376..6c2172088f5ea3da309e50ec0b23cdf55900d063 100644
(file)
--- a/
unittests/include.am
+++ b/
unittests/include.am
@@
-3,21
+3,18
@@
# All paths should be given relative to the root
if HAVE_LIBGTEST
# All paths should be given relative to the root
if HAVE_LIBGTEST
-UNITTEST_PROGRAM= unittests/unittests
-
-noinst_PROGRAMS += $(UNITTEST_PROGRAM)
+check_PROGRAMS += unittests/unittests
+endif
unittests_unittests_SOURCES= \
unittests_unittests_SOURCES= \
- unittests/strings.cc \
- unittests/main.cc
+ unittests/main.cc \
+ unittests/strings.cc
+
+unittests_unittest_CXXFLAGS= ${AM_CXXFLAGS} ${NO_WERROR}
unittests_unittests_LDADD= \
tests/libserver.la \
libmemcached/libmemcachedinternal.la \
${TESTS_LDADDS} ${LTLIBGTEST}
unittests_unittests_LDADD= \
tests/libserver.la \
libmemcached/libmemcachedinternal.la \
${TESTS_LDADDS} ${LTLIBGTEST}
-endif
-
# Shorthand
# Shorthand
-unit:
unittests-run
+unit:
check-TESTS
-unittests-run: $(UNITTEST_PROGRAM)
- $(UNITTEST_PROGRAM)