From: ian <ian>
Date: Sat, 19 Jan 2008 16:04:58 +0000 (+0000)
Subject: Have +dbg builds rather than +nd ones
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=3cf577fc0837d201f7c72d1a8350828a42d14043;p=trains.git

Have +dbg builds rather than +nd ones
---

diff --git a/detpic/Makefile b/detpic/Makefile
index edb2eac..b947e9e 100644
--- a/detpic/Makefile
+++ b/detpic/Makefile
@@ -8,11 +8,11 @@ FILES=			variables vectors				\
 			syncwrite mascan energy				\
 			reverse nmra-stream tick watchdog
 
-PROGRAMS=		program program+nd
+PROGRAMS=		program program+dbg
 
-OBJS_program+nd=	$(addsuffix +nd.o, $(FILES))
-XCODEN_program+nd= 	morse
-XCODE1_program+nd= 	ours+pindata
+OBJS_program+dbg=	$(addsuffix +dbg.o, $(FILES))
+XCODEN_program+dbg= 	morse
+XCODE1_program+dbg= 	ours+pindata
 
 OBJS_program=		$(addsuffix .o, $(FILES))
 XCODEN_program= 	morse
@@ -41,9 +41,9 @@ bessar:		program+program.map
 $(SYNCWRITES):	%: ../iwjpictest/%
 		cp $< $@
 
-%+nd.o:		%.asm $(INCLUDES)
-		$(ASSEMBLE) -DNDEBUG=1 -o $@ -c $<
-		@mv $*+nd.lst $*+nd+asm.lst
+%+dbg.o:	%.asm $(INCLUDES)
+		$(ASSEMBLE) -DDEBUG=1 -o $@ -c $<
+		@mv $*+dbg.lst $*+dbg+asm.lst
 
 %+externs.fin: make-externs %.asm $(addsuffix .asm, $(FILES))
 		./$+ >$@.new
@@ -61,7 +61,7 @@ i2clib+panic.mangles: make-panicworthy i2clib.inc i2clib.asm Makefile
 t.%.crash:	crashread program+program.map
 		./$< /dev/ttya0 $(filter-out $<,$^) $* $o
 
-verify%:	program+nd+entire%.hex
+verify%:	program+entire%.hex
 		odyssey-train $* verify $^
 
 verify:		$(addprefix verify,$(PICNOS))
diff --git a/detpic/common.inc b/detpic/common.inc
index 8f276a9..c3537b2 100644
--- a/detpic/common.inc
+++ b/detpic/common.inc
@@ -129,7 +129,7 @@ tickdiv_us equ tick_us * tickdiv
 ;  STATUS	any		trashed
 ;  all others	any		preserved
 
-  ifndef NDEBUG
+  ifdef DEBUG
 ;----------
 Dv macro  ; sorry, but assembler's dw directive isn't case-sensitive
 ;
diff --git a/pic.make b/pic.make
index 969d274..dbd6cc8 100644
--- a/pic.make
+++ b/pic.make
@@ -9,10 +9,10 @@
 #   other possibilities are not ruled out
 #
 # For actual program from detpic, we program (with odyssey-train):
-#      odyssey-train <n> write program+nd+code.hex
+#      odyssey-train <n> write program+code.hex
 # and then later
-#        write/update  program+nd+program/code.hex
-# etc.  since +nd means nondebug.
+#        write/update  program+program/code.hex
+# etc.
 #
 # filename conventions - contents of hex files
 #   FOO.hex		FOO.o (only)