diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-08-23 09:49:34 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-08-23 09:50:08 +0200 |
commit | 839005f05580cd4ac00c68ab7bcb93de3817fdec (patch) | |
tree | 6816ff98e1971a35a28a4d5fc3fc00ecd3285228 /src | |
parent | 78149c8a1658c3685f6d0c3c7784ffc672285585 (diff) | |
download | gnunet-839005f05580cd4ac00c68ab7bcb93de3817fdec.tar.gz gnunet-839005f05580cd4ac00c68ab7bcb93de3817fdec.zip |
fix #5829
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 10 | ||||
-rw-r--r-- | src/conversation/Makefile.am | 29 |
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 | |||
36 | endif | 36 | endif |
37 | endif | 37 | endif |
38 | 38 | ||
39 | if BUILD_PULSE_HELPERS | ||
40 | CONVERSATION_DIR = conversation | ||
41 | else | ||
42 | if BUILD_GST_HELPERS | ||
43 | CONVERSATION_DIR = conversation | ||
44 | endif | ||
45 | endif | ||
46 | |||
47 | if HAVE_SQLITE | 39 | if HAVE_SQLITE |
48 | SQLITE_DIR = sq | 40 | SQLITE_DIR = sq |
49 | endif | 41 | endif |
@@ -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 | ||
15 | if BUILD_CONVERSATION | ||
15 | lib_LTLIBRARIES = \ | 16 | lib_LTLIBRARIES = \ |
16 | libgnunetmicrophone.la \ | 17 | libgnunetmicrophone.la \ |
17 | libgnunetspeaker.la \ | 18 | libgnunetspeaker.la \ |
18 | libgnunetconversation.la | 19 | libgnunetconversation.la |
19 | 20 | ||
21 | bin_PROGRAMS = \ | ||
22 | gnunet-conversation-test \ | ||
23 | gnunet-conversation | ||
24 | |||
25 | libexec_PROGRAMS = \ | ||
26 | gnunet-service-conversation | ||
27 | |||
28 | check_PROGRAMS = \ | ||
29 | test_conversation_api \ | ||
30 | test_conversation_api_reject \ | ||
31 | test_conversation_api_twocalls | ||
32 | |||
33 | pkgcfg_DATA = conversation.conf | ||
34 | endif | ||
35 | |||
20 | pkgcfgdir= $(pkgdatadir)/config.d/ | 36 | pkgcfgdir= $(pkgdatadir)/config.d/ |
21 | 37 | ||
22 | libexecdir= $(pkglibdir)/libexec/ | 38 | libexecdir= $(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 | ||
70 | bin_PROGRAMS = \ | ||
71 | gnunet-conversation-test \ | ||
72 | gnunet-conversation | ||
73 | |||
74 | libexec_PROGRAMS = \ | ||
75 | gnunet-service-conversation | ||
76 | |||
77 | check_PROGRAMS = \ | ||
78 | test_conversation_api \ | ||
79 | test_conversation_api_reject \ | ||
80 | test_conversation_api_twocalls | ||
81 | |||
82 | if BUILD_PULSE_HELPERS | 86 | if BUILD_PULSE_HELPERS |
83 | AUDIO_HELPER_RECD=gnunet-helper-audio-record | 87 | AUDIO_HELPER_RECD=gnunet-helper-audio-record |
84 | AUDIO_HELPER_PLAY=gnunet-helper-audio-playback | 88 | AUDIO_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 | ||
260 | EXTRA_DIST = test_conversation.conf | 263 | EXTRA_DIST = test_conversation.conf |