aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorTheJackiMonster <thejackimonster@gmail.com>2020-11-12 20:58:07 +0100
committerTheJackiMonster <thejackimonster@gmail.com>2020-11-12 20:58:07 +0100
commitca912f85dae6b61dd80ab02d0e3f0b20a556da7c (patch)
tree788ebaf2ce0870bad875a7d910b6cd1b536a99c7 /src/Makefile.am
parent5bdfe2001fbc68b06293b79dd6426156719d33c0 (diff)
downloadgnunet-ca912f85dae6b61dd80ab02d0e3f0b20a556da7c.tar.gz
gnunet-ca912f85dae6b61dd80ab02d0e3f0b20a556da7c.zip
-remerge branch 'jacki/messenger'
This reverts commit e11d1e59e4ae5f7d89c33df3ae9ca8f1ece990cf.
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index f98cb96df..d8a869acb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,8 @@ endif
11 11
12if HAVE_EXPERIMENTAL 12if HAVE_EXPERIMENTAL
13 EXP_DIR = \ 13 EXP_DIR = \
14 rps 14 rps \
15 messenger
15 #abd FTBFS 16 #abd FTBFS
16if HAVE_ABE 17if HAVE_ABE
17 EXP_DIR += \ 18 EXP_DIR += \