From 7c492f3807011ff6a20bcf6761695f1a2efd754d Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 9 Jul 2011 06:18:00 +0000 Subject: [PATCH] move --- src/core/Makefile.am | 13 ++++++++++++- .../gnunet-core-list-connections.c} | 8 ++++---- src/peerinfo-tool/Makefile.am | 11 +---------- 3 files changed, 17 insertions(+), 15 deletions(-) rename src/{peerinfo-tool/gnunet-list-connections.c => core/gnunet-core-list-connections.c} (96%) 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 = \ bin_PROGRAMS = \ - gnunet-service-core + gnunet-service-core \ + gnunet-core-list-connections gnunet_service_core_SOURCES = \ gnunet-service-core.c @@ -37,6 +38,16 @@ gnunet_service_core_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) + +gnunet_core_list_connections_SOURCES = \ + gnunet-core-list-connections.c +gnunet_core_list_connections_LDADD = \ + $(top_builddir)/src/core/libgnunetcore.la \ + $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/util/libgnunetutil.la + + check_PROGRAMS = \ test_core_api_start_only \ test_core_api \ diff --git a/src/peerinfo-tool/gnunet-list-connections.c b/src/core/gnunet-core-list-connections.c similarity index 96% rename from src/peerinfo-tool/gnunet-list-connections.c rename to 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 @@ /* This file is part of GNUnet. - (C) 2001, 2002, 2003, 2004, 2006, 2009, 2010 Christian Grothoff (and other contributing authors) + (C) 2011 Christian Grothoff (and other contributing authors) GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -19,9 +19,9 @@ */ /** - * @file peerinfo-tool/gnunet-list-connections.c + * @file core/gnunet-core-list-connections.c * @brief Print information about other known _connected_ peers. - * @author Christian Grothoff + * @author Nathan Evans */ #include "platform.h" #include "gnunet_crypto_lib.h" @@ -203,4 +203,4 @@ main (int argc, char *const *argv) options, &run, NULL)) ? 0 : 1; } -/* end of gnunet-peerinfo.c */ +/* 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 endif bin_PROGRAMS = \ - gnunet-peerinfo \ - gnunet-list-connections - -gnunet_list_connections_SOURCES = \ - gnunet-list-connections.c -gnunet_list_connections_LDADD = \ - $(top_builddir)/src/core/libgnunetcore.la \ - $(top_builddir)/src/transport/libgnunettransport.la \ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/util/libgnunetutil.la + gnunet-peerinfo gnunet_peerinfo_SOURCES = \ gnunet-peerinfo.c -- 2.25.1