diff options
| author | Christian Grothoff <christian@grothoff.org> | 2013-06-25 10:00:42 +0000 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2013-06-25 10:00:42 +0000 |
| commit | 7d6a6d6b4ebfaae41b05a4a948a89520420fcd11 (patch) | |
| tree | 85eebdfdacdbb1ce03e83fbd38459af5fab4bf75 /src/Makefile.am | |
| parent | efecad9df3e8847f45a4284ec717c32260460adc (diff) | |
| download | gnunet-7d6a6d6b4ebfaae41b05a4a948a89520420fcd11.tar.gz gnunet-7d6a6d6b4ebfaae41b05a4a948a89520420fcd11.zip | |
-trying to fix #2902, always build dns code and fix dependencies
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 91b4daf51..62a08cb5a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
| @@ -3,11 +3,9 @@ | |||
| 3 | #endif | 3 | #endif |
| 4 | 4 | ||
| 5 | if HAVE_LIBIDN | 5 | if HAVE_LIBIDN |
| 6 | DNS = dns | ||
| 7 | EXIT = exit | 6 | EXIT = exit |
| 8 | PT = pt | 7 | PT = pt |
| 9 | else | 8 | else |
| 10 | DNS = | ||
| 11 | EXIT = | 9 | EXIT = |
| 12 | PT = | 10 | PT = |
| 13 | endif | 11 | endif |
| @@ -18,10 +16,10 @@ endif | |||
| 18 | 16 | ||
| 19 | if LINUX | 17 | if LINUX |
| 20 | # All of these currently only work on GNU/Linux | 18 | # All of these currently only work on GNU/Linux |
| 21 | LINUX_DIR = $(DNS) $(EXIT) vpn $(PT) | 19 | LINUX_DIR = $(EXIT) vpn $(PT) |
| 22 | endif | 20 | endif |
| 23 | if MINGW | 21 | if MINGW |
| 24 | MINGW_DIR = $(DNS) vpn $(EXIT) | 22 | MINGW_DIR = vpn $(EXIT) |
| 25 | endif | 23 | endif |
| 26 | 24 | ||
| 27 | if HAVE_MYSQL | 25 | if HAVE_MYSQL |
| @@ -65,6 +63,7 @@ SUBDIRS = \ | |||
| 65 | mesh \ | 63 | mesh \ |
| 66 | lockmanager \ | 64 | lockmanager \ |
| 67 | stream \ | 65 | stream \ |
| 66 | dns \ | ||
| 68 | fs \ | 67 | fs \ |
| 69 | $(LINUX_DIR) \ | 68 | $(LINUX_DIR) \ |
| 70 | $(MINGW_DIR) \ | 69 | $(MINGW_DIR) \ |