From 78c6654d9807e45719d5de73bf42e664e40e7efa Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 16 Apr 2010 15:56:55 +0000 Subject: [PATCH] make dist related fixes --- Makefile.am | 2 +- TODO | 8 -------- configure.ac | 8 ++++---- src/fs/Makefile.am | 2 +- src/hostlist/Makefile.am | 2 +- src/include/Makefile.am | 3 +++ src/util/Makefile.am | 2 +- src/util/plugin.c | 2 +- 8 files changed, 12 insertions(+), 17 deletions(-) diff --git a/Makefile.am b/Makefile.am index 06bb029db..2b89f4676 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = -I$(top_srcdir)/src/include -SUBDIRS = contrib src po +SUBDIRS = contrib m4 src po EXTRA_DIST = \ ABOUT-NLS \ diff --git a/TODO b/TODO index 441c0835e..9d543b984 100644 --- a/TODO +++ b/TODO @@ -1,12 +1,4 @@ 0.9.0pre0 [April]: -* TRANSPORT: inbound sessions are not properly PING-PONG validated, - connect-event is then not properly signalled (peer behind NAT - never gets a 'connect' message) and finally we DO transmit - data messages over the invalidated, only half-connect-signalled - channel (which confuses the core state machine, or now causes - transport-api assertion failures). [CG] - => now fixed, but needs testing! -* FS-acceptance testing [CG] * Release checks: - portability - coverity diff --git a/configure.ac b/configure.ac index d02d03896..c65d2a15e 100644 --- a/configure.ac +++ b/configure.ac @@ -638,7 +638,10 @@ AC_ARG_ENABLE([coverage], AS_HELP_STRING([--enable-coverage], [use_gcov=yes], [use_gcov=no]) AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"]) - +# Not in 0.9.0pre0 +# src/dv/Makefile +# src/dht/Makefile +# src/fragmentation/Makefile AC_CONFIG_FILES([ Makefile @@ -650,9 +653,6 @@ src/arm/Makefile src/core/Makefile src/datacache/Makefile src/datastore/Makefile -src/dv/Makefile -src/dht/Makefile -src/fragmentation/Makefile src/fs/Makefile src/hello/Makefile src/include/Makefile diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index 02952fec8..cd7231ceb 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am @@ -16,7 +16,7 @@ lib_LTLIBRARIES = libgnunetfs.la noinst_LIBRARIES = libgnunetfstest.a libgnunetfs_la_SOURCES = \ - fs.c \ + fs.c fs.h \ fs_collection.c \ fs_directory.c \ fs_download.c \ diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am index e2b45c208..daffa72db 100644 --- a/src/hostlist/Makefile.am +++ b/src/hostlist/Makefile.am @@ -9,7 +9,7 @@ bin_PROGRAMS = \ gnunet-daemon-hostlist gnunet_daemon_hostlist_SOURCES = \ - gnunet-daemon-hostlist.c \ + gnunet-daemon-hostlist.c gnunet-daemon-hostlist.h \ hostlist-client.c hostlist-client.h \ hostlist-server.c hostlist-server.h diff --git a/src/include/Makefile.am b/src/include/Makefile.am index 605cbbe1e..3c8612eb5 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -30,9 +30,12 @@ gnunetinclude_HEADERS = \ gnunet_fs_service.h \ gnunet_getopt_lib.h \ gnunet_hello_lib.h \ + gnunet_nat_lib.h \ gnunet_network_lib.h \ + gnunet_os_lib.h \ gnunet_peer_lib.h \ gnunet_peerinfo_service.h \ + gnunet_plugin_lib.h \ gnunet_program_lib.h \ gnunet_protocols.h \ gnunet_pseudonym_lib.h \ diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 13bef97e0..a8031d915 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -57,7 +57,7 @@ libgnunetutil_la_SOURCES = \ plugin.c \ program.c \ pseudonym.c \ - resolver_api.c \ + resolver_api.c resolver.h \ scheduler.c \ server.c \ server_nc.c \ diff --git a/src/util/plugin.c b/src/util/plugin.c index 950993bde..36380f339 100644 --- a/src/util/plugin.c +++ b/src/util/plugin.c @@ -25,7 +25,7 @@ */ #include "platform.h" -#include +#include #include "gnunet_common.h" #include "gnunet_os_lib.h" #include "gnunet_plugin_lib.h" -- 2.25.1