xvine:fixes

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

diff --git a/src/identity/Makefile.am b/src/identity/Makefile.am
index bd73762341ff88b2b50a6c53b6dc761803daaa23..b55817899910c89a77218597ec8bb1d97fbaf9c0 100644 (file)
--- a/src/identity/Makefile.am
+++ b/src/identity/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
@@ -20,13 +20,17 @@ pkgcfg_DATA = \
 lib_LTLIBRARIES = libgnunetidentity.la
 
 libgnunetidentity_la_SOURCES = \
-  identity_api.c identity.h
+  identity_api.c \
+  identity_api_lookup.c \
+  identity.h
 libgnunetidentity_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL) $(XLIB)
 libgnunetidentity_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
   -version-info 0:0:0
+libgnunetidentity_la_DEPENDENCIES = \
+  $(top_builddir)/src/util/libgnunetutil.la 
 
 bin_PROGRAMS = \
  gnunet-identity
@@ -37,21 +41,24 @@ libexec_PROGRAMS = \
 gnunet_service_identity_SOURCES = \
  gnunet-service-identity.c         
 gnunet_service_identity_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
 gnunet_service_identity_DEPENDENCIES = \
-  $(top_builddir)/src/identity/libgnunetidentity.la                             
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la 
 
 gnunet_identity_SOURCES = \
  gnunet-identity.c         
 gnunet_identity_LDADD = \
-  $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  libgnunetidentity.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_service_identity_DEPENDENCIES = \
-  $(top_builddir)/src/identity/libgnunetidentity.la
+gnunet_identity_DEPENDENCIES = \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  libgnunetidentity.la \
+  $(top_builddir)/src/util/libgnunetutil.la 
 
 
 if HAVE_TESTING
@@ -61,26 +68,31 @@ check_PROGRAMS = \
 endif
 
 if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
 TESTS = $(check_PROGRAMS) 
 endif
 
 test_identity_SOURCES = \
  test_identity.c
 test_identity_LDADD = \
-  $(top_builddir)/src/identity/libgnunetidentity.la \
+  libgnunetidentity.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la 
 test_identity_DEPENDENCIES = \
-  $(top_builddir)/src/identity/libgnunetidentity.la
+  libgnunetidentity.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/util/libgnunetutil.la 
 
 test_identity_defaults_SOURCES = \
  test_identity_defaults.c
 test_identity_defaults_LDADD = \
-  $(top_builddir)/src/identity/libgnunetidentity.la \
+  libgnunetidentity.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la 
 test_identity_defaults_DEPENDENCIES = \
-  $(top_builddir)/src/identity/libgnunetidentity.la
+  libgnunetidentity.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/util/libgnunetutil.la 
 
 EXTRA_DIST = \
   test_identity.conf