some Makefile follow-up

This commit is contained in:
nhmall
2025-08-06 13:51:22 -04:00
parent 52573394f0
commit 75a2a61653
5 changed files with 21 additions and 18 deletions

View File

@@ -769,7 +769,7 @@ hacklib.a: hacklib.o
../win/gnome/gn_rip.h: ../win/X11/rip.xpm
cp ../win/X11/rip.xpm ../win/gnome/gn_rip.h
$(TARGETPFX)sfbase.o: sfbase.c $(HACK_H) ../include/sfprocs.h
$(TARGETPFX)sfbase.o: sfbase.c $(HACK_H) ../include/sfprocs.h ../include/sfmacros.h
# date.c should be recompiled any time any of the source or include code
# is modified.
@@ -1242,7 +1242,7 @@ $(TARGETPFX)role.o: role.c $(HACK_H)
$(TARGETPFX)rumors.o: rumors.c $(HACK_H) ../include/dlb.h
$(TARGETPFX)save.o: save.c $(HACK_H)
$(TARGETPFX)selvar.o: selvar.c $(HACK_H) ../include/sp_lev.h
$(TARGETPFX)sfstruct.o: sfstruct.c $(HACK_H) ../include/sfprocs.h
$(TARGETPFX)sfstruct.o: sfstruct.c $(HACK_H) ../include/sfprocs.h ../include/sfmacros.h
$(TARGETPFX)shk.o: shk.c $(HACK_H)
$(TARGETPFX)shknam.o: shknam.c $(HACK_H)
$(TARGETPFX)sit.o: sit.c $(HACK_H) ../include/artifact.h

View File

@@ -372,13 +372,14 @@ $(TARGETPFX)sf-restore.o: ../src/restore.c $(HACK_H)
$(TARGET_CC) $(TARGET_CFLAGS) $(SFFLAGS) -o $@ -c ../src/restore.c
$(TARGETPFX)sf-rumors.o: ../src/rumors.c $(HACK_H)
$(TARGET_CC) $(TARGET_CFLAGS) $(SFFLAGS) -o $@ -c ../src/rumors.c
$(TARGETPFX)sfbase.o: ../src/sfbase.c $(HACK_H)
$(TARGETPFX)sfbase.o: ../src/sfbase.c $(HACK_H) ../include/sfmacros.h
$(TARGET_CC) $(TARGET_CFLAGS) $(SFFLAGS) -o $@ -c ../src/sfbase.c
$(TARGETPFX)sfdata.o: sfdata.c $(HACK_H) ../include/sfprocs.h ../include/sfproto.h
$(TARGET_CC) $(TARGET_CFLAGS) $(SFFLAGS) -o $@ -c sfdata.c
$(TARGETPFX)sfexpasc.o: sfexpasc.c $(HACK_H) ../include/sfprocs.h ../include/sfproto.h
$(TARGETPFX)sfexpasc.o: sfexpasc.c $(HACK_H) ../include/sfprocs.h \
../include/sfproto.h ../include/sfmacros.h
$(TARGET_CC) $(TARGET_CFLAGS) $(SFFLAGS) -o $@ -c sfexpasc.c
$(TARGETPFX)sf-struct.o: ../src/sfstruct.c $(HACK_H)
$(TARGETPFX)sf-struct.o: ../src/sfstruct.c $(HACK_H) ../include/sfmacros.h
$(TARGET_CC) $(TARGET_CFLAGS) $(SFFLAGS) -o $@ -c ../src/sfstruct.c
$(TARGETPFX)strutil.o: ../src/strutil.c $(HACK_H)
$(TARGET_CC) $(TARGET_CFLAGS) $(SFFLAGS) -o $@ -c ../src/strutil.c

View File

@@ -125,7 +125,7 @@ HACKFILES := allmain alloc apply artifact attrib ball bones \
nhlua nhlsel nhlobj objnam o_init objects \
options pager pickup pline polyself potion pray \
priest quest questpgr read rect region report restore \
rip rnd role rumors save selvar sfstruct \
rip rnd role rumors save selvar sfbase sfstruct \
shk shknam sit sounds \
sp_lev spell stairs steal steed strutil symbols sys teleport \
timeout topten track trap u_init utf8map \
@@ -805,7 +805,8 @@ $(TARGETPFX)role.obj: role.c $(HACK_H)
$(TARGETPFX)rumors.obj: rumors.c $(HACK_H) $(INCL)dlb.h
$(TARGETPFX)save.obj: save.c $(HACK_H)
$(TARGETPFX)selvar.obj: selvar.c $(HACK_H)
$(TARGETPFX)sfstruct.obj: sfstruct.c $(HACK_H)
$(TARGETPFX)sfbase.obj: sfbase.c $(HACK_H) $(INCL)sfprocs.h $(INCL)sfmacros.h
$(TARGETPFX)sfstruct.obj: sfstruct.c $(HACK_H) $(INCL)sfprocs.h $(INCL)sfmacros.h
$(TARGETPFX)shk.obj: shk.c $(HACK_H)
$(TARGETPFX)shknam.obj: shknam.c $(HACK_H)
$(TARGETPFX)sit.obj: sit.c $(HACK_H) $(INCL)artifact.h

