diff options
author | Christian Grothoff <christian@grothoff.org> | 2009-09-15 15:58:09 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2009-09-15 15:58:09 +0000 |
commit | b7d63eaae6bfb3e72a452d1841e808a0159be173 (patch) | |
tree | fde0992e88eba130b83baa36f984d9718e3ce5e4 | |
parent | 5cccb4380fdeb089860a70df5befe0116fdc875a (diff) | |
download | gnunet-b7d63eaae6bfb3e72a452d1841e808a0159be173.tar.gz gnunet-b7d63eaae6bfb3e72a452d1841e808a0159be173.zip |
move
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | src/Makefile.am | 1 | ||||
-rw-r--r-- | src/fs/Makefile.am | 1 | ||||
-rw-r--r-- | src/include/gnunet_util_lib.h | 1 | ||||
-rw-r--r-- | src/peer/Makefile.am | 29 | ||||
-rw-r--r-- | src/util/Makefile.am | 1 | ||||
-rw-r--r-- | src/util/peer.c (renamed from src/peer/peer.c) | 2 |
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 | |||
753 | src/include/Makefile | 753 | src/include/Makefile |
754 | src/include/gnunet_directories.h | 754 | src/include/gnunet_directories.h |
755 | src/hostlist/Makefile | 755 | src/hostlist/Makefile |
756 | src/peer/Makefile | ||
757 | src/peerinfo/Makefile | 756 | src/peerinfo/Makefile |
758 | src/resolver/Makefile | 757 | src/resolver/Makefile |
759 | src/statistics/Makefile | 758 | 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 = \ | |||
13 | arm \ | 13 | arm \ |
14 | fragmentation \ | 14 | fragmentation \ |
15 | hello \ | 15 | hello \ |
16 | peer \ | ||
17 | peerinfo \ | 16 | peerinfo \ |
18 | resolver \ | 17 | resolver \ |
19 | statistics \ | 18 | 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 = \ | |||
88 | $(top_builddir)/src/fs/libgnunetfs.la \ | 88 | $(top_builddir)/src/fs/libgnunetfs.la \ |
89 | $(top_builddir)/src/datastore/libgnunetdatastore.la \ | 89 | $(top_builddir)/src/datastore/libgnunetdatastore.la \ |
90 | $(top_builddir)/src/core/libgnunetcore.la \ | 90 | $(top_builddir)/src/core/libgnunetcore.la \ |
91 | $(top_builddir)/src/peer/libgnunetpeer.la \ | ||
92 | $(top_builddir)/src/util/libgnunetutil.la \ | 91 | $(top_builddir)/src/util/libgnunetutil.la \ |
93 | $(GN_LIBINTL) | 92 | $(GN_LIBINTL) |
94 | 93 | ||
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" | |||
47 | #include "gnunet_getopt_lib.h" | 47 | #include "gnunet_getopt_lib.h" |
48 | #include "gnunet_network_lib.h" | 48 | #include "gnunet_network_lib.h" |
49 | #include "gnunet_os_lib.h" | 49 | #include "gnunet_os_lib.h" |
50 | #include "gnunet_peer_lib.h" | ||
50 | #include "gnunet_plugin_lib.h" | 51 | #include "gnunet_plugin_lib.h" |
51 | #include "gnunet_program_lib.h" | 52 | #include "gnunet_program_lib.h" |
52 | #include "gnunet_protocols.h" | 53 | #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 @@ | |||
1 | INCLUDES = -I$(top_srcdir)/src/include | ||
2 | |||
3 | if MINGW | ||
4 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols | ||
5 | endif | ||
6 | |||
7 | if USE_COVERAGE | ||
8 | AM_CFLAGS = --coverage -O0 | ||
9 | XLIB = -lgcov | ||
10 | endif | ||
11 | |||
12 | lib_LTLIBRARIES = libgnunetpeer.la | ||
13 | |||
14 | libgnunetpeer_la_SOURCES = \ | ||
15 | peer.c | ||
16 | libgnunetpeer_la_LIBADD = \ | ||
17 | $(top_builddir)/src/util/libgnunetutil.la $(XLIB) | ||
18 | |||
19 | #check_PROGRAMS = \ | ||
20 | # test_peer | ||
21 | # | ||
22 | #TESTS = $(check_PROGRAMS) | ||
23 | # | ||
24 | #test_peer_SOURCES = \ | ||
25 | # test_peer.c | ||
26 | #test_peer_LDADD = \ | ||
27 | # $(top_builddir)/src/peer/libgnunetpeer.la \ | ||
28 | # $(top_builddir)/src/util/libgnunetutil.la | ||
29 | |||
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 = \ | |||
41 | os_load.c \ | 41 | os_load.c \ |
42 | os_network.c \ | 42 | os_network.c \ |
43 | os_priority.c \ | 43 | os_priority.c \ |
44 | peer.c \ | ||
44 | plugin.c \ | 45 | plugin.c \ |
45 | program.c \ | 46 | program.c \ |
46 | pseudonym.c \ | 47 | 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 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file peer/peer.c | 22 | * @file util/peer.c |
23 | * @brief peer-ID table that assigns integer IDs to peer-IDs to save memory | 23 | * @brief peer-ID table that assigns integer IDs to peer-IDs to save memory |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |