From c9ea607e46581744aee3256deb279a7532a66fa8 Mon Sep 17 00:00:00 2001 From: PatR Date: Sat, 18 Jul 2020 01:36:21 -0700 Subject: [PATCH] bring Unix 'make depend' up to date and run it. We need to do some about preserving the Makefiles as they were before the obsolete code went away, because many of the bits that that obsolete code depended on are now going away too. --- sys/unix/Makefile.src | 299 ++++++++++++++++-------------------------- 1 file changed, 113 insertions(+), 186 deletions(-) diff --git a/sys/unix/Makefile.src b/sys/unix/Makefile.src index c7c955888..35381793f 100644 --- a/sys/unix/Makefile.src +++ b/sys/unix/Makefile.src @@ -165,7 +165,7 @@ SYSOBJ = ioctl.o unixmain.o unixtty.o unixunix.o unixres.o ../lib/lua/liblua.a # directories. The ones given below is the usual spot for linux systems. # The paths are for glibconfig.h and gnomesupport.h respectively. # -GNOMEINC=-I/usr/lib/glib/include -I/usr/lib/gnome-libs/include -I../win/gnome +#GNOMEINC=-I/usr/lib/glib/include -I/usr/lib/gnome-libs/include -I../win/gnome # flags for debugging: # CFLAGS = -g -I../include @@ -226,9 +226,13 @@ WINX11OBJ = Window.o dialogs.o winX.o winmap.o winmenu.o winmesg.o \ # # Files for a Qt 3 port (renamed since nethack 3.6.x) # -WINQT3SRC = ../win/Qt3/qt3_win.cpp ../win/Qt3/qt3_clust.cpp \ - ../win/Qt3/qt3tableview.cpp -WINQT3OBJ = qt3_win.o qt3_clust.o qt3tableview.o tile.o +#WINQT3SRC = ../win/Qt3/qt3_win.cpp ../win/Qt3/qt3_clust.cpp \ +# ../win/Qt3/qt3tableview.cpp +#WINQT3OBJ = qt3_win.o qt3_clust.o qt3tableview.o tile.o +# empty values for 'make depend' +WINQT3SRC = +WINQT3OBJ = + # # Files for a Qt 4 or 5 port # @@ -248,20 +252,28 @@ WINQTOBJ = qt_bind.o qt_click.o qt_clust.o qt_delay.o qt_glyph.o qt_icon.o \ # # Files for a Gnome port # -WINGNOMESRC = ../win/gnome/gnaskstr.c ../win/gnome/gnbind.c \ - ../win/gnome/gnglyph.c ../win/gnome/gnmain.c ../win/gnome/gnmap.c \ - ../win/gnome/gnmenu.c ../win/gnome/gnmesg.c ../win/gnome/gnopts.c \ - ../win/gnome/gnplayer.c ../win/gnome/gnsignal.c \ - ../win/gnome/gnstatus.c ../win/gnome/gntext.c ../win/gnome/gnyesno.c \ - ../win/gnome/gnworn.c -WINGNOMEOBJ = gnaskstr.o gnbind.o gnglyph.o gnmain.o gnmap.o gnmenu.o \ - gnmesg.o gnopts.o gnplayer.o gnsignal.o gnstatus.o gntext.o \ - gnyesno.o gnworn.o tile.o +#WINGNOMESRC = ../win/gnome/gnaskstr.c ../win/gnome/gnbind.c \ +# ../win/gnome/gnglyph.c ../win/gnome/gnmain.c ../win/gnome/gnmap.c \ +# ../win/gnome/gnmenu.c ../win/gnome/gnmesg.c ../win/gnome/gnopts.c \ +# ../win/gnome/gnplayer.c ../win/gnome/gnsignal.c \ +# ../win/gnome/gnstatus.c ../win/gnome/gntext.c ../win/gnome/gnyesno.c \ +# ../win/gnome/gnworn.c +#WINGNOMEOBJ = gnaskstr.o gnbind.o gnglyph.o gnmain.o gnmap.o gnmenu.o \ +# gnmesg.o gnopts.o gnplayer.o gnsignal.o gnstatus.o gntext.o \ +# gnyesno.o gnworn.o tile.o +# empty values for 'make depend' +WINGNOMESRC = +WINGNOMEOBJ = + # # Files for a Gem port -WINGEMSRC = ../win/gem/wingem.c ../win/gem/wingem1.c ../win/gem/load_img.c \ - ../win/gem/gr_rect.c tile.c -WINGEMOBJ = wingem.o wingem1.o load_img.o gr_rect.o tile.o +#WINGEMSRC = ../win/gem/wingem.c ../win/gem/wingem1.c ../win/gem/load_img.c \ +# ../win/gem/gr_rect.c tile.c +#WINGEMOBJ = wingem.o wingem1.o load_img.o gr_rect.o tile.o +# empty values for 'make depend' +WINGEMSRC = +WINGEMOBJ = + # # Files for a BeOS InterfaceKit port -- not ready for prime time WINBESRC = @@ -461,12 +473,12 @@ HACKCSRC = allmain.c alloc.c apply.c artifact.c attrib.c ball.c bones.c \ windows.c wizard.c worm.c worn.c write.c zap.c # all operating-system-dependent .c (for dependencies and such) -SYSCSRC = ../sys/atari/tos.c ../sys/share/pcmain.c ../sys/share/pcsys.c \ +SYSCSRC = ../sys/share/pcmain.c ../sys/share/pcsys.c \ ../sys/share/pctty.c ../sys/share/pcunix.c \ ../sys/share/pmatchregex.c ../sys/share/posixregex.c \ ../sys/share/random.c \ ../sys/share/ioctl.c ../sys/share/unixtty.c ../sys/unix/unixmain.c \ - ../sys/unix/unixunix.c ../sys/unix/unixres.c ../sys/be/bemain.c + ../sys/unix/unixunix.c ../sys/unix/unixres.c SYSCXXSRC = ../sys/share/cppregex.cpp # generated source files (tile.c is handled separately via WINxxxSRC) @@ -730,11 +742,12 @@ depend: ../sys/unix/depend.awk \ # DO NOT DELETE THIS LINE OR CHANGE ANYTHING BEYOND IT # config.h timestamp -$(CONFIG_H): ../include/config.h ../include/patchlevel.h ../include/config1.h \ - ../include/tradstdc.h ../include/global.h ../include/coord.h \ - ../include/vmsconf.h ../include/system.h ../include/nhlua.h \ - ../include/unixconf.h ../include/micro.h ../include/pcconf.h \ - ../include/ntconf.h ../include/fnamesiz.h +$(CONFIG_H): ../include/config.h ../include/config1.h ../include/patchlevel.h \ + ../include/../win/Qt/qt_redef.h ../include/tradstdc.h \ + ../include/global.h ../include/coord.h ../include/vmsconf.h \ + ../include/system.h ../include/nhlua.h ../include/unixconf.h \ + ../include/pcconf.h ../include/micro.h ../include/ntconf.h \ + ../include/fnamesiz.h touch $(CONFIG_H) # hack.h timestamp $(HACK_H): ../include/hack.h $(CONFIG_H) ../include/lint.h ../include/align.h \ @@ -745,17 +758,14 @@ $(HACK_H): ../include/hack.h $(CONFIG_H) ../include/lint.h ../include/align.h \ ../include/wintype.h ../include/context.h ../include/rm.h \ ../include/botl.h ../include/rect.h ../include/region.h \ ../include/decl.h ../include/quest.h ../include/spell.h \ - ../include/color.h ../include/obj.h ../include/you.h \ - ../include/attrib.h ../include/monst.h ../include/mextra.h \ - ../include/skills.h ../include/onames.h ../include/timeout.h \ - ../include/trap.h ../include/flag.h ../include/vision.h \ - ../include/display.h ../include/engrave.h \ - ../include/winprocs.h ../include/sys.h ../include/wintty.h \ - ../include/trampoli.h + ../include/color.h ../include/obj.h ../include/engrave.h \ + ../include/you.h ../include/attrib.h ../include/monst.h \ + ../include/mextra.h ../include/skills.h ../include/onames.h \ + ../include/timeout.h ../include/trap.h ../include/flag.h \ + ../include/vision.h ../include/display.h ../include/winprocs.h \ + ../include/sys.h ../include/wintty.h ../include/trampoli.h touch $(HACK_H) # -tos.o: ../sys/atari/tos.c $(HACK_H) ../include/tcap.h - $(CC) $(CFLAGS) -c -o $@ ../sys/atari/tos.c pcmain.o: ../sys/share/pcmain.c $(HACK_H) ../include/dlb.h $(CC) $(CFLAGS) -c -o $@ ../sys/share/pcmain.c pcsys.o: ../sys/share/pcsys.c $(HACK_H) @@ -780,8 +790,6 @@ unixunix.o: ../sys/unix/unixunix.c $(HACK_H) $(CC) $(CFLAGS) -c -o $@ ../sys/unix/unixunix.c unixres.o: ../sys/unix/unixres.c $(CONFIG_H) $(CC) $(CFLAGS) -c -o $@ ../sys/unix/unixres.c -bemain.o: ../sys/be/bemain.c $(HACK_H) ../include/dlb.h - $(CC) $(CFLAGS) -c -o $@ ../sys/be/bemain.c getline.o: ../win/tty/getline.c $(HACK_H) ../include/func_tab.h $(CC) $(CFLAGS) -c -o $@ ../win/tty/getline.c termcap.o: ../win/tty/termcap.c $(HACK_H) ../include/tcap.h @@ -841,195 +849,113 @@ wintext.o: ../win/X11/wintext.c $(HACK_H) ../include/winX.h ../include/xwindow.h winval.o: ../win/X11/winval.c $(HACK_H) ../include/winX.h $(CC) $(CFLAGS) $(X11CFLAGS) -c -o $@ ../win/X11/winval.c tile.o: tile.c $(HACK_H) -gnaskstr.o: ../win/gnome/gnaskstr.c ../win/gnome/gnaskstr.h \ - ../win/gnome/gnmain.h - $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnaskstr.c -gnbind.o: ../win/gnome/gnbind.c ../win/gnome/gnbind.h ../win/gnome/gnomeprv.h \ - $(HACK_H) ../include/dlb.h \ - ../include/winGnome.h ../win/gnome/gnmain.h \ - ../win/gnome/gnmap.h ../win/gnome/gnmenu.h \ - ../win/gnome/gnplayer.h ../win/gnome/gnsignal.h \ - ../win/gnome/gnglyph.h ../win/gnome/gnstatus.h \ - ../win/gnome/gntext.h ../win/gnome/gnmesg.h \ - ../win/gnome/gnyesno.h ../win/gnome/gnworn.h \ - ../win/gnome/gnaskstr.h - $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnbind.c -gnglyph.o: ../win/gnome/gnglyph.c ../win/gnome/gnglyph.h $(CONFIG_H) \ - ../include/tile2x11.h - $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnglyph.c -gnmain.o: ../win/gnome/gnmain.c ../win/gnome/gnmain.h ../win/gnome/gnsignal.h \ - ../win/gnome/gnomeprv.h $(HACK_H) ../include/dlb.h \ - ../include/winGnome.h ../win/gnome/gnglyph.h \ - ../win/gnome/gnbind.h ../win/gnome/gnmap.h \ - ../win/gnome/gnmenu.h ../win/gnome/gnplayer.h \ - ../win/gnome/gnstatus.h ../win/gnome/gntext.h \ - ../win/gnome/gnmesg.h ../win/gnome/gnyesno.h \ - ../win/gnome/gnworn.h ../win/gnome/gnopts.h ../include/date.h - $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnmain.c -gnmap.o: ../win/gnome/gnmap.c ../win/gnome/gnmap.h $(CONFIG_H) \ - ../win/gnome/gnglyph.h ../win/gnome/gnsignal.h \ - ../win/gnome/gnomeprv.h $(HACK_H) ../include/dlb.h \ - ../include/winGnome.h - $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnmap.c -gnmenu.o: ../win/gnome/gnmenu.c ../win/gnome/gnmenu.h $(CONFIG_H) \ - ../win/gnome/gnomeprv.h $(HACK_H) ../include/dlb.h \ - ../include/winGnome.h ../win/gnome/gnmain.h \ - ../win/gnome/gnbind.h ../win/gnome/gnmap.h \ - ../win/gnome/gnplayer.h ../win/gnome/gnsignal.h \ - ../win/gnome/gnglyph.h ../win/gnome/gnstatus.h \ - ../win/gnome/gntext.h ../win/gnome/gnmesg.h \ - ../win/gnome/gnyesno.h ../win/gnome/gnworn.h \ - ../include/func_tab.h - $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnmenu.c -gnmesg.o: ../win/gnome/gnmesg.c ../win/gnome/gnmesg.h $(CONFIG_H) \ - ../win/gnome/gnsignal.h ../win/gnome/gnomeprv.h $(HACK_H) \ - ../include/dlb.h ../include/winGnome.h ../win/gnome/gnglyph.h - $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnmesg.c -gnopts.o: ../win/gnome/gnopts.c ../win/gnome/gnopts.h ../win/gnome/gnglyph.h \ - $(CONFIG_H) ../win/gnome/gnmain.h ../win/gnome/gnmap.h $(HACK_H) - $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnopts.c -gnplayer.o: ../win/gnome/gnplayer.c ../win/gnome/gnplayer.h \ - ../win/gnome/gnmain.h $(HACK_H) - $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnplayer.c -gnsignal.o: ../win/gnome/gnsignal.c ../win/gnome/gnsignal.h \ - ../win/gnome/gnomeprv.h $(HACK_H) ../include/dlb.h \ - ../include/winGnome.h ../win/gnome/gnglyph.h \ - ../win/gnome/gnmain.h - $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnsignal.c -gnstatus.o: ../win/gnome/gnstatus.c ../win/gnome/gnstatus.h $(CONFIG_H) \ - ../win/gnome/gnsignal.h ../win/gnome/gnomeprv.h $(HACK_H) \ - ../include/dlb.h ../include/winGnome.h \ - ../win/gnome/gnglyph.h ../win/gnome/gn_xpms.h - $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnstatus.c -gntext.o: ../win/gnome/gntext.c ../win/gnome/gntext.h $(CONFIG_H) \ - ../win/gnome/gnmain.h ../win/gnome/gn_rip.h - $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gntext.c -gnyesno.o: ../win/gnome/gnyesno.c ../win/gnome/gnbind.h \ - ../win/gnome/gnomeprv.h $(HACK_H) ../include/dlb.h \ - ../include/winGnome.h ../win/gnome/gnmain.h \ - ../win/gnome/gnmap.h ../win/gnome/gnmenu.h \ - ../win/gnome/gnplayer.h ../win/gnome/gnsignal.h \ - ../win/gnome/gnglyph.h ../win/gnome/gnstatus.h \ - ../win/gnome/gntext.h ../win/gnome/gnmesg.h \ - ../win/gnome/gnyesno.h ../win/gnome/gnworn.h - $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnyesno.c -gnworn.o: ../win/gnome/gnworn.c ../win/gnome/gnworn.h $(CONFIG_H) \ - ../win/gnome/gnglyph.h ../win/gnome/gnsignal.h \ - ../win/gnome/gnomeprv.h $(HACK_H) ../include/dlb.h \ - ../include/winGnome.h - $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnworn.c -wingem.o: ../win/gem/wingem.c $(HACK_H) ../include/func_tab.h ../include/dlb.h \ - ../include/wingem.h - $(CC) $(CFLAGS) -c -o $@ ../win/gem/wingem.c -wingem1.o: ../win/gem/wingem1.c ../include/gem_rsc.h ../include/load_img.h \ - ../include/gr_rect.h ../include/wintype.h ../include/wingem.h - $(CC) $(CFLAGS) -c -o $@ ../win/gem/wingem1.c -load_img.o: ../win/gem/load_img.c ../include/load_img.h - $(CC) $(CFLAGS) -c -o $@ ../win/gem/load_img.c -gr_rect.o: ../win/gem/gr_rect.c ../include/gr_rect.h - $(CC) $(CFLAGS) -c -o $@ ../win/gem/gr_rect.c -tile.o: tile.c $(HACK_H) cppregex.o: ../sys/share/cppregex.cpp $(CXX) $(CXXFLAGS) -c -o $@ ../sys/share/cppregex.cpp -qt_bind.o: ../win/Qt/qt_bind.cpp $(HACK_H) ../win/Qt/qt_bind.h \ - ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h ../win/Qt/qt_click.h \ - ../win/Qt/qt_delay.h ../win/Qt/qt_xcmd.h ../win/Qt/qt_key.h \ - ../win/Qt/qt_map.h ../win/Qt/qt_win.h ../win/Qt/qt_clust.h \ - ../win/Qt/qt_menu.h ../win/Qt/qt_rip.h ../win/Qt/qt_msg.h \ - ../win/Qt/qt_plsel.h ../win/Qt/qt_svsel.h ../win/Qt/qt_set.h \ - ../win/Qt/qt_stat.h ../win/Qt/qt_icon.h ../win/Qt/qt_streq.h \ - ../win/Qt/qt_line.h ../win/Qt/qt_yndlg.h ../win/Qt/qt_str.h \ - ../include/dlb.h +qt_bind.o: ../win/Qt/qt_bind.cpp $(HACK_H) ../win/Qt/qt_undef.h \ + ../win/Qt/qt_redef.h ../win/Qt/qt_bind.h ../win/Qt/qt_main.h \ + ../win/Qt/qt_kde0.h ../win/Qt/qt_click.h ../win/Qt/qt_delay.h \ + ../win/Qt/qt_xcmd.h ../win/Qt/qt_key.h ../win/Qt/qt_map.h \ + ../win/Qt/qt_win.h ../win/Qt/qt_clust.h ../win/Qt/qt_menu.h \ + ../win/Qt/qt_rip.h ../win/Qt/qt_msg.h ../win/Qt/qt_plsel.h \ + ../win/Qt/qt_svsel.h ../win/Qt/qt_set.h ../win/Qt/qt_stat.h \ + ../win/Qt/qt_icon.h ../win/Qt/qt_streq.h ../win/Qt/qt_line.h \ + ../win/Qt/qt_yndlg.h ../win/Qt/qt_str.h ../include/dlb.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_bind.cpp -qt_click.o: ../win/Qt/qt_click.cpp $(HACK_H) ../win/Qt/qt_click.h +qt_click.o: ../win/Qt/qt_click.cpp $(HACK_H) ../win/Qt/qt_undef.h \ + ../win/Qt/qt_redef.h ../win/Qt/qt_click.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_click.cpp qt_clust.o: ../win/Qt/qt_clust.cpp ../win/Qt/qt_clust.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_clust.cpp -qt_delay.o: ../win/Qt/qt_delay.cpp $(HACK_H) ../win/Qt/qt_delay.h +qt_delay.o: ../win/Qt/qt_delay.cpp $(HACK_H) ../win/Qt/qt_undef.h \ + ../win/Qt/qt_redef.h ../win/Qt/qt_delay.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_delay.cpp qt_glyph.o: ../win/Qt/qt_glyph.cpp $(HACK_H) ../include/tile2x11.h \ - ../win/Qt/qt_glyph.h ../win/Qt/qt_set.h ../win/Qt/qt_str.h + ../win/Qt/qt_undef.h ../win/Qt/qt_redef.h ../win/Qt/qt_glyph.h \ + ../win/Qt/qt_set.h ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_glyph.cpp -qt_icon.o: ../win/Qt/qt_icon.cpp $(HACK_H) ../win/Qt/qt_icon.h +qt_icon.o: ../win/Qt/qt_icon.cpp $(HACK_H) ../win/Qt/qt_undef.h \ + ../win/Qt/qt_redef.h ../win/Qt/qt_icon.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_icon.cpp -qt_inv.o: ../win/Qt/qt_inv.cpp $(HACK_H) ../win/Qt/qt_inv.h \ - ../win/Qt/qt_glyph.h ../win/Qt/qt_set.h +qt_inv.o: ../win/Qt/qt_inv.cpp $(HACK_H) ../win/Qt/qt_undef.h \ + ../win/Qt/qt_redef.h ../win/Qt/qt_inv.h ../win/Qt/qt_glyph.h \ + ../win/Qt/qt_set.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_inv.cpp -qt_key.o: ../win/Qt/qt_key.cpp $(HACK_H) ../win/Qt/qt_key.h +qt_key.o: ../win/Qt/qt_key.cpp $(HACK_H) ../win/Qt/qt_undef.h \ + ../win/Qt/qt_redef.h ../win/Qt/qt_key.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_key.cpp -qt_line.o: ../win/Qt/qt_line.cpp $(HACK_H) ../win/Qt/qt_line.h +qt_line.o: ../win/Qt/qt_line.cpp $(HACK_H) ../win/Qt/qt_undef.h \ + ../win/Qt/qt_redef.h ../win/Qt/qt_line.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_line.cpp -qt_main.o: ../win/Qt/qt_main.cpp $(HACK_H) \ - ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h qt_main.moc \ - ../win/Qt/qt_bind.h ../win/Qt/qt_glyph.h ../win/Qt/qt_inv.h \ - ../win/Qt/qt_key.h ../win/Qt/qt_map.h ../win/Qt/qt_win.h \ - ../win/Qt/qt_clust.h ../win/Qt/qt_msg.h ../win/Qt/qt_set.h \ - ../win/Qt/qt_stat.h ../win/Qt/qt_icon.h ../win/Qt/qt_str.h \ - qt_kde0.moc +qt_main.o: ../win/Qt/qt_main.cpp $(HACK_H) ../win/Qt/qt_undef.h \ + ../win/Qt/qt_redef.h ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h \ + qt_main.moc ../win/Qt/qt_bind.h ../win/Qt/qt_glyph.h \ + ../win/Qt/qt_inv.h ../win/Qt/qt_key.h ../win/Qt/qt_map.h \ + ../win/Qt/qt_win.h ../win/Qt/qt_clust.h ../win/Qt/qt_msg.h \ + ../win/Qt/qt_set.h ../win/Qt/qt_stat.h ../win/Qt/qt_icon.h \ + ../win/Qt/qt_str.h qt_kde0.moc $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_main.cpp -qt_map.o: ../win/Qt/qt_map.cpp $(HACK_H) ../win/Qt/qt_map.h ../win/Qt/qt_win.h \ +qt_map.o: ../win/Qt/qt_map.cpp $(HACK_H) ../win/Qt/qt_undef.h \ + ../win/Qt/qt_redef.h ../win/Qt/qt_map.h ../win/Qt/qt_win.h \ ../win/Qt/qt_clust.h qt_map.moc ../win/Qt/qt_click.h \ ../win/Qt/qt_glyph.h ../win/Qt/qt_xpms.h ../win/Qt/qt_set.h \ ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_map.cpp -qt_menu.o: ../win/Qt/qt_menu.cpp $(HACK_H) ../win/Qt/qt_menu.h \ - ../win/Qt/qt_win.h ../win/Qt/qt_rip.h qt_menu.moc \ - ../win/Qt/qt_glyph.h ../win/Qt/qt_set.h ../win/Qt/qt_streq.h \ - ../win/Qt/qt_line.h ../win/Qt/qt_str.h +qt_menu.o: ../win/Qt/qt_menu.cpp $(HACK_H) ../win/Qt/qt_undef.h \ + ../win/Qt/qt_redef.h ../win/Qt/qt_menu.h ../win/Qt/qt_win.h \ + ../win/Qt/qt_rip.h qt_menu.moc ../win/Qt/qt_glyph.h \ + ../win/Qt/qt_set.h ../win/Qt/qt_streq.h ../win/Qt/qt_line.h \ + ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_menu.cpp -qt_msg.o: ../win/Qt/qt_msg.cpp $(HACK_H) ../win/Qt/qt_msg.h ../win/Qt/qt_win.h \ +qt_msg.o: ../win/Qt/qt_msg.cpp $(HACK_H) ../win/Qt/qt_undef.h \ + ../win/Qt/qt_redef.h ../win/Qt/qt_msg.h ../win/Qt/qt_win.h \ qt_msg.moc ../win/Qt/qt_map.h ../win/Qt/qt_clust.h \ ../win/Qt/qt_set.h ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_msg.cpp -qt_plsel.o: ../win/Qt/qt_plsel.cpp $(HACK_H) ../win/Qt/qt_plsel.h qt_plsel.moc \ +qt_plsel.o: ../win/Qt/qt_plsel.cpp $(HACK_H) ../win/Qt/qt_undef.h \ + ../win/Qt/qt_redef.h ../win/Qt/qt_plsel.h qt_plsel.moc \ ../win/Qt/qt_bind.h ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h \ ../win/Qt/qt_glyph.h ../win/Qt/qt_set.h ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_plsel.cpp -qt_rip.o: ../win/Qt/qt_rip.cpp $(HACK_H) ../win/Qt/qt_rip.h \ - ../win/Qt/qt_bind.h ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h \ - ../win/Qt/qt_str.h +qt_rip.o: ../win/Qt/qt_rip.cpp $(HACK_H) ../win/Qt/qt_undef.h \ + ../win/Qt/qt_redef.h ../win/Qt/qt_rip.h ../win/Qt/qt_bind.h \ + ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_rip.cpp -qt_set.o: ../win/Qt/qt_set.cpp $(HACK_H) ../win/Qt/qt_set.h qt_set.moc \ +qt_set.o: ../win/Qt/qt_set.cpp $(HACK_H) ../win/Qt/qt_undef.h \ + ../win/Qt/qt_redef.h ../win/Qt/qt_set.h qt_set.moc \ ../win/Qt/qt_glyph.h ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_set.cpp -qt_stat.o: ../win/Qt/qt_stat.cpp $(HACK_H) ../win/Qt/qt_stat.h \ - ../win/Qt/qt_win.h ../win/Qt/qt_icon.h qt_stat.moc \ - ../win/Qt/qt_set.h ../win/Qt/qt_str.h ../win/Qt/qt_xpms.h +qt_stat.o: ../win/Qt/qt_stat.cpp $(HACK_H) ../win/Qt/qt_undef.h \ + ../win/Qt/qt_redef.h ../win/Qt/qt_stat.h ../win/Qt/qt_win.h \ + ../win/Qt/qt_icon.h qt_stat.moc ../win/Qt/qt_set.h \ + ../win/Qt/qt_str.h ../win/Qt/qt_xpms.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_stat.cpp qt_str.o: ../win/Qt/qt_str.cpp ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_str.cpp -qt_streq.o: ../win/Qt/qt_streq.cpp $(HACK_H) ../win/Qt/qt_streq.h \ - ../win/Qt/qt_line.h ../win/Qt/qt_str.h - $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_streq.cpp -qt_svsel.o: ../win/Qt/qt_svsel.cpp $(HACK_H) ../win/Qt/qt_svsel.h \ - ../win/Qt/qt_bind.h ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h \ +qt_streq.o: ../win/Qt/qt_streq.cpp $(HACK_H) ../win/Qt/qt_undef.h \ + ../win/Qt/qt_redef.h ../win/Qt/qt_streq.h ../win/Qt/qt_line.h \ ../win/Qt/qt_str.h + $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_streq.cpp +qt_svsel.o: ../win/Qt/qt_svsel.cpp $(HACK_H) ../win/Qt/qt_undef.h \ + ../win/Qt/qt_redef.h ../win/Qt/qt_svsel.h ../win/Qt/qt_bind.h \ + ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_svsel.cpp -qt_win.o: ../win/Qt/qt_win.cpp $(HACK_H) ../win/Qt/qt_win.h \ - ../win/Qt/qt_bind.h ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h \ - ../win/Qt/qt_click.h ../win/Qt/qt_glyph.h ../win/Qt/qt_inv.h \ - ../win/Qt/qt_key.h ../win/Qt/qt_icon.h ../win/Qt/qt_map.h \ - ../win/Qt/qt_clust.h ../win/Qt/qt_menu.h ../win/Qt/qt_rip.h \ - ../win/Qt/qt_msg.h ../win/Qt/qt_set.h +qt_win.o: ../win/Qt/qt_win.cpp $(HACK_H) ../win/Qt/qt_undef.h \ + ../win/Qt/qt_redef.h ../win/Qt/qt_win.h ../win/Qt/qt_bind.h \ + ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h ../win/Qt/qt_click.h \ + ../win/Qt/qt_glyph.h ../win/Qt/qt_inv.h ../win/Qt/qt_key.h \ + ../win/Qt/qt_icon.h ../win/Qt/qt_map.h ../win/Qt/qt_clust.h \ + ../win/Qt/qt_menu.h ../win/Qt/qt_rip.h ../win/Qt/qt_msg.h \ + ../win/Qt/qt_set.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_win.cpp qt_xcmd.o: ../win/Qt/qt_xcmd.cpp $(HACK_H) ../include/func_tab.h \ - ../win/Qt/qt_xcmd.h qt_xcmd.moc ../win/Qt/qt_bind.h \ - ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h ../win/Qt/qt_set.h \ - ../win/Qt/qt_str.h + ../win/Qt/qt_undef.h ../win/Qt/qt_redef.h ../win/Qt/qt_xcmd.h \ + qt_xcmd.moc ../win/Qt/qt_bind.h ../win/Qt/qt_main.h \ + ../win/Qt/qt_kde0.h ../win/Qt/qt_set.h ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_xcmd.cpp -qt_yndlg.o: ../win/Qt/qt_yndlg.cpp $(HACK_H) ../win/Qt/qt_yndlg.h qt_yndlg.moc \ +qt_yndlg.o: ../win/Qt/qt_yndlg.cpp $(HACK_H) ../win/Qt/qt_undef.h \ + ../win/Qt/qt_redef.h ../win/Qt/qt_yndlg.h qt_yndlg.moc \ ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_yndlg.cpp -qt3_win.o: ../win/Qt3/qt3_win.cpp $(HACK_H) ../include/func_tab.h \ - ../include/dlb.h ../include/tile2x11.h \ - ../win/Qt3/qt3_win.h ../win/Qt3/qt3_clust.h \ - ../win/Qt3/qt3_kde0.h ../win/Qt3/qt3_xpms.h qt3_win.moc \ - qt3_kde0.moc qt3tableview.moc - $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt3/qt3_win.cpp -qt3_clust.o: ../win/Qt3/qt3_clust.cpp ../win/Qt3/qt3_clust.h - $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt3/qt3_clust.cpp -qt3tableview.o: ../win/Qt3/qt3tableview.cpp ../win/Qt3/qt3tableview.h - $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt3/qt3tableview.cpp wc_chainin.o: ../win/chain/wc_chainin.c $(HACK_H) $(CC) $(CFLAGS) -c -o $@ ../win/chain/wc_chainin.c wc_chainout.o: ../win/chain/wc_chainout.c $(HACK_H) @@ -1059,7 +985,8 @@ dog.o: dog.c $(HACK_H) dogmove.o: dogmove.c $(HACK_H) ../include/mfndpos.h dokick.o: dokick.c $(HACK_H) dothrow.o: dothrow.c $(HACK_H) -drawing.o: drawing.c $(CONFIG_H) +drawing.o: drawing.c $(CONFIG_H) ../include/color.h ../include/rm.h \ + ../include/objclass.h ../include/monsym.h dungeon.o: dungeon.c $(HACK_H) ../include/dgn_file.h ../include/dlb.h eat.o: eat.c $(HACK_H) end.o: end.c $(HACK_H) ../include/dlb.h