X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=unittests%2Finclude.am;h=b7ca5d2653cdeec64925eb07dc75257ec8834dbe;hb=dac169cdb8e544f5967bb8d22f229b49d78afa9a;hp=fc67e93762e7bde86dc62adc2d1ef33aaf816376;hpb=49a02c953ab03f71b819e7a5f68ef7a0e5857544;p=awesomized%2Flibmemcached

diff --git a/unittests/include.am b/unittests/include.am
index fc67e937..b7ca5d26 100644
--- a/unittests/include.am
+++ b/unittests/include.am
@@ -3,21 +3,18 @@
 # 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/strings.cc \
-			     unittests/main.cc
+			     unittests/main.cc \
+			     unittests/strings.cc
+
+unittests_unittests_CXXFLAGS= ${AM_CXXFLAGS} ${NO_WERROR} ${NO_EFF_CXX}
 unittests_unittests_LDADD= \
-			   tests/libserver.la \
+			   libtest/libserver.la \
 			   libmemcached/libmemcachedinternal.la \
 			   ${TESTS_LDADDS} ${LTLIBGTEST}
-endif
-
 # Shorthand
-unit: unittests-run
+unit: check-TESTS
 
-unittests-run: $(UNITTEST_PROGRAM)
-	$(UNITTEST_PROGRAM)