Always add compiler options (COPT) in builds

When running "make warnings" inside a subdirectory, COPT was not taken into account. It was only when run at top-level.
InterNetNews · Jul 8, 2023 · ea68c8c · ea68c8c
1 parent e370638
commit ea68c8c
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 14 deletions.
diff --git a/authprogs/Makefile b/authprogs/Makefile
@@ -12,7 +12,7 @@ SOURCES       = auth_krb5.c ckpasswd.c domain.c ident.c libinnauth.c radius.c
 all: $(ALL)
 
 warnings:
-	$(MAKE) COPT='$(WARNINGS)' all
+	$(MAKE) COPT="$(COPT) $(WARNINGS)" all
 
 install: all
 	if [ x"$(KRB5_AUTH)" != x ] ; then \

diff --git a/backends/Makefile b/backends/Makefile
@@ -18,7 +18,7 @@ SOURCES       = actsync.c archive.c batcher.c buffchan.c cvtbatch.c \
 all: $(ALL) $(MAN)
 
 warnings:
-	$(MAKE) COPT='$(WARNINGS)' all
+	$(MAKE) COPT="$(COPT) $(WARNINGS)" all
 
 install: all
 	for F in actmerge actsyncd news2mail nntpsend send-ihave \

diff --git a/contrib/Makefile b/contrib/Makefile
@@ -18,7 +18,7 @@ ALL	      = analyze-traffic archivegz authmysql auth_pass backlogstat \
 all: $(ALL)
 
 warnings:
-	$(MAKE) COPT='$(WARNINGS)' all
+	$(MAKE) COPT="$(COPT) $(WARNINGS)" all
 
 clean clobber distclean maintclean:
 	rm -f *.o $(ALL)

diff --git a/control/Makefile b/control/Makefile
@@ -13,7 +13,7 @@ SOURCES	      = gencancel.c
 all: $(ALL) $(MAN)
 
 warnings:
-	$(MAKE) COPT='$(WARNINGS)' all
+	$(MAKE) COPT="$(COPT) $(WARNINGS)" all
 
 install: all
 	$(LI_XPRI) gencancel $D$(PATHBIN)/gencancel

diff --git a/expire/Makefile b/expire/Makefile
@@ -12,7 +12,7 @@ SOURCES       = convdate.c expire.c expireover.c fastrm.c grephistory.c \
 all: $(ALL)
 
 warnings:
-	$(MAKE) COPT='$(WARNINGS)' all
+	$(MAKE) COPT="$(COPT) $(WARNINGS)" all
 
 install: all
 	for F in convdate fastrm grephistory ; do \

diff --git a/frontends/Makefile b/frontends/Makefile
@@ -23,10 +23,10 @@ PATHRNEWS     = $(PATHBIN)/rnews.libexec
 all: $(ALL) $(MAN)
 
 optional:
-	$(MAKE) COPT='$(WARNINGS)' $(OPTIONAL)
+	$(MAKE) COPT="$(COPT) $(WARNINGS)" $(OPTIONAL)
 
 warnings:
-	$(MAKE) COPT='$(WARNINGS)' all
+	$(MAKE) COPT="$(COPT) $(WARNINGS)" all
 
 install: all
 	$(LI_INEWS) inews $D$(PATHBIN)/inews

diff --git a/history/Makefile b/history/Makefile
@@ -24,7 +24,7 @@ all: library programs
 include Make.methods
 
 warnings:
-	$(MAKE) COPT='$(WARNINGS)' all
+	$(MAKE) COPT="$(COPT) $(WARNINGS)" all
 
 install: all
 	$(LI_LPUB) libinnhist.$(EXTLIB) $D$(PATHLIB)/libinnhist.$(EXTLIB)

diff --git a/innd/Makefile b/innd/Makefile
@@ -16,7 +16,7 @@ OBJECTS		= $(SOURCES:.c=.o)
 all: $(ALL)
 
 warnings:
-	$(MAKE) COPT='$(WARNINGS)' all
+	$(MAKE) COPT="$(COPT) $(WARNINGS)" all
 
 install: all
 	$(LI_XPRI) innd $D$(PATHBIN)/innd

diff --git a/innfeed/Makefile b/innfeed/Makefile
@@ -20,7 +20,7 @@ OBJECTS	      = article.o buffer.o config_l.o config_y.o endpoint.o host.o \
 all: $(ALL)
 
 warnings:
-	$(MAKE) COPT='$(WARNINGS)' all
+	$(MAKE) COPT="$(COPT) $(WARNINGS)" all
 
 install: all
 	$(LI_XPRI) innfeed $D$(PATHBIN)/innfeed

diff --git a/lib/Makefile b/lib/Makefile
@@ -42,7 +42,7 @@ LOBJECTS      = $(OBJECTS:.o=.lo)
 all: libinn.$(EXTLIB) canlock.o perl.o
 
 warnings:
-	$(MAKE) COPT='$(WARNINGS)' all
+	$(MAKE) COPT="$(COPT) $(WARNINGS)" all
 
 install: all
 	$(LI_LPUB) libinn.$(EXTLIB) $D$(PATHLIB)/libinn.$(EXTLIB)

diff --git a/nnrpd/Makefile b/nnrpd/Makefile
@@ -17,7 +17,7 @@ OBJECTS		= $(SOURCES:.c=.o)
 all: $(ALL)
 
 warnings:
-	$(MAKE) COPT='$(WARNINGS)' all
+	$(MAKE) COPT="$(COPT) $(WARNINGS)" all
 
 install: all
 	$(LI_XPUB) nnrpd $D$(PATHBIN)/nnrpd

diff --git a/storage/Makefile b/storage/Makefile
@@ -32,7 +32,7 @@ FIX	= $(SHELL) $(FIXSCRIPT)
 include Make.methods
 
 warnings:
-	$(MAKE) COPT='$(WARNINGS)' all
+	$(MAKE) COPT="$(COPT) $(WARNINGS)" all
 
 install: all
 	$(LI_LPUB) libinnstorage.$(EXTLIB) $D$(PATHLIB)/libinnstorage.$(EXTLIB)

diff --git a/tests/Makefile b/tests/Makefile
@@ -42,7 +42,7 @@ all check test tests: $(TESTS) $(EXTRA)
 build: $(TESTS) $(EXTRA)
 
 warnings:
-	$(MAKE) COPT='$(WARNINGS)' build
+	$(MAKE) COPT="$(COPT) $(WARNINGS)" build
 
 clean clobber distclean maintclean:
 	rm -f *.o *.lo */*.o */*.lo */*/*.o */*/*.o \