-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
if MINGW
WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
pkgcfgdir= $(pkgdatadir)/config.d/
+libexecdir= $(pkglibdir)/libexec/
+
plugindir = $(libdir)/gnunet
-dist_pkgcfg_DATA = \
+pkgcfg_DATA = \
dns.conf
if LINUX
-HIJACKBIN = gnunet-helper-hijack-dns gnunet-helper-dns
+HIJACKBIN = gnunet-helper-dns
install-exec-hook:
- $(SUDO_BINARY) chown root:root $(bindir)/gnunet-helper-hijack-dns || true
- $(SUDO_BINARY) chmod u+s $(bindir)/gnunet-helper-hijack-dns || true
- $(SUDO_BINARY) chown root:root $(bindir)/gnunet-helper-dns || true
- $(SUDO_BINARY) chmod u+s $(bindir)/gnunet-helper-dns || true
+ $(top_srcdir)/src/dns/install-dns-helper.sh $(libexecdir) $(GNUNETDNS_GROUP) $(SUDO_BINARY) || true
else
install-exec-hook:
endif
lib_LTLIBRARIES = \
libgnunetdnsparser.la \
- libgnunetdnsnew.la \
+ libgnunetdnsstub.la \
libgnunetdns.la
-bin_PROGRAMS = \
- gnunet-service-dns gnunet-service-dns-new $(HIJACKBIN)
+libexec_PROGRAMS = \
+ gnunet-service-dns $(HIJACKBIN)
noinst_PROGRAMS = \
gnunet-dns-monitor gnunet-dns-redirector
plugin_LTLIBRARIES = \
libgnunet_plugin_block_dns.la
-
-gnunet_helper_hijack_dns_SOURCES = \
- gnunet-helper-hijack-dns.c
+if LINUX
+check_SCRIPTS = \
+ test_gnunet_dns.sh
+endif
gnunet_helper_dns_SOURCES = \
gnunet-helper-dns.c
-gnunet_service_dns_SOURCES = \
- gnunet-service-dns.c gnunet-service-dns-p.h
-gnunet_service_dns_LDADD = \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/dht/libgnunetdht.la \
- $(top_builddir)/src/mesh/libgnunetmesh.la \
- $(top_builddir)/src/dns/libgnunetdnsparser.la \
- $(GN_LIBINTL)
-gnunet_service_dns_DEPENDENCIES = \
- libgnunetdnsparser.la
gnunet_dns_monitor_SOURCES = \
gnunet-dns-monitor.c
gnunet_dns_monitor_LDADD = \
$(top_builddir)/src/dns/libgnunetdnsparser.la \
- $(top_builddir)/src/dns/libgnunetdnsnew.la \
+ $(top_builddir)/src/dns/libgnunetdns.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
gnunet_dns_monitor_DEPENDENCIES = \
libgnunetdnsparser.la \
- libgnunetdnsnew.la
+ libgnunetdns.la
gnunet_dns_redirector_SOURCES = \
gnunet-dns-redirector.c
gnunet_dns_redirector_LDADD = \
$(top_builddir)/src/dns/libgnunetdnsparser.la \
- $(top_builddir)/src/dns/libgnunetdnsnew.la \
+ $(top_builddir)/src/dns/libgnunetdns.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
gnunet_dns_redirector_DEPENDENCIES = \
libgnunetdnsparser.la \
- libgnunetdnsnew.la
+ libgnunetdns.la
-gnunet_service_dns_new_SOURCES = \
- gnunet-service-dns_new.c
-gnunet_service_dns_new_LDADD = \
+gnunet_service_dns_SOURCES = \
+ gnunet-service-dns.c
+gnunet_service_dns_LDADD = \
+ $(top_builddir)/src/dns/libgnunetdnsstub.la \
+ $(top_builddir)/src/tun/libgnunettun.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
+gnunet_service_dns_DEPENDENCIES = \
+ libgnunetdnsstub.la
libgnunetdnsparser_la_SOURCES = \
dnsparser.c
libgnunetdnsparser_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
+ $(top_builddir)/src/util/libgnunetutil.la $(XLIB) \
+ -lidn
libgnunetdnsparser_la_LDFLAGS = \
- $(GN_LIB_LDFLAGS)
+ $(GN_LIB_LDFLAGS) \
+ -version-info 1:0:1
+
+libgnunetdnsstub_la_SOURCES = \
+ dnsstub.c
+libgnunetdnsstub_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
+libgnunetdnsstub_la_LDFLAGS = \
+ $(GN_LIB_LDFLAGS) \
+ -version-info 0:0:0
libgnunetdns_la_SOURCES = \
dns_api.c dns.h
libgnunetdns_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la $(XLIB)
libgnunetdns_la_LDFLAGS = \
- $(GN_LIB_LDFLAGS)
-
-libgnunetdnsnew_la_SOURCES = \
- dns_api_new.c dns_new.h
-libgnunetdnsnew_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
-libgnunetdnsnew_la_LDFLAGS = \
- $(GN_LIB_LDFLAGS)
+ $(GN_LIB_LDFLAGS) \
+ -version-info 0:0:0
libgnunet_plugin_block_dns_la_SOURCES = \
plugin_block_dns.c
$(top_builddir)/src/block/$(GN_PLUGIN_LDFLAGS)
+if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
+endif
+EXTRA_DIST = \
+ $(check_SCRIPTS)