diff options
| author | xrs <xrs@mail36.net> | 2020-06-17 22:07:39 +0200 |
|---|---|---|
| committer | xrs <xrs@mail36.net> | 2020-06-17 22:07:39 +0200 |
| commit | 49cf7a8e893eaf7682ac12c7d0ea5ca4a6d1a73d (patch) | |
| tree | 71830c1751e291e45795958cad15e9dfa8239e1a /src/Makefile.am | |
| parent | b9333fef25b57bdd7f556f5fb73f9abaef9bc5ef (diff) | |
| parent | e500e9ec3678dfbb666d173854c134ac3858f8b1 (diff) | |
| download | gnunet-49cf7a8e893eaf7682ac12c7d0ea5ca4a6d1a73d.tar.gz gnunet-49cf7a8e893eaf7682ac12c7d0ea5ca4a6d1a73d.zip | |
Merge branch 'master' into rewrite_of_cadet_test
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 4642b6215..446b1aa2a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
| @@ -17,26 +17,12 @@ if HAVE_ABE | |||
| 17 | EXP_DIR += \ | 17 | EXP_DIR += \ |
| 18 | abe | 18 | abe |
| 19 | endif | 19 | endif |
| 20 | if HAVE_JSON | ||
| 21 | EXP_DIR += \ | 20 | EXP_DIR += \ |
| 22 | auction | 21 | auction |
| 23 | endif | 22 | endif |
| 24 | endif | ||
| 25 | 23 | ||
| 26 | if HAVE_JSON | 24 | JSON_DIR = json |
| 27 | if HAVE_MHD | 25 | CURL_DIR = curl |
| 28 | JSON_DIR = json | ||
| 29 | endif | ||
| 30 | endif | ||
| 31 | if HAVE_MHD | ||
| 32 | if HAVE_LIBGNURL | ||
| 33 | CURL_DIR = curl | ||
| 34 | else | ||
| 35 | if HAVE_LIBCURL | ||
| 36 | CURL_DIR = curl | ||
| 37 | endif | ||
| 38 | endif | ||
| 39 | endif | ||
| 40 | 26 | ||
| 41 | if BUILD_PULSE_HELPERS | 27 | if BUILD_PULSE_HELPERS |
| 42 | CONVERSATION_DIR = conversation | 28 | CONVERSATION_DIR = conversation |
| @@ -58,9 +44,7 @@ if HAVE_POSTGRESQL | |||
| 58 | POSTGRES_DIR = pq | 44 | POSTGRES_DIR = pq |
| 59 | endif | 45 | endif |
| 60 | 46 | ||
| 61 | if HAVE_REST | 47 | REST_DIR = rest |
| 62 | REST_DIR = rest | ||
| 63 | endif | ||
| 64 | 48 | ||
| 65 | 49 | ||
| 66 | SUBDIRS = \ | 50 | SUBDIRS = \ |