From 477d948682bb1f28f516477d904bc47a02ece068 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 27 Jan 2013 15:27:16 +0000
Subject: [PATCH] build improvements

---
 debian/changelog | 2 ++
 settings.make    | 2 +-
 www-cgi/Makefile | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6f9b1e0..11faf52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ userv-utils (0.5.0) unstable; urgency=low
   * ipif: Improve documentation comment.
   * ipif: Some portability improvements.
   * Remove .cvsignore files.
+  * Pass -g to linker, by default.
+  * www-cgi: clean target removes *.o.
 
  --
 
diff --git a/settings.make b/settings.make
index 2fa37e7..0c4de29 100644
--- a/settings.make
+++ b/settings.make
@@ -40,7 +40,7 @@ services=	$(etcuserv)/services.d
 CFLAGS=	-Wall -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes \
 	-Wpointer-arith -D_GNU_SOURCE -Wno-pointer-sign \
 	$(OPTIMISE) $(DEBUG) $(SUBDIR_CFLAGS)
-LDFLAGS= $(SUBDIR_LDFLAGS)
+LDFLAGS= $(SUBDIR_LDFLAGS) $(DEBUG)
 
 OPTIMISE=	-O2
 DEBUG=		-g
diff --git a/www-cgi/Makefile b/www-cgi/Makefile
index 440de6b..57c1d6a 100644
--- a/www-cgi/Makefile
+++ b/www-cgi/Makefile
@@ -44,4 +44,4 @@ install-examples:
 install-docs:
 
 clean distclean realclean:
-		rm -f $(TARGETS)
+		rm -f $(TARGETS) *.o
-- 
2.30.2