CVS commit: src/libexec/httpd/small
Module Name:src
Committed By: rillig
Date: Thu Apr 8 06:52:42 UTC 2021
Modified Files:
src/libexec/httpd/small: Makefile
Log Message:
bozohttpd-small: fix typo in SRCS, fix targets dependall and lint
The additional ':' after 'main.c' had no effect on the compilation since
the suffix is removed when computing the list of object files. The ':'
excluded main.c from the dependency computation and from lint.
By defining CPPFLAGS instead of CFLAGS, the default "-O2" steps in
again, and the proper flags are passed to lint, which did not work
before at all because it could not find an included file.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/libexec/httpd/small/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/httpd/small/Makefile
diff -u src/libexec/httpd/small/Makefile:1.5 src/libexec/httpd/small/Makefile:1.6
--- src/libexec/httpd/small/Makefile:1.5 Thu Apr 8 06:44:55 2021
+++ src/libexec/httpd/small/Makefile Thu Apr 8 06:52:42 2021
@@ -1,9 +1,10 @@
+# $NetBSD: Makefile,v 1.6 2021/04/08 06:52:42 rillig Exp $
# $eterna: Makefile,v 1.1 2009/05/22 21:51:39 mrg Exp $
# build a 100% lean bozohttpd-small.c
PROG= bozohttpd-small
NOMAN= # defined
-SRCS= bozohttpd-small.c content-bozo-small.c ssl-bozo.c main.c:
+SRCS= bozohttpd-small.c content-bozo-small.c ssl-bozo.c main.c
LEAN_IFDEF_FLAGS= -UDEBUG -DNO_USER_SUPPORT \
-DNO_CGIBIN_SUPPORT -DNO_DIRINDEX_SUPPORT \
@@ -11,7 +12,7 @@ LEAN_IFDEF_FLAGS= -UDEBUG -DNO_USER_SUPP
-DNO_SSL_SUPPORT -UDO_HTPASSWD \
-DNO_LUA_SUPPORT -DNO_BLOCKLIST_SUPPORT
-CFLAGS= -I$(.CURDIR)/.. ${LEAN_IFDEF_FLAGS}
+CPPFLAGS= -I$(.CURDIR)/.. ${LEAN_IFDEF_FLAGS}
bozohttpd-small.c: bozohttpd.c
unifdef $(LEAN_IFDEF_FLAGS) < $> > $@.tmp; \
CVS commit: src/libexec/httpd/small
Module Name:src
Committed By: rillig
Date: Thu Apr 8 06:44:55 UTC 2021
Modified Files:
src/libexec/httpd/small: Makefile
Log Message:
bozohttpd-small: fix error handling for unifdef
The second of the '$$?' was spelled only '$?'. At the time where this
shell expression was evaluated, it had already been overwritten by the
preceding command '['.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/libexec/httpd/small/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/httpd/small/Makefile
diff -u src/libexec/httpd/small/Makefile:1.4 src/libexec/httpd/small/Makefile:1.5
--- src/libexec/httpd/small/Makefile:1.4 Mon Jul 13 10:35:17 2020
+++ src/libexec/httpd/small/Makefile Thu Apr 8 06:44:55 2021
@@ -14,13 +14,21 @@ LEAN_IFDEF_FLAGS= -UDEBUG -DNO_USER_SUPP
CFLAGS= -I$(.CURDIR)/.. ${LEAN_IFDEF_FLAGS}
bozohttpd-small.c: bozohttpd.c
- unifdef $(LEAN_IFDEF_FLAGS) < $> > $@.tmp ;\
- if [ $$? -ne 1 ]; then echo "unifdef returned $?, expecting 1" 2>&1; false; fi
+ unifdef $(LEAN_IFDEF_FLAGS) < $> > $@.tmp; \
+ status=$$?; \
+ if [ $$status -ne 1 ]; then \
+ echo "unifdef returned $$status, expecting 1" 2>&1; \
+ false; \
+ fi
mv -f $@.tmp $@
content-bozo-small.c: content-bozo.c
- unifdef $(LEAN_IFDEF_FLAGS) < $> > $@.tmp ;\
- if [ $$? -ne 1 ]; then echo "unifdef returned $?, expecting 1" 2>&1; false; fi
+ unifdef $(LEAN_IFDEF_FLAGS) < $> > $@.tmp; \
+ status=$$?; \
+ if [ $$status -ne 1 ]; then \
+ echo "unifdef returned $$status, expecting 1" 2>&1; \
+ false; \
+ fi
mv -f $@.tmp $@
CLEANFILES+= content-bozo-small.c bozohttpd-small.c
CVS commit: src/libexec/httpd/small
Module Name:src
Committed By: jruoho
Date: Mon Jul 13 10:35:17 UTC 2020
Modified Files:
src/libexec/httpd/small: Makefile
Log Message:
Add -DNO_BLOCKLIST_SUPPORT also to small/Makefile.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/libexec/httpd/small/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/httpd/small/Makefile
diff -u src/libexec/httpd/small/Makefile:1.3 src/libexec/httpd/small/Makefile:1.4
--- src/libexec/httpd/small/Makefile:1.3 Thu Jul 17 06:24:57 2014
+++ src/libexec/httpd/small/Makefile Mon Jul 13 10:35:17 2020
@@ -9,7 +9,7 @@ LEAN_IFDEF_FLAGS= -UDEBUG -DNO_USER_SUPP
-DNO_CGIBIN_SUPPORT -DNO_DIRINDEX_SUPPORT \
-DNO_DAEMON_MODE -DNO_DYNAMIC_CONTENT \
-DNO_SSL_SUPPORT -UDO_HTPASSWD \
- -DNO_LUA_SUPPORT
+ -DNO_LUA_SUPPORT -DNO_BLOCKLIST_SUPPORT
CFLAGS= -I$(.CURDIR)/.. ${LEAN_IFDEF_FLAGS}
CVS commit: src/libexec/httpd/small
Module Name:src Committed By: mrg Date: Thu Jul 17 06:24:57 UTC 2014 Modified Files: src/libexec/httpd/small: Makefile Log Message: link against main.c and ssl-bozo.c (which provides the IO backend.) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/libexec/httpd/small/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/httpd/small/Makefile diff -u src/libexec/httpd/small/Makefile:1.2 src/libexec/httpd/small/Makefile:1.3 --- src/libexec/httpd/small/Makefile:1.2 Thu Jan 2 08:21:39 2014 +++ src/libexec/httpd/small/Makefile Thu Jul 17 06:24:57 2014 @@ -3,7 +3,7 @@ # build a 100% lean bozohttpd-small.c PROG= bozohttpd-small NOMAN= # defined -SRCS= bozohttpd-small.c content-bozo-small.c +SRCS= bozohttpd-small.c content-bozo-small.c ssl-bozo.c main.c: LEAN_IFDEF_FLAGS= -UDEBUG -DNO_USER_SUPPORT \ -DNO_CGIBIN_SUPPORT -DNO_DIRINDEX_SUPPORT \
