-avoid use after free

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

diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am
index d336d93e6ec61fd2eb5ca9d895d2034f212fcbb2..e408460984278a473b5851a834917e547e6329c4 100644 (file)
--- a/src/conversation/Makefile.am
+++ b/src/conversation/Makefile.am
@@ -1,18 +1,11 @@
 SUBDIRS = .
 
-INCLUDES = \
-  -I$(top_srcdir)/src/include \
-  -I$(top_srcdir)
+plugindir = $(libdir)/gnunet
 
 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
+  $(GNUNET_CPPFLAGS) \
+  -I$(top_srcdir)/src/include \
+  -I$(top_srcdir)
 
 lib_LTLIBRARIES = \
  libgnunetmicrophone.la \
@@ -23,18 +16,31 @@ pkgcfgdir= $(prefix)/share/gnunet/config.d/
 
 libexecdir= $(prefix)/lib/gnunet/libexec/
 
+plugin_LTLIBRARIES = \
+  libgnunet_plugin_gnsrecord_conversation.la
+
+
+libgnunet_plugin_gnsrecord_conversation_la_SOURCES = \
+  plugin_gnsrecord_conversation.c
+libgnunet_plugin_gnsrecord_conversation_la_LIBADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(LTLIBINTL)
+libgnunet_plugin_gnsrecord_conversation_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+
 libgnunetmicrophone_la_SOURCES = \
-  microphone.c 
+  microphone.c
 libgnunetmicrophone_la_LIBADD = \
-  -lgnunetutil
+ $(top_builddir)/src/util/libgnunetutil.la
 libgnunetmicrophone_la_LDFLAGS = \
   $(GNUNET_LDFLAGS)  $(WINFLAGS) \
   -version-info 0:0:0
 
 libgnunetspeaker_la_SOURCES = \
-  speaker.c 
+  speaker.c
 libgnunetspeaker_la_LIBADD = \
-  -lgnunetutil
+ $(top_builddir)/src/util/libgnunetutil.la
 libgnunetspeaker_la_LDFLAGS = \
   $(GNUNET_LDFLAGS)  $(WINFLAGS) \
   -version-info 0:0:0
@@ -42,12 +48,13 @@ libgnunetspeaker_la_LDFLAGS = \
 
 libgnunetconversation_la_SOURCES = \
   conversation_api.c \
-  conversation_api2.c 
+  conversation_api_call.c
 libgnunetconversation_la_LIBADD = \
   $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la
 
 libgnunetconversation_la_LDFLAGS = \
   $(GNUNET_LDFLAGS)  $(WINFLAGS) \
@@ -56,12 +63,10 @@ libgnunetconversation_la_LDFLAGS = \
 
 bin_PROGRAMS = \
  gnunet-conversation-test \
- gnunet-conversation \
- gnunet-conversation-new
+ gnunet-conversation
 
 libexec_PROGRAMS = \
-  gnunet-service-conversation \
-  gnunet-service-conversation-new 
+  gnunet-service-conversation
 
 if HAVE_PULSE
 if HAVE_OPUS
@@ -72,74 +77,59 @@ endif
 endif
 
 
-
 check_PROGRAMS = \
- test_conversation_api 
+ test_conversation_api
 
+if HAVE_PULSE
+if HAVE_OPUS
 TESTS = $(check_PROGRAMS)
-
+endif
+endif
 
 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) 
+  $(INTLLIBS)
 gnunet_helper_audio_record_LDFLAGS = \
-  $(GNUNET_LDFLAGS)  $(WINFLAGS) 
+  $(GNUNET_LDFLAGS)  $(WINFLAGS)
 
 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) 
+  $(INTLLIBS)
 gnunet_helper_audio_playback_LDFLAGS = \
-  $(GNUNET_LDFLAGS)  $(WINFLAGS) 
+  $(GNUNET_LDFLAGS)  $(WINFLAGS)
 
 gnunet_service_conversation_SOURCES = \
   gnunet-service-conversation.c
 gnunet_service_conversation_LDADD = \
-  -lgnunetutil -lgnunetmesh -lgnunetnamestore -lgnunetgns\
-    $(INTLLIBS) 
-gnunet_service_conversation_LDFLAGS = \
-  $(GNUNET_LDFLAGS)  $(WINFLAGS) 
-
-gnunet_service_conversation_new_SOURCES = \
-  gnunet-service-conversation-new.c
-gnunet_service_conversation_new_LDADD = \
   libgnunetconversation.la \
   libgnunetspeaker.la \
   libgnunetmicrophone.la \
   $(top_builddir)/src/mesh/libgnunetmesh.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(INTLLIBS) 
-
-gnunet_service_conversation_new_LDFLAGS = \
-  $(GNUNET_LDFLAGS)  $(WINFLAGS) 
+  $(INTLLIBS)
+gnunet_service_conversation_LDFLAGS = \
+  $(GNUNET_LDFLAGS)  $(WINFLAGS)
 
 gnunet_conversation_SOURCES = \
   gnunet-conversation.c
 gnunet_conversation_LDADD = \
-  libgnunetconversation.la \
-  -lgnunetutil \
-  $(INTLLIBS) 
-gnunet_conversation_LDFLAGS = \
- $(GNUNET_LDFLAGS) $(WINFLAGS) 
-
-gnunet_conversation_new_SOURCES = \
-  gnunet-conversation-new.c
-gnunet_conversation_new_LDADD = \
   libgnunetmicrophone.la \
   libgnunetspeaker.la \
   libgnunetconversation.la \
   $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(INTLLIBS) 
-gnunet_conversation_new_LDFLAGS = \
- $(GNUNET_LDFLAGS) $(WINFLAGS) 
+  $(INTLLIBS)
+gnunet_conversation_LDFLAGS = \
+ $(GNUNET_LDFLAGS) $(WINFLAGS)
 
 gnunet_conversation_test_SOURCES = \
   gnunet-conversation-test.c
@@ -147,17 +137,17 @@ gnunet_conversation_test_LDADD = \
   libgnunetmicrophone.la \
   libgnunetspeaker.la \
   $(top_builddir)/src/util/libgnunetutil.la  \
-  $(INTLLIBS) 
+  $(INTLLIBS)
 gnunet_conversation_test_LDFLAGS = \
- $(GNUNET_LDFLAGS) $(WINFLAGS) 
+ $(GNUNET_LDFLAGS) $(WINFLAGS)
 
 
 test_conversation_api_SOURCES = \
  test_conversation_api.c
 test_conversation_api_LDADD = \
   libgnunetconversation.la \
-  -lgnunetutil
+  $(top_builddir)/src/util/libgnunetutil.la
 test_conversation_api_LDFLAGS = \
  $(GNUNET_LDFLAGS)  $(WINFLAGS) -export-dynamic
 
- pkgcfg_DATA = conversation.conf 
+ pkgcfg_DATA = conversation.conf