summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2016-03-14 22:24:36 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2016-03-14 22:24:36 +0000
commit4763e69bec94ffb17d26958e4565808438fa979a (patch)
tree262a79bdddf4c97f7e953d138d3ed323611e15d6
parentcc9b534a06add57598b53578ba9ba8460fd61e0b (diff)
downloads6-dns-4763e69bec94ffb17d26958e4565808438fa979a.tar.xz
Fix update/global-links dependencies
-rw-r--r--Makefile4
-rw-r--r--src/libs6dns/s6dns_engine.c12
2 files changed, 11 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index f5b8657..403f6d4 100644
--- a/Makefile
+++ b/Makefile
@@ -89,9 +89,11 @@ install-data: $(ALL_DATA:src/etc/%=$(DESTDIR)$(datadir)/%)
ifneq ($(exthome),)
-update:
+$(DESTDIR)$(exthome): $(home)
exec $(INSTALL) -l $(notdir $(home)) $(DESTDIR)$(exthome)
+update: $(DESTDIR)$(exthome)
+
global-links: $(DESTDIR)$(exthome) $(SHARED_LIBS:lib%.so.xyzzy=$(DESTDIR)$(sproot)/library.so/lib%.so.$(version_M)) $(BIN_TARGETS:%=$(DESTDIR)$(sproot)/command/%) $(SBIN_TARGETS:%=$(DESTDIR)$(sproot)/command/%)
$(DESTDIR)$(sproot)/command/%: $(DESTDIR)$(home)/command/%
diff --git a/src/libs6dns/s6dns_engine.c b/src/libs6dns/s6dns_engine.c
index 63d8dd6..6cf7797 100644
--- a/src/libs6dns/s6dns_engine.c
+++ b/src/libs6dns/s6dns_engine.c
@@ -107,7 +107,8 @@ static int thisudp (s6dns_engine_t *dt, tain_t const *stamp)
tain_add(&dt->localdeadline, stamp, &tain_infinite_relative) ;
dt->flagreading = 0 ;
dt->flagwriting = 1 ;
- if (dt->debughook && dt->debughook->pre_send) (*dt->debughook->pre_send)(dt, dt->debughook->external) ;
+ if (dt->debughook && dt->debughook->pre_send)
+ (*dt->debughook->pre_send)(dt, dt->debughook->external) ;
return 1 ;
}
@@ -138,7 +139,8 @@ static int thistcp (s6dns_engine_t *dt, tain_t const *stamp)
dt->protostate = 0 ;
dt->flagtcp = dt->flagconnecting = dt->flagwriting = 1 ;
dt->flagreading = 0 ;
- if (dt->debughook && dt->debughook->pre_send) (*dt->debughook->pre_send)(dt, dt->debughook->external) ;
+ if (dt->debughook && dt->debughook->pre_send)
+ (*dt->debughook->pre_send)(dt, dt->debughook->external) ;
return 1 ;
}
@@ -176,7 +178,8 @@ static int s6dns_engine_write_udp (s6dns_engine_t *dt, tain_t const *stamp)
tain_addsec(&dt->localdeadline, stamp, s6dns_engine_udp_timeouts[dt->protostate]) ;
dt->flagwriting = 0 ;
dt->flagreading = 1 ;
- if (dt->debughook && dt->debughook->post_send) (*dt->debughook->post_send)(dt, dt->debughook->external) ;
+ if (dt->debughook && dt->debughook->post_send)
+ (*dt->debughook->post_send)(dt, dt->debughook->external) ;
return (errno = EAGAIN, 1) ;
}
@@ -196,7 +199,8 @@ static int s6dns_engine_write_tcp (s6dns_engine_t *dt, tain_t const *stamp)
tain_addsec(&dt->localdeadline, stamp, 10) ;
dt->flagwriting = 0 ;
dt->flagreading = 1 ;
- if (dt->debughook && dt->debughook->post_send) (*dt->debughook->post_send)(dt, dt->debughook->external) ;
+ if (dt->debughook && dt->debughook->post_send)
+ (*dt->debughook->post_send)(dt, dt->debughook->external) ;
return (errno = EAGAIN, 1) ;
}