aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-08-23 09:49:34 +0200
committerChristian Grothoff <christian@grothoff.org>2019-08-23 09:50:08 +0200
commit839005f05580cd4ac00c68ab7bcb93de3817fdec (patch)
tree6816ff98e1971a35a28a4d5fc3fc00ecd3285228 /src
parent78149c8a1658c3685f6d0c3c7784ffc672285585 (diff)
downloadgnunet-839005f05580cd4ac00c68ab7bcb93de3817fdec.tar.gz
gnunet-839005f05580cd4ac00c68ab7bcb93de3817fdec.zip
fix #5829
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am10
-rw-r--r--src/conversation/Makefile.am29
2 files changed, 17 insertions, 22 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 13cca2adc..217aea54f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,14 +36,6 @@ endif
36endif 36endif
37endif 37endif
38 38
39if BUILD_PULSE_HELPERS
40CONVERSATION_DIR = conversation
41else
42if BUILD_GST_HELPERS
43CONVERSATION_DIR = conversation
44endif
45endif
46
47if HAVE_SQLITE 39if HAVE_SQLITE
48 SQLITE_DIR = sq 40 SQLITE_DIR = sq
49endif 41endif
@@ -117,7 +109,7 @@ SUBDIRS = \
117 vpn \ 109 vpn \
118 gns \ 110 gns \
119 zonemaster \ 111 zonemaster \
120 $(CONVERSATION_DIR) \ 112 conversation \
121 fs \ 113 fs \
122 exit \ 114 exit \
123 pt \ 115 pt \
diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am
index cbffc3283..6ad6f68f6 100644
--- a/src/conversation/Makefile.am
+++ b/src/conversation/Makefile.am
@@ -12,11 +12,27 @@ AM_CPPFLAGS = \
12 -I$(top_srcdir)/src/include \ 12 -I$(top_srcdir)/src/include \
13 -I$(top_srcdir) 13 -I$(top_srcdir)
14 14
15if BUILD_CONVERSATION
15lib_LTLIBRARIES = \ 16lib_LTLIBRARIES = \
16 libgnunetmicrophone.la \ 17 libgnunetmicrophone.la \
17 libgnunetspeaker.la \ 18 libgnunetspeaker.la \
18 libgnunetconversation.la 19 libgnunetconversation.la
19 20
21bin_PROGRAMS = \
22 gnunet-conversation-test \
23 gnunet-conversation
24
25libexec_PROGRAMS = \
26 gnunet-service-conversation
27
28check_PROGRAMS = \
29 test_conversation_api \
30 test_conversation_api_reject \
31 test_conversation_api_twocalls
32
33pkgcfg_DATA = conversation.conf
34endif
35
20pkgcfgdir= $(pkgdatadir)/config.d/ 36pkgcfgdir= $(pkgdatadir)/config.d/
21 37
22libexecdir= $(pkglibdir)/libexec/ 38libexecdir= $(pkglibdir)/libexec/
@@ -67,18 +83,6 @@ libgnunetconversation_la_LDFLAGS = \
67 -version-info 0:0:0 83 -version-info 0:0:0
68 84
69 85
70bin_PROGRAMS = \
71 gnunet-conversation-test \
72 gnunet-conversation
73
74libexec_PROGRAMS = \
75 gnunet-service-conversation
76
77check_PROGRAMS = \
78 test_conversation_api \
79 test_conversation_api_reject \
80 test_conversation_api_twocalls
81
82if BUILD_PULSE_HELPERS 86if BUILD_PULSE_HELPERS
83AUDIO_HELPER_RECD=gnunet-helper-audio-record 87AUDIO_HELPER_RECD=gnunet-helper-audio-record
84AUDIO_HELPER_PLAY=gnunet-helper-audio-playback 88AUDIO_HELPER_PLAY=gnunet-helper-audio-playback
@@ -255,6 +259,5 @@ test_conversation_api_reject_LDFLAGS = \
255 $(WINFLAGS) -export-dynamic 259 $(WINFLAGS) -export-dynamic
256 260
257 261
258 pkgcfg_DATA = conversation.conf
259 262
260EXTRA_DIST = test_conversation.conf 263EXTRA_DIST = test_conversation.conf