diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-07-01 08:46:27 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-07-01 08:46:27 +0000 |
commit | 11a2d8cd5b619a0fea63e766585c6ec4687a0707 (patch) | |
tree | 0b18ea0e567fd7bf5ca50b5994df5abe1ba77d95 /src/nat/Makefile.am | |
parent | 9b986bcca579585f4f113d22b7c841a2ab28de0c (diff) | |
download | gnunet-11a2d8cd5b619a0fea63e766585c6ec4687a0707.tar.gz gnunet-11a2d8cd5b619a0fea63e766585c6ec4687a0707.zip |
renaming gnunet-nat-server/client for consistency, other minor fixes
Diffstat (limited to 'src/nat/Makefile.am')
-rw-r--r-- | src/nat/Makefile.am | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am index a60b4b5f3..e8dadb240 100644 --- a/src/nat/Makefile.am +++ b/src/nat/Makefile.am | |||
@@ -2,36 +2,38 @@ INCLUDES = -I$(top_srcdir)/src/include | |||
2 | 2 | ||
3 | if MINGW | 3 | if MINGW |
4 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols | 4 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols |
5 | NATBIN = gnunet-nat-server gnunet-nat-client | 5 | NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client |
6 | NATSERVER = gnunet-nat-server-windows.c | 6 | NATSERVER = gnunet-helper-nat-server-windows.c |
7 | NATCLIENT = gnunet-nat-client-windows.c | 7 | NATCLIENT = gnunet-helper-nat-client-windows.c |
8 | else | ||
9 | NATSERVER = gnunet-nat-server.c | ||
10 | NATCLIENT = gnunet-nat-client.c | ||
11 | endif | 8 | endif |
12 | 9 | ||
13 | if LINUX | 10 | if LINUX |
14 | NATBIN = gnunet-nat-server gnunet-nat-client | 11 | NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client |
12 | NATSERVER = gnunet-helper-nat-server.c | ||
13 | NATCLIENT = gnunet-helper-nat-client.c | ||
15 | install-exec-hook: | 14 | install-exec-hook: |
16 | chown root:root $(bindir)/gnunet-nat-server $(bindir)/gnunet-nat-client $(bindir)/gnunet-transport-wlan-helper || true | 15 | chown root:root $(bindir)/gnunet-helper-nat-server $(bindir)/gnunet-helper-nat-client || true |
17 | chmod u+s $(bindir)/gnunet-nat-server $(bindir)/gnunet-nat-client $(bindir)/gnunet-transport-wlan-helper || true | 16 | chmod u+s $(bindir)/gnunet-helper-nat-server $(bindir)/gnunet-helper-nat-client || true |
18 | else | 17 | else |
19 | install-exec-hook: | 18 | install-exec-hook: |
20 | endif | 19 | endif |
21 | 20 | ||
22 | bin_PROGRAMS = \ | 21 | bin_PROGRAMS = \ |
22 | gnunet-nat-server \ | ||
23 | $(NATBIN) | 23 | $(NATBIN) |
24 | 24 | ||
25 | gnunet_nat_server_SOURCES = \ | 25 | gnunet_nat_server_SOURCES = \ |
26 | gnunet-nat-server.c | ||
27 | gnunet_nat_server_LDADD = \ | ||
28 | $(top_builddir)/src/util/libgnunetutil.la | ||
29 | |||
30 | gnunet_helper_nat_server_SOURCES = \ | ||
26 | $(NATSERVER) | 31 | $(NATSERVER) |
27 | 32 | ||
28 | gnunet_nat_client_SOURCES = \ | 33 | gnunet_helper_nat_client_SOURCES = \ |
29 | $(NATCLIENT) | 34 | $(NATCLIENT) |
30 | 35 | ||
31 | 36 | ||
32 | if MINGW | ||
33 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols | ||
34 | endif | ||
35 | 37 | ||
36 | if USE_COVERAGE | 38 | if USE_COVERAGE |
37 | AM_CFLAGS = -fprofile-arcs -ftest-coverage | 39 | AM_CFLAGS = -fprofile-arcs -ftest-coverage |