diff options
Diffstat (limited to 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 217aea54f..51bf2d63d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -12,7 +12,9 @@ endif | |||
12 | if HAVE_EXPERIMENTAL | 12 | if HAVE_EXPERIMENTAL |
13 | EXP_DIR = \ | 13 | EXP_DIR = \ |
14 | rps \ | 14 | rps \ |
15 | credential | 15 | abd \ |
16 | reclaim-attribute \ | ||
17 | reclaim | ||
16 | if HAVE_ABE | 18 | if HAVE_ABE |
17 | EXP_DIR += \ | 19 | EXP_DIR += \ |
18 | abe | 20 | abe |
@@ -23,7 +25,6 @@ if HAVE_JSON | |||
23 | endif | 25 | endif |
24 | endif | 26 | endif |
25 | 27 | ||
26 | if HAVE_MHD | ||
27 | if HAVE_JSON | 28 | if HAVE_JSON |
28 | JSON_DIR = json | 29 | JSON_DIR = json |
29 | if HAVE_LIBGNURL | 30 | if HAVE_LIBGNURL |
@@ -34,6 +35,13 @@ if HAVE_LIBCURL | |||
34 | endif | 35 | endif |
35 | endif | 36 | endif |
36 | endif | 37 | endif |
38 | |||
39 | if BUILD_PULSE_HELPERS | ||
40 | CONVERSATION_DIR = conversation | ||
41 | else | ||
42 | if BUILD_GST_HELPERS | ||
43 | CONVERSATION_DIR = conversation | ||
44 | endif | ||
37 | endif | 45 | endif |
38 | 46 | ||
39 | if HAVE_SQLITE | 47 | if HAVE_SQLITE |
@@ -51,7 +59,6 @@ endif | |||
51 | if HAVE_MHD | 59 | if HAVE_MHD |
52 | if HAVE_JSON | 60 | if HAVE_JSON |
53 | REST_DIR = rest | 61 | REST_DIR = rest |
54 | RECLAIM_DIR = reclaim-attribute reclaim | ||
55 | endif | 62 | endif |
56 | endif | 63 | endif |
57 | 64 | ||
@@ -109,12 +116,11 @@ SUBDIRS = \ | |||
109 | vpn \ | 116 | vpn \ |
110 | gns \ | 117 | gns \ |
111 | zonemaster \ | 118 | zonemaster \ |
112 | conversation \ | 119 | $(CONVERSATION_DIR) \ |
113 | fs \ | 120 | fs \ |
114 | exit \ | 121 | exit \ |
115 | pt \ | 122 | pt \ |
116 | secretsharing \ | 123 | secretsharing \ |
117 | $(RECLAIM_DIR) \ | ||
118 | $(EXP_DIR) \ | 124 | $(EXP_DIR) \ |
119 | integration-tests | 125 | integration-tests |
120 | 126 | ||