View File

@@ -855,11 +855,11 @@ $(OSFC)/sf-restore.o: $(SRC)/restore.c $(HACK_H) | $(OSFC)
$(cc) $(CFLAGSU) $(SFFLAGS) -c $(SRC)/restore.c -o$@
$(OSFC)/sf-rumors.o: $(SRC)/\rumors.c $(HACK_H) | $(OSFC)
$(cc) $(CFLAGSU) $(SFFLAGS) -c $(SRC)/rumors.c -o$@
$(OSFC)/sfbase.o: $(SRC)/sfbase.c $(HACK_H) | $(OSFC)
$(OSFC)/sfbase.o: $(SRC)/sfbase.c $(HACK_H) $(INCL)/sfprocs.h $(INCL)/sfmacros.h | $(OSFC)
$(cc) $(CFLAGSU) $(SFFLAGS) -c $(SRC)/sfbase.c -o$@
$(OSFC)/sfexpasc.o: $(U)sfexpasc.c $(HACK_H) $(INCL)/sfprocs.h $(INCL)/sfproto.h | $(OSFC)
$(OSFC)/sfexpasc.o: $(U)sfexpasc.c $(HACK_H) $(INCL)/sfprocs.h $(INCL)/sfproto.h $(INCL)/sfmacros.h | $(OSFC)
$(cc) $(CFLAGSU) $(SFFLAGS) -c $(U)sfexpasc.c -o$@
$(OSFC)/sf-struct.o: $(SRC)/sfstruct.c $(HACK_H) | $(OSFC)
$(OSFC)/sf-struct.o: $(SRC)/sfstruct.c $(HACK_H) $(INCL)/sfprocs.h $(INCL)/sfmacros.h | $(OSFC)
$(cc) $(CFLAGSU) $(SFFLAGS) -c $(SRC)/sfstruct.c -o$@
$(OSFC)/strutil.o: $(SRC)/strutil.c $(HACK_H) | $(OSFC)
$(cc) $(CFLAGSU) $(SFFLAGS) -c $(SRC)/strutil.c -o$@

View File

