Description: Fix Makefile CFLAGS, CPPFLAGS and LDFLAGS use in random order.
 Cleaned LDFLAGS which contained CFLAGS in it and changed the compilation target
 to use CLAGS and CPPFLAGS instead. Practical compilation remains the same.
Author: Alexandru Mihail <alexandru.mihail2897@gmail.com>
Origin: maintainer
Forwarded: not-needed (sent by email; upstream has no public tracker)
Last-Update: 2026-05-19
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: mini-httpd/Makefile
===================================================================
--- mini-httpd.orig/Makefile	2026-05-19 19:07:01.555216898 +0300
+++ mini-httpd/Makefile	2026-05-19 19:31:41.603326637 +0300
@@ -15,7 +15,7 @@
 # tree with your OpenSSL installation - depending on how you installed it,
 # it may be in /usr/local instead of /usr/local/ssl.
 #SSL_TREE =	/usr/local/ssl
-#SSL_DEFS =	-DUSE_SSL
+SSL_DEFS =	-DUSE_SSL
 #SSL_INC =	-I$(SSL_TREE)/include
 #SSL_LIBS =	-L$(SSL_TREE)/lib -lssl -lcrypto
 
@@ -23,8 +23,7 @@
 MANDIR =$(DESTDIR)/usr/share/man
 CC =		cc
 CDEFS =		$(SSL_DEFS) $(SSL_INC)
-CFLAGS+=-O $(CDEFS) -ansi -pedantic -U__STRICT_ANSI__ -Wall -Wpointer-arith -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wno-long-long
-LDFLAGS+= `dpkg-buildflags --get CPPFLAGS` `dpkg-buildflags --get CFLAGS` `dpkg-buildflags --get LDFLAGS` -DUSE_SSL
+CFLAGS+=$(CDEFS) -pedantic -Wall -Wpointer-arith -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wno-long-long
 LDLIBS =	$(CRYPT_LIB) $(SSL_LIBS) $(SYSV_LIBS)
 
 all:		mini_httpd htpasswd
@@ -33,13 +32,13 @@
 	$(CC) $(LDFLAGS) mini_httpd.o match.o tdate_parse.o $(LDLIBS) -o mini_httpd -lssl -lcrypto
 
 mini_httpd.o:	mini_httpd.c version.h port.h match.h tdate_parse.h mime_encodings.h mime_types.h
-	$(CC) $(LDFLAGS) -c mini_httpd.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c mini_httpd.c
 
 match.o:	match.c match.h
-	$(CC) $(CFLAGS) -c match.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c match.c
 
 tdate_parse.o:	tdate_parse.c tdate_parse.h
-	$(CC) $(CFLAGS) -c tdate_parse.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c tdate_parse.c
 
 mime_encodings.h: mime_encodings.txt
 	rm -f mime_encodings.h
@@ -58,7 +57,7 @@
 	$(CC) $(LDFLAGS) htpasswd.o $(CRYPT_LIB) -o htpasswd
 
 htpasswd.o:	htpasswd.c
-	$(CC) $(CFLAGS) -c htpasswd.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c htpasswd.c
 
 
 cert:		mini_httpd.pem
