diff options
author | Christian Grothoff <christian@grothoff.org> | 2018-11-22 22:04:48 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2018-11-22 22:04:48 +0100 |
commit | c87f73a07df468eccedbe1fdfa82bdd5b633a0d5 (patch) | |
tree | 0bb3f63e727a65dc84c33a03229b6760edee82ee /src/Makefile.am | |
parent | dd7379052f3749d87d8c35969ec94b4580e998b5 (diff) | |
download | gnunet-c87f73a07df468eccedbe1fdfa82bdd5b633a0d5.tar.gz gnunet-c87f73a07df468eccedbe1fdfa82bdd5b633a0d5.zip |
move network type logic out of ATS code, move performance preferences into MQ
Diffstat (limited to 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 39cbaa893..5e2b0e493 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -16,7 +16,7 @@ if HAVE_EXPERIMENTAL | |||
16 | psycutil \ | 16 | psycutil \ |
17 | psycstore \ | 17 | psycstore \ |
18 | psyc \ | 18 | psyc \ |
19 | social | 19 | social |
20 | # dv (FTBFS) | 20 | # dv (FTBFS) |
21 | if HAVE_ABE | 21 | if HAVE_ABE |
22 | if HAVE_JSON | 22 | if HAVE_JSON |
@@ -24,7 +24,7 @@ if HAVE_JSON | |||
24 | abe \ | 24 | abe \ |
25 | credential \ | 25 | credential \ |
26 | reclaim-attribute \ | 26 | reclaim-attribute \ |
27 | reclaim | 27 | reclaim |
28 | endif | 28 | endif |
29 | endif | 29 | endif |
30 | if HAVE_JSON | 30 | if HAVE_JSON |
@@ -80,6 +80,7 @@ else | |||
80 | SUBDIRS = \ | 80 | SUBDIRS = \ |
81 | include $(INTLEMU_SUBDIRS) \ | 81 | include $(INTLEMU_SUBDIRS) \ |
82 | util \ | 82 | util \ |
83 | nt \ | ||
83 | gnsrecord \ | 84 | gnsrecord \ |
84 | hello \ | 85 | hello \ |
85 | block \ | 86 | block \ |
@@ -129,6 +130,6 @@ SUBDIRS = \ | |||
129 | $(EXP_DIR) \ | 130 | $(EXP_DIR) \ |
130 | $(JSON_DIR) \ | 131 | $(JSON_DIR) \ |
131 | $(REST_DIR) \ | 132 | $(REST_DIR) \ |
132 | integration-tests | 133 | integration-tests |
133 | 134 | ||
134 | endif | 135 | endif |