X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fdns%2FMakefile.am;h=b9f2622702b29bf1cb1be8c53903ecb81a81da4f;hb=70466ec3c34f9a920e9e798e3169f886e9486a59;hp=d8c2cd1c1d30b4316954b6c21d207c03916e0cdf;hpb=9bce094f751c1e80a41c4ea509845205e8842845;p=oweals%2Fgnunet.git diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am index d8c2cd1c1..b9f262270 100644 --- a/src/dns/Makefile.am +++ b/src/dns/Makefile.am @@ -10,6 +10,8 @@ endif pkgcfgdir= $(pkgdatadir)/config.d/ +libexecdir= $(pkglibdir)/libexec/ + plugindir = $(libdir)/gnunet pkgcfg_DATA = \ @@ -18,20 +20,17 @@ pkgcfg_DATA = \ if LINUX HIJACKBIN = gnunet-helper-dns install-exec-hook: - $(SUDO_BINARY) chown root $(bindir)/gnunet-helper-dns || true - $(SUDO_BINARY) chgrp $(GNUNETDNS_GROUP) $(bindir)/gnunet-helper-dns || true - $(SUDO_BINARY) chmod 4750 $(bindir)/gnunet-helper-dns || true - $(SUDO_BINARY) chgrp $(GNUNETDNS_GROUP) $(bindir)/gnunet-service-dns || true - $(SUDO_BINARY) chmod 2755 $(bindir)/gnunet-service-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 \ + libgnunetdnsstub.la \ libgnunetdns.la -bin_PROGRAMS = \ +libexec_PROGRAMS = \ gnunet-service-dns $(HIJACKBIN) noinst_PROGRAMS = \ @@ -40,9 +39,10 @@ noinst_PROGRAMS = \ plugin_LTLIBRARIES = \ libgnunet_plugin_block_dns.la +if LINUX check_SCRIPTS = \ test_gnunet_dns.sh - +endif gnunet_helper_dns_SOURCES = \ gnunet-helper-dns.c @@ -73,24 +73,39 @@ gnunet_dns_redirector_DEPENDENCIES = \ 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/mesh/libgnunetmesh.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 0:0:0 + +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) + $(GN_LIB_LDFLAGS) \ + -version-info 0:0:0 libgnunet_plugin_block_dns_la_SOURCES = \ plugin_block_dns.c