diff options
author | Christian Grothoff <christian@grothoff.org> | 2018-08-14 11:17:30 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2018-08-14 11:17:30 +0200 |
commit | 5bb2565bab0b8fa8cac263b9fb70edf3ae2278d9 (patch) | |
tree | 33d2a86abe831bfd3cd711ad7332433b35891766 /src/Makefile.am | |
parent | 97e72521285a2ff2189334cb43d0a8f385d73e4a (diff) | |
parent | 4cc09ba10da89ac32b4a40bde9abbe77bba21c78 (diff) | |
download | gnunet-5bb2565bab0b8fa8cac263b9fb70edf3ae2278d9.tar.gz gnunet-5bb2565bab0b8fa8cac263b9fb70edf3ae2278d9.zip |
resolve merge conflict with peerinfo plugin move
Diffstat (limited to 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 53d157da3..43b1004eb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -65,9 +65,8 @@ if HAVE_POSTGRESQL | |||
65 | endif | 65 | endif |
66 | 66 | ||
67 | if HAVE_MHD | 67 | if HAVE_MHD |
68 | REST_DIR = rest | ||
69 | if HAVE_JSON | 68 | if HAVE_JSON |
70 | JSONAPI_DIR = jsonapi | 69 | REST_DIR = rest jsonapi rest-plugins |
71 | endif | 70 | endif |
72 | endif | 71 | endif |
73 | 72 | ||
@@ -82,9 +81,6 @@ SUBDIRS = \ | |||
82 | include $(INTLEMU_SUBDIRS) \ | 81 | include $(INTLEMU_SUBDIRS) \ |
83 | util \ | 82 | util \ |
84 | gnsrecord \ | 83 | gnsrecord \ |
85 | $(JSON_DIR) \ | ||
86 | $(REST_DIR) \ | ||
87 | $(JSONAPI_DIR) \ | ||
88 | hello \ | 84 | hello \ |
89 | block \ | 85 | block \ |
90 | statistics \ | 86 | statistics \ |
@@ -130,6 +126,8 @@ SUBDIRS = \ | |||
130 | exit \ | 126 | exit \ |
131 | pt \ | 127 | pt \ |
132 | secretsharing \ | 128 | secretsharing \ |
129 | $(JSON_DIR) \ | ||
130 | $(REST_DIR) \ | ||
133 | integration-tests \ | 131 | integration-tests \ |
134 | $(EXP_DIR) | 132 | $(EXP_DIR) |
135 | 133 | ||