From c0b0474454327ca1c1a17851a350b5686a71206b Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 23 Dec 2010 22:43:08 +0000
Subject: [PATCH] fixes

---
 src/datacache/Makefile.am |  2 +-
 src/datastore/Makefile.am |  4 ++--
 src/include/Makefile.am   |  2 ++
 src/nat/Makefile.am       |  3 ++-
 src/transport/Makefile.am |  3 ++-
 src/vpn/Makefile.am       | 13 +++++++------
 6 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am
index ea60d3500..5e3919820 100644
--- a/src/datacache/Makefile.am
+++ b/src/datacache/Makefile.am
@@ -25,7 +25,7 @@ lib_LTLIBRARIES = \
   libgnunetdatacache.la
 
 libgnunetdatacache_la_SOURCES = \
-  datacache.c plugin_datacache.h
+  datacache.c 
 libgnunetdatacache_la_LIBADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am
index db382f1e4..4cd80d090 100644
--- a/src/datastore/Makefile.am
+++ b/src/datastore/Makefile.am
@@ -16,7 +16,7 @@ lib_LTLIBRARIES = \
   libgnunetdatastore.la
 
 libgnunetdatastore_la_SOURCES = \
-  datastore_api.c datastore.h plugin_datastore.h
+  datastore_api.c datastore.h 
 libgnunetdatastore_la_LIBADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
@@ -30,7 +30,7 @@ bin_PROGRAMS = \
  gnunet-service-datastore
 
 gnunet_service_datastore_SOURCES = \
- gnunet-service-datastore.c plugin_datastore.h
+ gnunet-service-datastore.c 
 gnunet_service_datastore_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 74bc20066..2bdc4e1fa 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -15,6 +15,8 @@ gnunetinclude_HEADERS = \
   platform.h \
   plibc.h \
   $(WINPROC) \
+  block_dns.h \
+  block_fs.h \
   gnunet_arm_service.h \
   gnunet_bandwidth_lib.h \
   gnunet_bio_lib.h \
diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am
index af06528db..96ae38dfb 100644
--- a/src/nat/Makefile.am
+++ b/src/nat/Makefile.am
@@ -17,7 +17,8 @@ libgnunetnat_la_SOURCES = \
   upnp-igd-parse.c upnp-igd-parse.h \
   upnp-minixml.c upnp-minixml.h \
   upnp-reply-parse.c upnp-reply-parse.h bsdqueue.h \
-  nat.c 
+  nat.c nat.h \
+  natpmp.h 
 
 libgnunetnat_la_CFLAGS = \
  -DDEBUG_UPNP -g -O0
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 95b2762aa..0498408f2 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -100,7 +100,7 @@ gnunet_transport_DEPENDENCIES = \
   libgnunettransport.la				
 
 gnunet_service_transport_SOURCES = \
- gnunet-service-transport.c plugin_transport.h 
+ gnunet-service-transport.c  
 gnunet_service_transport_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
@@ -413,6 +413,7 @@ test_transport_api_multi_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 EXTRA_DIST = \
+  gnunet-transport-certificate-creation \
   test_transport_api_data.conf \
   test_transport_api_tcp_peer1.conf \
   test_transport_api_tcp_peer2.conf \
diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index 027ce687f..5787a875a 100644
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -35,8 +35,8 @@ gnunet_helper_hijack_dns_SOURCES = \
 
 gnunet_daemon_vpn_SOURCES = \
  gnunet-daemon-vpn.c \
- gnunet-vpn-pretty-print.c \
- gnunet-dns-parser.c
+ gnunet-vpn-pretty-print.c gnunet-vpn-pretty-print.h \
+ gnunet-dns-parser.c gnunet-dns-parser.h
 gnunet_daemon_vpn_LDADD = \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -44,9 +44,9 @@ gnunet_daemon_vpn_LDADD = \
   $(GN_LIBINTL)
 
 gnunet_service_dns_SOURCES = \
- gnunet-service-dns.c \
- gnunet-vpn-pretty-print.c \
- gnunet-dns-parser.c
+ gnunet-service-dns.c gnunet-service-dns-p.h \
+ gnunet-vpn-pretty-print.c gnunet-vpn-pretty-print.h \
+ gnunet-dns-parser.c gnunet-dns-parser.h
 gnunet_service_dns_LDADD = \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -68,4 +68,5 @@ endif
 # $(top_builddir)/src/transport/libgnunettransport.la \
 # $(top_builddir)/src/util/libgnunetutil.la  
 
-#EXTRA_DIST = test_transport_api_data.conf 
+EXTRA_DIST = \
+  gnunet-vpn-packet.h
-- 
2.25.1