@@ -665,7 +665,8 @@ HACKCSRC = \
$(SRC)potion.c $(SRC)pray.c $(SRC)priest.c $(SRC)quest.c \
$(SRC)questpgr.c $(SRC)read.c $(SRC)rect.c $(SRC)region.c \
$(SRC)restore.c $(SRC)rip.c $(SRC)rnd.c $(SRC)role.c \
$(SRC)rumors.c $(SRC)save.c $(SRC)selvar.c $(SRC)sfstruct.c sfbase.c \
$(SRC)rumors.c $(SRC)save.c $(SRC)selvar.c\
$(SRC)sfbase.c $(SRC)sfstruct.c \
$(SRC)shk.c $(SRC)shknam.c $(SRC)sit.c $(SRC)sounds.c \
$(SRC)sp_lev.c $(SRC)spell.c $(SRC)stairs.c $(SRC)steal.c \
$(SRC)steed.c $(SRC)symbols.c $(SRC)sys.c $(SRC)teleport.c \
@@ -1868,11 +1869,11 @@ $(OGUI)date.o: $(HACKINCL) $(HACKSRC) $(HACKOBJ) $(ALLOBJGUI)
@$(MAKE) /NOLOGO /A -f date.nmk
!ENDIF
$(OGUI)sfbase.o: sfbase.c $(HACK_H)
$(OGUI)sfbase.o: sfbase.c $(HACK_H) $(INCL)sfmacros.h
$(Q)$(CC) $(CFLAGS) /EP $(@B).c > $(OGUI)$(@B).c.preproc
$(Q)$(CC) $(CFLAGS) -Fo$@ $(@B).c
$(OTTY)sfbase.o: sfbase.c $(HACK_H)
$(OTTY)sfbase.o: sfbase.c $(HACK_H) $(INCL)sfmacros.h
$(Q)$(CC) $(CFLAGS) /EP $(@B).c > $(OTTY)$(@B).c.preproc
$(Q)$(CC) $(CFLAGS) -Fo$@ $(@B).c
@@ -2513,7 +2514,7 @@ $(OUTL)sfctool.o: $(UTIL)sfctool.c $(HACK_H) $(INCL)sfprocs.h
$(Q)$(CC) $(CFLAGS) $(SFFLAGS) -Fo$@ -c $(UTIL)sfctool.c
$(OUTL)sfdata.o: $(UTIL)sfdata.c $(HACK_H) $(INCL)sfprocs.h $(INCL)sfproto.h
$(Q)$(CC) $(CFLAGS) $(SFFLAGS) -Fo$@ -c $(UTIL)sfdata.c
$(OUTL)sfexpasc.o: $(UTIL)sfexpasc.c $(HACK_H) $(INCL)sfprocs.h $(INCL)sfproto.h
$(OUTL)sfexpasc.o: $(UTIL)sfexpasc.c $(HACK_H) $(INCL)sfprocs.h $(INCL)sfproto.h $(INCL)sfmacros.h
$(Q)$(CC) $(CFLAGS) $(SFFLAGS) -Fo$@ -c $(UTIL)sfexpasc.c
$(OUTL)sf-alloc.o: $(SRC)alloc.c $(HACK_H)
$(Q)$(CC) $(CFLAGS) $(SFFLAGS) -Fo$@ -c $(SRC)alloc.c
@@ -2525,9 +2526,9 @@ $(OUTL)sf-monst.o: $(SRC)monst.c $(HACK_H)
$(Q)$(CC) $(CFLAGS) $(SFFLAGS) -Fo$@ -c $(SRC)monst.c
$(OUTL)sf-objects.o: $(SRC)objects.c $(HACK_H)
$(Q)$(CC) $(CFLAGS) $(SFFLAGS) -Fo$@ -c $(SRC)objects.c
$(OUTL)sfbase.o: $(SRC)sfbase.c $(HACK_H)
$(OUTL)sfbase.o: $(SRC)sfbase.c $(HACK_H) $(INCL)sfmacros.h
$(Q)$(CC) $(CFLAGS) $(SFFLAGS) -Fo$@ -c $(SRC)sfbase.c
$(OUTL)sf-struct.o: $(SRC)sfstruct.c $(HACK_H)
$(OUTL)sf-struct.o: $(SRC)sfstruct.c $(HACK_H) $(INCL)sfmacros.h
$(Q)$(CC) $(CFLAGS) $(SFFLAGS) -Fo$@ -c $(SRC)sfstruct.c
$(OUTL)sf-artifact.o: $(SRC)artifact.c $(HACK_H)
$(Q)$(CC) $(CFLAGS) $(SFFLAGS) -Fo$@ -c $(SRC)artifact.c
@@ -3249,7 +3250,7 @@ $(OTTY)role.o: role.c $(HACK_H)
$(OTTY)rumors.o: rumors.c $(HACK_H) $(INCL)dlb.h
$(OTTY)save.o: save.c $(HACK_H)
$(OTTY)selvar.o: selvar.c $(HACK_H) $(INCL)sp_lev.h
$(OTTY)sfstruct.o: sfstruct.c $(HACK_H)
$(OTTY)sfstruct.o: sfstruct.c $(HACK_H) $(INCL)sfmacros.h
$(Q)$(CC) $(CFLAGS) /EP $(@B).c > $(OTTY)$(@B).c.preproc
$(Q)$(CC) $(CFLAGS) -Fo$@ $(@B).c
$(OTTY)shk.o: shk.c $(HACK_H)
@@ -3627,7 +3628,7 @@ $(OGUI)role.o: role.c $(HACK_H)
$(OGUI)rumors.o: rumors.c $(HACK_H) $(INCL)dlb.h
$(OGUI)save.o: save.c $(HACK_H)
$(OGUI)selvar.o: selvar.c $(HACK_H) $(INCL)sp_lev.h
$(OGUI)sfstruct.o: sfstruct.c $(HACK_H)
$(OGUI)sfstruct.o: sfstruct.c $(HACK_H) $(INCL)sfmacros.h
$(Q)$(CC) $(CFLAGS) /EP $(@B).c > $(OGUI)$(@B).c.preproc
$(Q)$(CC) $(CFLAGS) -Fo$@ $(@B).c
$(OGUI)shk.o: shk.c $(HACK_H)