7 files changed, 3 insertions, 33 deletions

diff --git a/configure.ac b/configure.ac
index 20bff6c6a..28094e057 100644
--- a/configure.ac
+++ b/configure.ac
@@ -753,7 +753,6 @@ src/hello/Makefile
 src/include/Makefile
 src/include/gnunet_directories.h
 src/hostlist/Makefile
-src/peer/Makefile
 src/peerinfo/Makefile
 src/resolver/Makefile
 src/statistics/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index a394944d2..7e92437c6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,7 +13,6 @@ SUBDIRS = \
   arm \
   fragmentation \
   hello \
-  peer \
   peerinfo \
   resolver \
   statistics \
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index a91459e64..e2f2e6267 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -88,7 +88,6 @@ gnunet_service_fs_LDADD =  \
  $(top_builddir)/src/fs/libgnunetfs.la \
  $(top_builddir)/src/datastore/libgnunetdatastore.la \
  $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/peer/libgnunetpeer.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(GN_LIBINTL)
 
diff --git a/src/include/gnunet_util_lib.h b/src/include/gnunet_util_lib.h
index 6bb87bf4d..1c5e1d7a1 100644
--- a/src/include/gnunet_util_lib.h
+++ b/src/include/gnunet_util_lib.h
@@ -47,6 +47,7 @@ extern "C"
 #include "gnunet_getopt_lib.h"
 #include "gnunet_network_lib.h"
 #include "gnunet_os_lib.h"
+#include "gnunet_peer_lib.h"
 #include "gnunet_plugin_lib.h"
 #include "gnunet_program_lib.h"
 #include "gnunet_protocols.h"
diff --git a/src/peer/Makefile.am b/src/peer/Makefile.am
deleted file mode 100644
index bd268cf39..000000000
--- a/src/peer/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-INCLUDES = -I$(top_srcdir)/src/include
-
-if MINGW
-  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
-endif
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-lib_LTLIBRARIES = libgnunetpeer.la
-
-libgnunetpeer_la_SOURCES = \
-  peer.c 
-libgnunetpeer_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
-
-#check_PROGRAMS = \
-# test_peer
-#
-#TESTS = $(check_PROGRAMS)
-#
-#test_peer_SOURCES = \
-# test_peer.c
-#test_peer_LDADD = \
-# $(top_builddir)/src/peer/libgnunetpeer.la \
-# $(top_builddir)/src/util/libgnunetutil.la  
-
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index a4e633eb9..d7e5ada54 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -41,6 +41,7 @@ libgnunetutil_la_SOURCES = \
   os_load.c \
   os_network.c \
   os_priority.c \
+  peer.c \
   plugin.c \
   program.c \
   pseudonym.c \
diff --git a/src/peer/peer.c b/src/util/peer.c
index 02c95f4db..acb1b3922 100644
--- a/src/peer/peer.c
+++ b/src/util/peer.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * @file peer/peer.c
+ * @file util/peer.c
  * @brief peer-ID table that assigns integer IDs to peer-IDs to save memory
  * @author Christian Grothoff
  */