diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-07-09 06:18:00 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-07-09 06:18:00 +0000 |
commit | 7c492f3807011ff6a20bcf6761695f1a2efd754d (patch) | |
tree | f1d3d3ce28c700238b21130153b924fa320bbc74 | |
parent | 7c5ff01102473d922816d1cedd44ddcd4f7d7bd9 (diff) | |
download | gnunet-7c492f3807011ff6a20bcf6761695f1a2efd754d.tar.gz gnunet-7c492f3807011ff6a20bcf6761695f1a2efd754d.zip |
move
-rw-r--r-- | src/core/Makefile.am | 13 | ||||
-rw-r--r-- | src/core/gnunet-core-list-connections.c (renamed from src/peerinfo-tool/gnunet-list-connections.c) | 8 | ||||
-rw-r--r-- | src/peerinfo-tool/Makefile.am | 11 |
3 files changed, 17 insertions, 15 deletions
diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 93af6f039..4f9a20433 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am | |||
@@ -25,7 +25,8 @@ libgnunetcore_la_LDFLAGS = \ | |||
25 | 25 | ||
26 | 26 | ||
27 | bin_PROGRAMS = \ | 27 | bin_PROGRAMS = \ |
28 | gnunet-service-core | 28 | gnunet-service-core \ |
29 | gnunet-core-list-connections | ||
29 | 30 | ||
30 | gnunet_service_core_SOURCES = \ | 31 | gnunet_service_core_SOURCES = \ |
31 | gnunet-service-core.c | 32 | gnunet-service-core.c |
@@ -37,6 +38,16 @@ gnunet_service_core_LDADD = \ | |||
37 | $(top_builddir)/src/util/libgnunetutil.la \ | 38 | $(top_builddir)/src/util/libgnunetutil.la \ |
38 | $(GN_LIBINTL) | 39 | $(GN_LIBINTL) |
39 | 40 | ||
41 | |||
42 | gnunet_core_list_connections_SOURCES = \ | ||
43 | gnunet-core-list-connections.c | ||
44 | gnunet_core_list_connections_LDADD = \ | ||
45 | $(top_builddir)/src/core/libgnunetcore.la \ | ||
46 | $(top_builddir)/src/transport/libgnunettransport.la \ | ||
47 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
48 | $(top_builddir)/src/util/libgnunetutil.la | ||
49 | |||
50 | |||
40 | check_PROGRAMS = \ | 51 | check_PROGRAMS = \ |
41 | test_core_api_start_only \ | 52 | test_core_api_start_only \ |
42 | test_core_api \ | 53 | test_core_api \ |
diff --git a/src/peerinfo-tool/gnunet-list-connections.c b/src/core/gnunet-core-list-connections.c index 9c9cf987b..8b0f6773a 100644 --- a/src/peerinfo-tool/gnunet-list-connections.c +++ b/src/core/gnunet-core-list-connections.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet. | 2 | This file is part of GNUnet. |
3 | (C) 2001, 2002, 2003, 2004, 2006, 2009, 2010 Christian Grothoff (and other contributing authors) | 3 | (C) 2011 Christian Grothoff (and other contributing authors) |
4 | 4 | ||
5 | GNUnet is free software; you can redistribute it and/or modify | 5 | GNUnet is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published | 6 | it under the terms of the GNU General Public License as published |
@@ -19,9 +19,9 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file peerinfo-tool/gnunet-list-connections.c | 22 | * @file core/gnunet-core-list-connections.c |
23 | * @brief Print information about other known _connected_ peers. | 23 | * @brief Print information about other known _connected_ peers. |
24 | * @author Christian Grothoff | 24 | * @author Nathan Evans |
25 | */ | 25 | */ |
26 | #include "platform.h" | 26 | #include "platform.h" |
27 | #include "gnunet_crypto_lib.h" | 27 | #include "gnunet_crypto_lib.h" |
@@ -203,4 +203,4 @@ main (int argc, char *const *argv) | |||
203 | options, &run, NULL)) ? 0 : 1; | 203 | options, &run, NULL)) ? 0 : 1; |
204 | } | 204 | } |
205 | 205 | ||
206 | /* end of gnunet-peerinfo.c */ | 206 | /* end of gnunet-core-list-connections.c */ |
diff --git a/src/peerinfo-tool/Makefile.am b/src/peerinfo-tool/Makefile.am index a11c500df..8c5fd8fbb 100644 --- a/src/peerinfo-tool/Makefile.am +++ b/src/peerinfo-tool/Makefile.am | |||
@@ -10,16 +10,7 @@ if USE_COVERAGE | |||
10 | endif | 10 | endif |
11 | 11 | ||
12 | bin_PROGRAMS = \ | 12 | bin_PROGRAMS = \ |
13 | gnunet-peerinfo \ | 13 | gnunet-peerinfo |
14 | gnunet-list-connections | ||
15 | |||
16 | gnunet_list_connections_SOURCES = \ | ||
17 | gnunet-list-connections.c | ||
18 | gnunet_list_connections_LDADD = \ | ||
19 | $(top_builddir)/src/core/libgnunetcore.la \ | ||
20 | $(top_builddir)/src/transport/libgnunettransport.la \ | ||
21 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
22 | $(top_builddir)/src/util/libgnunetutil.la | ||
23 | 14 | ||
24 | gnunet_peerinfo_SOURCES = \ | 15 | gnunet_peerinfo_SOURCES = \ |
25 | gnunet-peerinfo.c | 16 | gnunet-peerinfo.c |