-indentation, code cleanup

[oweals/gnunet.git] / src / set / Makefile.am

diff --git a/src/set/Makefile.am b/src/set/Makefile.am
index c2449e0ea9747e09c643eb275c607ae6db410603..878ff0cbd722012db46c05fd3c8c64297d3cee99 100644 (file)
--- a/src/set/Makefile.am
+++ b/src/set/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
@@ -50,20 +50,21 @@ gnunet_service_set_SOURCES = \
 gnunet_service_set_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/mesh/libgnunetmesh2.la \
+  $(top_builddir)/src/mesh/libgnunetmesh.la \
   $(GN_LIBINTL)
 
 libgnunetset_la_SOURCES = \
   set_api.c
 libgnunetset_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/stream/libgnunetstream.la \
   $(LTLIBINTL)
 libgnunetset_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)
 
+if HAVE_TESTING
 check_PROGRAMS = \
  test_set_api 
+endif
 
 if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)