From 1fb9de1375dd6053edc5a20926be215019143180 Mon Sep 17 00:00:00 2001 From: PatR Date: Tue, 17 Nov 2015 03:09:20 -0800 Subject: [PATCH] unix/Makefile.utl typo Confusing build failure, explained by a typo in sys/unix/Makefile.utl. dgn_lex.o didn't get rebuilt after modifying unixconf.h to take out the #define MONITOR_HEAP I had in place, resulting in link failure for dgn_comp because the old object file was referencing 'nhalloc' rather than 'alloc'. dgn_lex.o accidentally didn't care about modifications to config.h and the other headers that pulls in, such as unixconf.h. This typo was already present when the last cvs repository was initialized nearly 14 years ago. --- sys/unix/Makefile.utl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/unix/Makefile.utl b/sys/unix/Makefile.utl index d2ecf09e8..554e08c7a 100644 --- a/sys/unix/Makefile.utl +++ b/sys/unix/Makefile.utl @@ -1,5 +1,5 @@ # Makefile for NetHack's utility programs. -# NetHack 3.6 Makefile.utl $NHDT-Date: 1432512789 2015/05/25 00:13:09 $ $NHDT-Branch: master $:$NHDT-Revision: 1.22 $ +# NetHack 3.6 Makefile.utl $NHDT-Date: 1447758555 2015/11/17 11:09:15 $ $NHDT-Branch: master $:$NHDT-Revision: 1.24 $ # Root of source tree: NHSROOT=.. @@ -23,7 +23,7 @@ NHSROOT=.. # For Bull DPX/2 systems at B.O.S. 2.0 or higher use the following: # # CC = gcc -ansi -D_BULL_SOURCE -D_XOPEN_SOURCE -D_POSIX_SOURCE -# +# # If you are using GCC 2.2.2 or higher on a DPX/2, just use: # # CC = gcc -ansi @@ -96,7 +96,7 @@ NHSROOT=.. #LFLAGS = LIBS = - + # If you are cross-compiling, you must use this: #OBJDIR = . # otherwise, you can save a little bit of disk space with this: @@ -109,7 +109,7 @@ LEX = lex # YACC = bison -y # YACC = byacc # LEX = flex - + # these are the names of the output files from YACC/LEX. Under MS-DOS # and similar systems, they may differ YTABC = y.tab.c @@ -256,7 +256,7 @@ dgn_yacc.o: dgn_yacc.c $(CONFIG_H) ../include/dgn_file.h ../include/date.h dgn_main.o: dgn_main.c $(CONFIG_H) ../include/dlb.h # see dgn_comp.l for WEIRD_LEX discussion -dgn_lex.o: dgn_lex.c $(CONFIG.H) ../include/dgn_comp.h ../include/dgn_file.h +dgn_lex.o: dgn_lex.c $(CONFIG_H) ../include/dgn_comp.h ../include/dgn_file.h @echo $(CC) -c $(CFLAGS) dgn_lex.c @$(CC) -c $(CFLAGS) -DWEIRD_LEX=`egrep -c _cplusplus dgn_lex.c` dgn_lex.c