INN commit: trunk (backends/Makefile frontends/Makefile)

INN Commit rra at isc.org
Mon Nov 23 19:21:31 UTC 2020


    Date: Monday, November 23, 2020 @ 11:21:30
  Author: iulius
Revision: 10425

Fix other circular dependencies in builds

Modified:
  trunk/backends/Makefile
  trunk/frontends/Makefile

--------------------+
 backends/Makefile  |    6 +++---
 frontends/Makefile |    3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

Modified: backends/Makefile
===================================================================
--- backends/Makefile	2020-11-22 21:16:26 UTC (rev 10424)
+++ backends/Makefile	2020-11-23 19:21:30 UTC (rev 10425)
@@ -81,9 +81,9 @@
 	@exit 1
 
 actsync:	actsync.o    $(LIBINN)	; $(LINK) actsync.o    $(INNLIBS)
-archive:	archive.o    $(BOTH)	; $(LINK) archive.o    $(STORELIBS)
-batcher:	batcher.o    $(BOTH)	; $(LINK) batcher.o    $(STORELIBS)
-cvtbatch:	cvtbatch.o   $(BOTH)	; $(LINK) cvtbatch.o   $(STORELIBS)
+archive:	archive.o    $(BOTH)	; $(LINKDEPS) archive.o  $(STORELIBS)
+batcher:	batcher.o    $(BOTH)	; $(LINKDEPS) batcher.o  $(STORELIBS)
+cvtbatch:	cvtbatch.o   $(BOTH)	; $(LINKDEPS) cvtbatch.o $(STORELIBS)
 innbind:	innbind.o    $(LIBINN)	; $(LINK) innbind.o    $(INNLIBS)
 inndf:		inndf.o      $(BOTH)	; $(LINKDEPS) inndf.o  $(STORELIBS)
 innxbatch:	innxbatch.o  $(LIBINN)	; $(LINK) innxbatch.o  $(INNLIBS)

Modified: frontends/Makefile
===================================================================
--- frontends/Makefile	2020-11-22 21:16:26 UTC (rev 10424)
+++ frontends/Makefile	2020-11-23 19:21:30 UTC (rev 10425)
@@ -89,7 +89,8 @@
 ovdb_stat:	ovdb_stat.o    $(BOTH)
 	$(LINKDEPS) ovdb_stat.o    $(STORELIBS)
 rnews:		rnews.o        $(BOTH)   ; $(LINK) rnews.o        $(STORELIBS)
-sm:		sm.o           $(BOTH)   ; $(LINK) sm.o           $(STORELIBS)
+sm:		sm.o           $(BOTH)
+	$(LINKDEPS) sm.o           $(STORELIBS)
 
 ovdb_init.o: ovdb_init.c
 	$(LIBCC) $(CFLAGS) $(BDB_CPPFLAGS) -c $<



More information about the inn-committers mailing list