moving gnunet-peerinfo.c to allow it to use transport_api

4 files changed, 29 insertions, 13 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 4d63bc756..a01288078 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,6 +22,7 @@ SUBDIRS = \
   datastore \
   template \
   transport \
+  peerinfo-tool \
   core \
   testing \
   $(HOSTLIST_DIR) \
diff --git a/src/peerinfo-tool/Makefile.am b/src/peerinfo-tool/Makefile.am
new file mode 100644
index 000000000..b9e6d7d07
--- /dev/null
+++ b/src/peerinfo-tool/Makefile.am
@@ -0,0 +1,24 @@
+INCLUDES = -I$(top_srcdir)/src/include
+
+if MINGW
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols -lole32 -lshell32 -luuid -liconv -lstdc++ -lcomdlg32 -lgdi32
+endif
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+  XLIB = -lgcov
+endif
+
+bin_PROGRAMS = \
+ gnunet-peerinfo 
+
+gnunet_peerinfo_SOURCES = \
+ gnunet-peerinfo.c         
+gnunet_peerinfo_LDADD = \
+  $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+  $(top_builddir)/src/transport/libgnunettransport.la \
+  $(top_builddir)/src/util/libgnunetutil.la 
+
+
+#check_SCRIPTS = \
+#  test_gnunet_peerinfo.sh
diff --git a/src/peerinfo/gnunet-peerinfo.c b/src/peerinfo-tool/gnunet-peerinfo.c
index d4a36a059..c056b390e 100644
--- a/src/peerinfo/gnunet-peerinfo.c
+++ b/src/peerinfo-tool/gnunet-peerinfo.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2001, 2002, 2003, 2004, 2006, 2009 Christian Grothoff (and other contributing authors)
+     (C) 2001, 2002, 2003, 2004, 2006, 2009, 2010 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,7 +19,7 @@
 */
 
 /**
- * @file peerinfo/gnunet-peerinfo.c
+ * @file peerinfo-tool/gnunet-peerinfo.c
  * @brief Print information about other known peers.
  * @author Christian Grothoff
  */
@@ -41,6 +41,8 @@ static struct GNUNET_SCHEDULER_Handle *sched;
 
 static const struct GNUNET_CONFIGURATION_Handle *cfg;
 
+#define FIXME 0
+
 #if FIXME
 /**
  * Function to call with a human-readable format of an address
@@ -56,7 +58,6 @@ print_resolved_address (void *cls,
      once, otherwise we mix results... */
   if (address == NULL)
     {
-      fprintf (stderr, "\n");
       return;
     }
   fprintf (stderr, " %s\n", address);
diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am
index ea7ef1316..42396e3e7 100644
--- a/src/peerinfo/Makefile.am
+++ b/src/peerinfo/Makefile.am
@@ -23,15 +23,8 @@ libgnunetpeerinfo_la_LDFLAGS = \
 
 
 bin_PROGRAMS = \
- gnunet-peerinfo \
  gnunet-service-peerinfo
 
-gnunet_peerinfo_SOURCES = \
- gnunet-peerinfo.c         
-gnunet_peerinfo_LDADD = \
-  $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
-
 gnunet_service_peerinfo_SOURCES = \
  gnunet-service-peerinfo.c         
 gnunet_service_peerinfo_LDADD = \
@@ -54,6 +47,3 @@ test_peerinfo_api_LDADD = \
 
 EXTRA_DIST = \
   test_peerinfo_api_data.conf 
-
-#check_SCRIPTS = \
-#  test_gnunet_peerinfo.sh