only include the selftest code when we compile in support

client/Makefile.am

@@ -14,6 +14,11 @@ INCLUDES =						\
 	-DVERSION="\"$(VERSION)\"" 			\
 	-DPK_DATA=\"$(pkgdatadir)\"			\
 	-I$(top_srcdir)/libpackagekit			\
+	-I$(top_srcdir)/libselftest			\
+	$(NULL)
+
+SELFTEST_LIBS =						\
+	$(top_builddir)/libselftest/libselftest.la	\
 	$(NULL)
 
 PK_LIBS =						\
@@ -33,6 +38,7 @@ pkcon_LDADD =						\
 	$(GLIB_LIBS)					\
 	$(DBUS_LIBS)					\
 	$(PK_LIBS)					\
+	$(SELFTEST_LIBS)				\
 	$(NULL)
 
 pkmon_SOURCES =						\
@@ -43,6 +49,7 @@ pkmon_LDADD =						\
 	$(GLIB_LIBS)					\
 	$(DBUS_LIBS)					\
 	$(PK_LIBS)					\
+	$(SELFTEST_LIBS)				\
 	$(NULL)
 
 clean-local:

libpackagekit/Makefile.am

@@ -19,6 +19,10 @@ SELFTEST_LIBS =							\
 	$(top_builddir)/libselftest/libselftest.la		\
 	$(NULL)
 
+PK_LIBS =							\
+	$(top_builddir)/libpackagekit/libpackagekit.la		\
+	$(NULL)
+
 lib_LTLIBRARIES =						\
 	libpackagekit.la					\
 	$(NULL)
@@ -68,7 +72,7 @@ libpackagekit_la_SOURCES =					\
 	pk-polkit-client.h					\
 	$(NULL)
 
-if HAVE_NETWORKMANAGER
+if PK_BUILD_NETWORKMANAGER
 libpackagekit_la_SOURCES +=					\
 	pk-network-nm.c						\
 	$(NULL)
@@ -85,10 +89,17 @@ libpackagekit_la_LIBADD =					\
 	$(LIBNM_LIBS)						\
 	$(NULL)
 
+if PK_BUILD_TESTS
+libpackagekit_la_LIBADD +=					\
+	$(SELFTEST_LIBS)					\
+	$(NULL)
+endif
+
 libpackagekit_la_LDFLAGS =					\
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	\
 	$(NULL)
 
+if PK_BUILD_TESTS
 check_PROGRAMS =						\
 	pk-self-test
 
@@ -96,18 +107,6 @@ noinst_PROGRAMS =						\
 	pk-self-test
 
 pk_self_test_SOURCES =						\
-	pk-debug.c						\
-	pk-debug.h						\
-	pk-enum.h						\
-	pk-enum.c						\
-	pk-common.h						\
-	pk-common.c						\
-	pk-enum-list.h						\
-	pk-enum-list.c						\
-	pk-package-id.h						\
-	pk-package-id.c						\
-	pk-package-list.h					\
-	pk-package-list.c					\
 	pk-self-test.c						\
 	$(NULL)
 
@@ -118,8 +117,8 @@ pk_self_test_LDADD =						\
 	$(PK_LIBS)						\
 	$(NULL)
 
-pk_self_test_CPPFLAGS=	\
-	-DPK_BUILD_TESTS
+TESTS = pk-self-test
+endif
 
 EXTRA_DIST =							\
 	pk-marshal.list
@@ -142,5 +141,3 @@ clean-local:
 
 CLEANFILES = $(BUILT_SOURCES)
 
-TESTS = pk-self-test
-

src/Makefile.am

@@ -84,6 +84,7 @@ packagekitd_LDADD =					\
 	$(SQLITE_LIBS)					\
 	$(PK_LIBS)					\
 	$(POLKIT_LIBS)					\
+	$(SELFTEST_LIBS)				\
 	$(NULL)
 
 if BACKEND_TYPE_BOX
@@ -120,6 +121,8 @@ pk-interface.h: pk-interface.xml
 		--output=pk-interface.h	\
 		$(srcdir)/pk-interface.xml
 
+if PK_BUILD_TESTS
+
 check_PROGRAMS =					\
 	pk-self-test
 
@@ -156,8 +159,8 @@ pk_self_test_LDADD =					\
 	$(POLKIT_LIBS)					\
 	$(NULL)
 
-pk_self_test_CPPFLAGS=	\
-	-DPK_BUILD_TESTS
+TESTS = pk-self-test
+endif
 
 EXTRA_DIST =						\
 	pk-marshal.list					\
@@ -172,8 +175,6 @@ clean-local:
 
 CLEANFILES = $(BUILT_SOURCES)
 
-TESTS = pk-self-test
-
 MAINTAINERCLEANFILES =					\
 	*~			      			\
 	Makefile.in					\