-disable phone on reconnect

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

diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am
index 913acf9af4af9de1aecd6d6a1c847657ab76064d..43a5a1a06f3fe4f76f6e3a71b6b1e90ac1e6e756 100644 (file)
--- a/src/conversation/Makefile.am
+++ b/src/conversation/Makefile.am
@@ -7,13 +7,6 @@ INCLUDES = \
 AM_CPPFLAGS = \
   $(GNUNET_CPPFLAGS)
 
-# Set this variable if you are using GNUNET libraries for all programs and
-# libraries. You don't then need to target-specific _LDFLAGS with GNUNET_LDFLAGS
-# AM_LDFLAGS = \
-#   $(GNUNET_LDFLAGS) \
-#   $(WINFLAGS) \
-#   -export-dynamic
-
 lib_LTLIBRARIES = \
  libgnunetmicrophone.la \
  libgnunetspeaker.la \
@@ -41,13 +34,11 @@ libgnunetspeaker_la_LDFLAGS = \
 
 
 libgnunetconversation_la_SOURCES = \
-  conversation_api.c \
-  conversation_api2.c 
+  conversation_api.c 
 libgnunetconversation_la_LIBADD = \
-  libgnunetmicrophone.la \
-  libgnunetspeaker.la \
   $(top_builddir)/src/gns/libgnunetgns.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/util/libgnunetutil.la 
 
 libgnunetconversation_la_LDFLAGS = \
@@ -57,7 +48,7 @@ libgnunetconversation_la_LDFLAGS = \
 
 bin_PROGRAMS = \
  gnunet-conversation-test \
- gnunet-conversation
+ gnunet-conversation 
 
 libexec_PROGRAMS = \
   gnunet-service-conversation 
@@ -81,7 +72,7 @@ TESTS = $(check_PROGRAMS)
 gnunet_helper_audio_record_SOURCES = \
   gnunet-helper-audio-record.c
 gnunet_helper_audio_record_LDADD = \
-  -lgnunetutil \
+  $(top_builddir)/src/util/libgnunetutil.la \
   -lpulse  -lopus\
   $(INTLLIBS) 
 gnunet_helper_audio_record_LDFLAGS = \
@@ -90,7 +81,7 @@ gnunet_helper_audio_record_LDFLAGS = \
 gnunet_helper_audio_playback_SOURCES = \
   gnunet-helper-audio-playback.c
 gnunet_helper_audio_playback_LDADD = \
-  -lgnunetutil \
+  $(top_builddir)/src/util/libgnunetutil.la \
   -lpulse -lopus\
   $(INTLLIBS) 
 gnunet_helper_audio_playback_LDFLAGS = \
@@ -99,15 +90,25 @@ gnunet_helper_audio_playback_LDFLAGS = \
 gnunet_service_conversation_SOURCES = \
   gnunet-service-conversation.c
 gnunet_service_conversation_LDADD = \
-  -lgnunetutil -lgnunetmesh -lgnunetnamestore -lgnunetgns\
-    $(INTLLIBS) 
+  libgnunetconversation.la \
+  libgnunetspeaker.la \
+  libgnunetmicrophone.la \
+  $(top_builddir)/src/mesh/libgnunetmesh.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(INTLLIBS) 
 gnunet_service_conversation_LDFLAGS = \
   $(GNUNET_LDFLAGS)  $(WINFLAGS) 
 
 gnunet_conversation_SOURCES = \
   gnunet-conversation.c
 gnunet_conversation_LDADD = \
-  -lgnunetutil -lgnunetconversation \
+  libgnunetmicrophone.la \
+  libgnunetspeaker.la \
+  libgnunetconversation.la \
+  $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/identity/libgnunetidentity.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
   $(INTLLIBS) 
 gnunet_conversation_LDFLAGS = \
  $(GNUNET_LDFLAGS) $(WINFLAGS) 
@@ -126,8 +127,8 @@ gnunet_conversation_test_LDFLAGS = \
 test_conversation_api_SOURCES = \
  test_conversation_api.c
 test_conversation_api_LDADD = \
-  $(top_builddir)/src/conversation/libgnunetconversation.la \
-  -lgnunetutil
+  libgnunetconversation.la \
+  $(top_builddir)/src/util/libgnunetutil.la 
 test_conversation_api_LDFLAGS = \
  $(GNUNET_LDFLAGS)  $(WINFLAGS) -export-dynamic