- simdzone-zone-load, fix makefile for disable-static build.

diff --git a/Makefile.in b/Makefile.in
index 2b5f4b9ead98e80f94394c43353f7c10fbec6776..5d9b586d972fca0f7f164f4e417cc827e011ed3c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -365,24 +365,24 @@ longtest: tests
        if test ! $(srcdir)/testdata -ef ./testdata; then rm -rf testcode testdata; mkdir testcode testdata; cp -R $(srcdir)/testdata/*.sh $(srcdir)/testdata/*.tdir $(srcdir)/testdata/*.rpl $(srcdir)/testdata/*.crpl testdata; cp $(srcdir)/testcode/*.sh testcode; if test ! -d util; then mkdir util; fi; cp $(srcdir)/util/iana_ports.inc util; fi
        if test -x "`which bash`"; then bash testcode/do-tests.sh; else sh testcode/do-tests.sh; fi
 
-simdzone/libzone.a:
+simdzone/libzone.la:
        $(MAKE) -C simdzone
 
-simdzone/include/zone/export.h: simdzone/libzone.a
+simdzone/include/zone/export.h: simdzone/libzone.la
 
 lib:   libunbound.la unbound.h
 
-libunbound.la: simdzone/libzone.a $(LIBUNBOUND_OBJ_LINK)
+libunbound.la: simdzone/libzone.la $(LIBUNBOUND_OBJ_LINK)
        $(LINK_LIB) $(UBSYMS) -o $@ $(LIBUNBOUND_OBJ_LINK) $(SIMDZONE_OBJ) -rpath $(libdir) $(SSLLIB) $(LIBS)
 
 unbound$(EXEEXT):      $(DAEMON_OBJ_LINK) libunbound.la
-       $(LINK) -o $@ $(DAEMON_OBJ_LINK) $(EXTRALINK) simdzone/libzone.a $(SSLLIB) $(LIBS) $(DYNLIBMOD_EXTRALIBS)
+       $(LINK) -o $@ $(DAEMON_OBJ_LINK) $(EXTRALINK) $(SIMDZONE_OBJ) $(SSLLIB) $(LIBS) $(DYNLIBMOD_EXTRALIBS)
 
 unbound-checkconf$(EXEEXT):    $(CHECKCONF_OBJ_LINK) libunbound.la
-       $(LINK) -o $@ $(CHECKCONF_OBJ_LINK) $(EXTRALINK) simdzone/libzone.a $(SSLLIB) $(LIBS)
+       $(LINK) -o $@ $(CHECKCONF_OBJ_LINK) $(EXTRALINK) $(SIMDZONE_OBJ) $(SSLLIB) $(LIBS)
 
 unbound-control$(EXEEXT):      $(CONTROL_OBJ_LINK) libunbound.la
-       $(LINK) -o $@ $(CONTROL_OBJ_LINK) $(EXTRALINK) simdzone/libzone.a $(SSLLIB) $(LIBS)
+       $(LINK) -o $@ $(CONTROL_OBJ_LINK) $(EXTRALINK) $(SIMDZONE_OBJ) $(SSLLIB) $(LIBS)
 
 unbound-host$(EXEEXT): $(HOST_OBJ_LINK) libunbound.la
        $(LINK) -o $@ $(HOST_OBJ_LINK) libunbound.la $(SSLLIB) $(LIBS)
@@ -400,43 +400,43 @@ anchor-update$(EXEEXT):  $(ANCHORUPD_OBJ_LINK) libunbound.la
        $(LINK) -o $@ $(ANCHORUPD_OBJ_LINK) libunbound.la $(LIBS)
 
 unittest$(EXEEXT):     $(UNITTEST_OBJ_LINK)
-       $(LINK) -o $@ $(UNITTEST_OBJ_LINK) simdzone/libzone.a $(SSLLIB) $(LIBS)
+       $(LINK) -o $@ $(UNITTEST_OBJ_LINK) $(SIMDZONE_OBJ) $(SSLLIB) $(LIBS)
 
 testbound$(EXEEXT):    $(TESTBOUND_OBJ_LINK)
-       $(LINK) -o $@ $(TESTBOUND_OBJ_LINK) simdzone/libzone.a $(SSLLIB) $(LIBS)
+       $(LINK) -o $@ $(TESTBOUND_OBJ_LINK) $(SIMDZONE_OBJ) $(SSLLIB) $(LIBS)
 
 lock-verify$(EXEEXT):  $(LOCKVERIFY_OBJ_LINK)
-       $(LINK) -o $@ $(LOCKVERIFY_OBJ_LINK) simdzone/libzone.a $(SSLLIB) $(LIBS)
+       $(LINK) -o $@ $(LOCKVERIFY_OBJ_LINK) $(SIMDZONE_OBJ) $(SSLLIB) $(LIBS)
 
 petal$(EXEEXT):        $(PETAL_OBJ_LINK)
        $(LINK) -o $@ $(PETAL_OBJ_LINK) $(SSLLIB) $(LIBS)
 
 pktview$(EXEEXT):      $(PKTVIEW_OBJ_LINK)
-       $(LINK) -o $@ $(PKTVIEW_OBJ_LINK) simdzone/libzone.a $(SSLLIB) $(LIBS)
+       $(LINK) -o $@ $(PKTVIEW_OBJ_LINK) $(SIMDZONE_OBJ) $(SSLLIB) $(LIBS)
 
 memstats$(EXEEXT):     $(MEMSTATS_OBJ_LINK)
-       $(LINK) -o $@ $(MEMSTATS_OBJ_LINK) simdzone/libzone.a $(SSLLIB) $(LIBS)
+       $(LINK) -o $@ $(MEMSTATS_OBJ_LINK) $(SIMDZONE_OBJ) $(SSLLIB) $(LIBS)
 
 asynclook$(EXEEXT):    $(ASYNCLOOK_OBJ_LINK) libunbound.la
        $(LINK) -o $@ $(ASYNCLOOK_OBJ_LINK) libunbound.la $(SSLLIB) $(LIBS)
 
 streamtcp$(EXEEXT):    $(STREAMTCP_OBJ_LINK)
-       $(LINK) -o $@ $(STREAMTCP_OBJ_LINK) simdzone/libzone.a $(SSLLIB) $(LIBS)
+       $(LINK) -o $@ $(STREAMTCP_OBJ_LINK) $(SIMDZONE_OBJ) $(SSLLIB) $(LIBS)
 
 dohclient$(EXEEXT):    $(DOHCLIENT_OBJ_LINK)
-       $(LINK) -o $@ $(DOHCLIENT_OBJ_LINK) simdzone/libzone.a $(SSLLIB) $(LIBS)
+       $(LINK) -o $@ $(DOHCLIENT_OBJ_LINK) $(SIMDZONE_OBJ) $(SSLLIB) $(LIBS)
 
 doqclient$(EXEEXT):    $(DOQCLIENT_OBJ_LINK)
-       $(LINK) -o $@ $(DOQCLIENT_OBJ_LINK) simdzone/libzone.a $(SSLLIB) $(LIBS)
+       $(LINK) -o $@ $(DOQCLIENT_OBJ_LINK) $(SIMDZONE_OBJ) $(SSLLIB) $(LIBS)
 
 perf$(EXEEXT): $(PERF_OBJ_LINK)
-       $(LINK) -o $@ $(PERF_OBJ_LINK) simdzone/libzone.a $(SSLLIB) $(LIBS)
+       $(LINK) -o $@ $(PERF_OBJ_LINK) $(SIMDZONE_OBJ) $(SSLLIB) $(LIBS)
 
 delayer$(EXEEXT):      $(DELAYER_OBJ_LINK)
-       $(LINK) -o $@ $(DELAYER_OBJ_LINK) simdzone/libzone.a $(SSLLIB) $(LIBS)
+       $(LINK) -o $@ $(DELAYER_OBJ_LINK) $(SIMDZONE_OBJ) $(SSLLIB) $(LIBS)
 
 readzone$(EXEEXT):     $(READZONE_OBJ_LINK)
-       $(LINK) -o $@ $(READZONE_OBJ_LINK) simdzone/libzone.a $(SSLLIB) $(LIBS)
+       $(LINK) -o $@ $(READZONE_OBJ_LINK) $(SIMDZONE_OBJ) $(SSLLIB) $(LIBS)
 
 signit$(EXEEXT):       testcode/signit.c
        $(CC) $(CPPFLAGS) $(CFLAGS) @PTHREAD_CFLAGS_ONLY@ -o $@ testcode/signit.c $(LDFLAGS) -lldns $(SSLLIB) $(LIBS)
@@ -464,7 +464,7 @@ dnstap/dnstap.pb-c.h: dnstap/dnstap.pb-c.c
        touch $@
 
 unbound-dnstap-socket$(EXEEXT):        $(DNSTAP_SOCKET_OBJ_LINK)
-       $(LINK) -o $@ $(DNSTAP_SOCKET_OBJ_LINK) simdzone/libzone.a $(SSLLIB) $(LIBS)
+       $(LINK) -o $@ $(DNSTAP_SOCKET_OBJ_LINK) $(SIMDZONE_OBJ) $(SSLLIB) $(LIBS)
 
 dnstap.pb-c.lo dnstap.pb-c.o: dnstap/dnstap.pb-c.c dnstap/dnstap.pb-c.h
 dtstream.lo dtstream.o: $(srcdir)/dnstap/dtstream.c config.h $(srcdir)/dnstap/dtstream.h