projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed Namestore API, changed error handling, changed gns record json
[oweals/gnunet.git]
/
src
/
gns
/
Makefile.am
diff --git
a/src/gns/Makefile.am
b/src/gns/Makefile.am
index 8c952be0420e7cc9a33bd80cd01169bffefa1ddb..2c7bb8ebba6a7ae9115e04405c3a363759b75df3 100644
(file)
--- a/
src/gns/Makefile.am
+++ b/
src/gns/Makefile.am
@@
-2,10
+2,8
@@
AM_CPPFLAGS = -I$(top_srcdir)/src/include
if HAVE_GLIBCNSS
AM_CPPFLAGS = -I$(top_srcdir)/src/include
if HAVE_GLIBCNSS
-if INSTALL_NSS
NSS_SUBDIR = nss
endif
NSS_SUBDIR = nss
endif
-endif
SUBDIRS = . $(NSS_SUBDIR)
SUBDIRS = . $(NSS_SUBDIR)
@@
-69,8
+67,8
@@
endif
libexec_PROGRAMS = \
gnunet-service-gns \
libexec_PROGRAMS = \
gnunet-service-gns \
- $(DO_W32_HELPER) \
gnunet-dns2gns \
gnunet-dns2gns \
+ $(DO_W32_HELPER) \
$(DO_PROXY)
bin_PROGRAMS = \
$(DO_PROXY)
bin_PROGRAMS = \
@@
-78,6
+76,9
@@
bin_PROGRAMS = \
$(DO_NONPOSIX_GNSIMPORT) \
gnunet-gns
$(DO_NONPOSIX_GNSIMPORT) \
gnunet-gns
+noinst_PROGRAMS = \
+ gnunet-gns-benchmark
+
if HAVE_MHD
if LINUX
bin_PROGRAMS += gnunet-bcd
if HAVE_MHD
if LINUX
bin_PROGRAMS += gnunet-bcd
@@
-101,7
+102,6
@@
libgnunet_plugin_gnsrecord_gns_la_SOURCES = \
plugin_gnsrecord_gns.c
libgnunet_plugin_gnsrecord_gns_la_LIBADD = \
$(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
plugin_gnsrecord_gns.c
libgnunet_plugin_gnsrecord_gns_la_LIBADD = \
$(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/dns/libgnunetdnsparser.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(LTLIBINTL)
libgnunet_plugin_gnsrecord_gns_la_LDFLAGS = \
$(top_builddir)/src/util/libgnunetutil.la \
$(LTLIBINTL)
libgnunet_plugin_gnsrecord_gns_la_LDFLAGS = \
@@
-113,7
+113,14
@@
gnunet_gns_SOURCES = \
gnunet_gns_LDADD = \
libgnunetgns.la \
$(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
gnunet_gns_LDADD = \
libgnunetgns.la \
$(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+
+gnunet_gns_benchmark_SOURCES = \
+ gnunet-gns-benchmark.c
+gnunet_gns_benchmark_LDADD = \
+ libgnunetgns.la \
+ $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
@@
-132,10
+139,16
@@
gnunet_dns2gns_LDADD = \
libgnunetgns.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/identity/libgnunetidentity.la \
libgnunetgns.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/identity/libgnunetidentity.la \
- $(top_builddir)/src/dns/libgnunetdnsparser.la \
- $(top_builddir)/src/dns/libgnunetdnsstub.la \
$(GN_LIBINTL)
$(GN_LIBINTL)
+if LINUX
+HIJACKBIN = gnunet-dns2gns
+install-exec-hook:
+ $(SUDO_BINARY) setcap 'cap_net_bind_service=+ep' $(DESTDIR)$(libexecdir)/gnunet-dns2gns || true
+else
+install-exec-hook:
+endif
+
gnunet_gns_proxy_SOURCES = \
gnunet-gns-proxy.c
gnunet_gns_proxy_CPPFLAGS = $(AM_CPPFLAGS) $(CPP_GNURL)
gnunet_gns_proxy_SOURCES = \
gnunet-gns-proxy.c
gnunet_gns_proxy_CPPFLAGS = $(AM_CPPFLAGS) $(CPP_GNURL)
@@
-179,7
+192,7
@@
w32nsp_resolve_SOURCES = \
w32nsp_resolve_LDADD = -lws2_32
gnunet_service_gns_SOURCES = \
w32nsp_resolve_LDADD = -lws2_32
gnunet_service_gns_SOURCES = \
- gnunet-service-gns.c \
+ gnunet-service-gns.c
gnunet-service-gns.h
\
gnunet-service-gns_resolver.c gnunet-service-gns_resolver.h \
gnunet-service-gns_interceptor.c gnunet-service-gns_interceptor.h
gnunet_service_gns_LDADD = \
gnunet-service-gns_resolver.c gnunet-service-gns_resolver.h \
gnunet-service-gns_interceptor.c gnunet-service-gns_interceptor.h
gnunet_service_gns_LDADD = \
@@
-190,10
+203,7
@@
gnunet_service_gns_LDADD = \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/dns/libgnunetdns.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/dns/libgnunetdns.la \
- $(top_builddir)/src/dns/libgnunetdnsparser.la \
- $(top_builddir)/src/dns/libgnunetdnsstub.la \
$(top_builddir)/src/dht/libgnunetdht.la \
$(top_builddir)/src/dht/libgnunetdht.la \
- $(top_builddir)/src/tun/libgnunettun.la \
$(top_builddir)/src/namecache/libgnunetnamecache.la \
$(USE_VPN) \
$(GN_LIBINTL)
$(top_builddir)/src/namecache/libgnunetnamecache.la \
$(USE_VPN) \
$(GN_LIBINTL)
@@
-208,9
+218,11
@@
libw32nsp_la_LDFLAGS = \
-no-undefined -static-libgcc
libgnunetgns_la_SOURCES = \
-no-undefined -static-libgcc
libgnunetgns_la_SOURCES = \
- gns_api.c gns.h
+ gns_api.c gns_api.h \
+ gns_tld_api.c gns.h
libgnunetgns_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la $(XLIB) \
libgnunetgns_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la $(XLIB) \
+ $(top_builddir)/src/identity/libgnunetidentity.la \
$(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la
libgnunetgns_la_LDFLAGS = \
$(GN_LIB_LDFLAGS)
$(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la
libgnunetgns_la_LDFLAGS = \
$(GN_LIB_LDFLAGS)
@@
-246,9
+258,10
@@
check_SCRIPTS = \
test_gns_txt_lookup.sh\
test_gns_mx_lookup.sh \
test_gns_gns2dns_lookup.sh \
test_gns_txt_lookup.sh\
test_gns_mx_lookup.sh \
test_gns_gns2dns_lookup.sh \
+ test_gns_gns2dns_cname_lookup.sh \
test_gns_dht_lookup.sh\
test_gns_delegated_lookup.sh \
test_gns_dht_lookup.sh\
test_gns_delegated_lookup.sh \
- test_gns_
plus
_lookup.sh\
+ test_gns_
at
_lookup.sh\
test_gns_zkey_lookup.sh\
test_gns_rel_expiration.sh\
test_gns_soa_lookup.sh\
test_gns_zkey_lookup.sh\
test_gns_rel_expiration.sh\
test_gns_soa_lookup.sh\