Have +dbg builds rather than +nd ones

diff --git a/detpic/Makefile b/detpic/Makefile
index edb2eacd22a7e7b7668ae395353c6088b382aed5..b947e9eb97303753b2077536ed85c5ae1a736da7 100644 (file)
--- 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 8f276a9bd245e4c27c0aa3616428b0a89c417747..c3537b231564c3a303d62dee0481904126a2cc6a 100644 (file)
--- 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 969d274875ff70a7de7a39d4d2a33ceb1219e695..dbd6cc8d0e1dc01f042ba515f9da79b41997876e 100644 (file)
--- 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)