diff --git a/sys/unix/Makefile.src b/sys/unix/Makefile.src index 3d54976ea..3efc6fa7b 100644 --- a/sys/unix/Makefile.src +++ b/sys/unix/Makefile.src @@ -171,7 +171,7 @@ GNOMEINC=-I/usr/lib/glib/include -I/usr/lib/gnome-libs/include -I../win/gnome # CFLAGS = -g -I../include #CFLAGS = -O -I../include -#LFLAGS = +#LFLAGS = # -lm required by lua LIBS += -lm @@ -319,7 +319,7 @@ WINGNOMELIB = -lgnomeui -lgnome -lart_lgpl -lgtk -lgdk -lpopt # libraries for Gem port WINGEMLIB = -le_gem -lgem # -# libraries for BeOS +# libraries for BeOS WINBELIB = -lbe # # libraries for curses port @@ -729,11 +729,10 @@ depend: ../sys/unix/depend.awk \ # config.h timestamp $(CONFIG_H): ../include/config.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/os2conf.h ../include/micro.h \ - ../include/pcconf.h ../include/tosconf.h ../include/amiconf.h \ - ../include/macconf.h ../include/beconf.h ../include/wceconf.h \ - ../include/ntconf.h + ../include/system.h ../include/nhlua.h ../include/unixconf.h \ + ../include/os2conf.h ../include/micro.h ../include/pcconf.h \ + ../include/tosconf.h ../include/amiconf.h ../include/macconf.h \ + ../include/beconf.h ../include/wceconf.h ../include/ntconf.h touch $(CONFIG_H) # hack.h timestamp $(HACK_H): ../include/hack.h $(CONFIG_H) ../include/lint.h ../include/align.h \ @@ -755,8 +754,7 @@ $(HACK_H): ../include/hack.h $(CONFIG_H) ../include/lint.h ../include/align.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 \ - ../include/integer.h +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) $(CC) $(CFLAGS) -c -o $@ ../sys/share/pcsys.c @@ -895,83 +893,81 @@ gr_rect.o: ../win/gem/gr_rect.c ../include/gr_rect.h 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) ../include/qt_bind.h \ - ../include/qt_click.h ../include/qt_delay.h \ - ../include/qt_xcmd.h ../include/qt_key.h ../include/qt_map.h \ - ../include/qt_menu.h ../include/qt_msg.h ../include/qt_plsel.h \ - ../include/qt_svsel.h ../include/qt_set.h ../include/qt_stat.h \ - ../include/qt_streq.h ../include/qt_yndlg.h \ - ../include/qt_str.h ../include/dlb.h +qt_bind.o: ../win/Qt/qt_bind.cpp $(HACK_H) ../win/Qt/qt_bind.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_menu.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_streq.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) ../include/qt_click.h +qt_click.o: ../win/Qt/qt_click.cpp $(HACK_H) ../win/Qt/qt_click.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_click.cpp -qt_clust.o: ../win/Qt/qt_clust.cpp ../include/qt_clust.h +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) ../include/qt_delay.h +qt_delay.o: ../win/Qt/qt_delay.cpp $(HACK_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 \ - ../include/qt_glyph.h ../include/qt_set.h ../include/qt_str.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) ../include/qt_icon.h +qt_icon.o: ../win/Qt/qt_icon.cpp $(HACK_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) ../include/qt_inv.h \ - ../include/qt_glyph.h ../include/qt_set.h +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 $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_inv.cpp -qt_key.o: ../win/Qt/qt_key.cpp $(HACK_H) ../include/qt_key.h +qt_key.o: ../win/Qt/qt_key.cpp $(HACK_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) ../include/qt_line.h +qt_line.o: ../win/Qt/qt_line.cpp $(HACK_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) ../include/patchlevel.h \ - ../include/qt_main.h qt_main.moc ../include/qt_bind.h \ - ../include/qt_glyph.h ../include/qt_inv.h ../include/qt_key.h \ - ../include/qt_map.h ../include/qt_msg.h ../include/qt_set.h \ - ../include/qt_stat.h ../include/qt_str.h qt_kde0.moc + ../win/Qt/qt_main.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_msg.h ../win/Qt/qt_set.h \ + ../win/Qt/qt_stat.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) ../include/qt_map.h qt_map.moc \ - ../include/qt_click.h ../include/qt_glyph.h \ - ../include/qt_xpms.h ../include/qt_set.h ../include/qt_str.h +qt_map.o: ../win/Qt/qt_map.cpp $(HACK_H) ../win/Qt/qt_map.h qt_map.moc \ + ../win/Qt/qt_click.h ../win/Qt/qt_glyph.h ../include/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) ../include/qt_menu.h qt_menu.moc \ - ../include/qt_glyph.h ../include/qt_set.h \ - ../include/qt_streq.h ../include/qt_str.h +qt_menu.o: ../win/Qt/qt_menu.cpp $(HACK_H) ../win/Qt/qt_menu.h qt_menu.moc \ + ../win/Qt/qt_glyph.h ../win/Qt/qt_set.h ../win/Qt/qt_streq.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) ../include/qt_msg.h qt_msg.moc \ - ../include/qt_map.h ../include/qt_set.h ../include/qt_str.h +qt_msg.o: ../win/Qt/qt_msg.cpp $(HACK_H) ../win/Qt/qt_msg.h qt_msg.moc \ + ../win/Qt/qt_map.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) ../include/qt_plsel.h \ - qt_plsel.moc ../include/qt_bind.h ../include/qt_glyph.h \ - ../include/qt_set.h ../include/qt_str.h +qt_plsel.o: ../win/Qt/qt_plsel.cpp $(HACK_H) ../win/Qt/qt_plsel.h qt_plsel.moc \ + ../win/Qt/qt_bind.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) ../include/qt_rip.h \ - ../include/qt_bind.h ../include/qt_str.h +qt_rip.o: ../win/Qt/qt_rip.cpp $(HACK_H) ../win/Qt/qt_rip.h \ + ../win/Qt/qt_bind.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) ../include/qt_set.h qt_set.moc \ - ../include/qt_glyph.h ../include/qt_str.h +qt_set.o: ../win/Qt/qt_set.cpp $(HACK_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) ../include/qt_stat.h qt_stat.moc \ - ../include/qt_set.h ../include/qt_str.h ../include/qt_xpms.h +qt_stat.o: ../win/Qt/qt_stat.cpp $(HACK_H) ../win/Qt/qt_stat.h qt_stat.moc \ + ../win/Qt/qt_set.h ../win/Qt/qt_str.h ../include/qt_xpms.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_stat.cpp -qt_str.o: ../win/Qt/qt_str.cpp ../include/qt_str.h +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) ../include/qt_streq.h \ - ../include/qt_str.h +qt_streq.o: ../win/Qt/qt_streq.cpp $(HACK_H) ../win/Qt/qt_streq.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) ../include/qt_svsel.h \ - ../include/qt_bind.h ../include/qt_str.h +qt_svsel.o: ../win/Qt/qt_svsel.cpp $(HACK_H) ../win/Qt/qt_svsel.h \ + ../win/Qt/qt_bind.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) ../include/qt_win.h \ - ../include/qt_clust.h ../include/qt_kde0.h \ - ../include/qt_bind.h ../include/qt_click.h \ - ../include/qt_glyph.h ../include/qt_inv.h ../include/qt_key.h \ - ../include/qt_icon.h ../include/qt_map.h ../include/qt_menu.h \ - ../include/qt_msg.h ../include/qt_set.h +qt_win.o: ../win/Qt/qt_win.cpp $(HACK_H) ../win/Qt/qt_win.h \ + ../win/Qt/qt_bind.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_menu.h ../win/Qt/qt_msg.h \ + ../win/Qt/qt_set.h ../win/Qt/qt_clust.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_win.cpp qt_xcmd.o: ../win/Qt/qt_xcmd.cpp $(HACK_H) ../include/func_tab.h \ - ../include/qt_xcmd.h qt_xcmd.moc ../include/qt_bind.h \ - ../include/qt_set.h ../include/qt_str.h + ../win/Qt/qt_xcmd.h qt_xcmd.moc ../win/Qt/qt_bind.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) ../include/qt_yndlg.h \ - qt_yndlg.moc ../include/qt_str.h +qt_yndlg.o: ../win/Qt/qt_yndlg.cpp $(HACK_H) ../win/Qt/qt_yndlg.h qt_yndlg.moc \ + ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_yndlg.cpp wc_chainin.o: ../win/chain/wc_chainin.c $(HACK_H) $(CC) $(CFLAGS) -c -o $@ ../win/chain/wc_chainin.c @@ -983,12 +979,10 @@ vis_tab.o: vis_tab.c $(CONFIG_H) ../include/vis_tab.h allmain.o: allmain.c $(HACK_H) alloc.o: alloc.c $(CONFIG_H) apply.o: apply.c $(HACK_H) -artifact.o: artifact.c $(HACK_H) ../include/artifact.h ../include/artilist.h \ - ../include/integer.h +artifact.o: artifact.c $(HACK_H) ../include/artifact.h ../include/artilist.h attrib.o: attrib.c $(HACK_H) ball.o: ball.c $(HACK_H) -bones.o: bones.c $(HACK_H) ../include/lev.h \ - ../include/integer.h +bones.o: bones.c $(HACK_H) ../include/lev.h botl.o: botl.c $(HACK_H) cmd.o: cmd.c $(HACK_H) ../include/lev.h ../include/func_tab.h dbridge.o: dbridge.c $(HACK_H) @@ -1006,25 +1000,20 @@ dokick.o: dokick.c $(HACK_H) dothrow.o: dothrow.c $(HACK_H) drawing.o: drawing.c $(HACK_H) ../include/tcap.h dungeon.o: dungeon.c $(HACK_H) ../include/dgn_file.h ../include/dlb.h \ - ../include/lev.h ../include/integer.h + ../include/lev.h eat.o: eat.c $(HACK_H) -end.o: end.c $(HACK_H) ../include/lev.h ../include/dlb.h \ - ../include/integer.h -engrave.o: engrave.c $(HACK_H) ../include/lev.h \ - ../include/integer.h +end.o: end.c $(HACK_H) ../include/lev.h ../include/dlb.h +engrave.o: engrave.c $(HACK_H) ../include/lev.h exper.o: exper.c $(HACK_H) explode.o: explode.c $(HACK_H) extralev.o: extralev.c $(HACK_H) -files.o: files.c $(HACK_H) ../include/dlb.h \ - ../include/integer.h ../include/lev.h \ - #zlib.h +files.o: files.c $(HACK_H) ../include/dlb.h ../include/lev.h #zlib.h fountain.o: fountain.c $(HACK_H) hack.o: hack.c $(HACK_H) hacklib.o: hacklib.c $(HACK_H) invent.o: invent.c $(HACK_H) isaac64.o: isaac64.c $(CONFIG_H) ../include/isaac64.h -light.o: light.c $(HACK_H) ../include/lev.h \ - ../include/integer.h +light.o: light.c $(HACK_H) ../include/lev.h lock.o: lock.c $(HACK_H) mail.o: mail.c $(HACK_H) ../include/mail.h makemon.o: makemon.c $(HACK_H) @@ -1043,10 +1032,9 @@ mhitu.o: mhitu.c $(HACK_H) ../include/artifact.h minion.o: minion.c $(HACK_H) mklev.o: mklev.c $(HACK_H) mkmap.o: mkmap.c $(HACK_H) ../include/sp_lev.h -mkmaze.o: mkmaze.c $(HACK_H) ../include/sp_lev.h ../include/lev.h \ - ../include/integer.h +mkmaze.o: mkmaze.c $(HACK_H) ../include/sp_lev.h ../include/lev.h mkobj.o: mkobj.c $(HACK_H) -mkroom.o: mkroom.c $(HACK_H) ../include/integer.h +mkroom.o: mkroom.c $(HACK_H) mon.o: mon.c $(HACK_H) ../include/mfndpos.h mondata.o: mondata.c $(HACK_H) monmove.o: monmove.c $(HACK_H) ../include/mfndpos.h ../include/artifact.h @@ -1059,14 +1047,12 @@ muse.o: muse.c $(HACK_H) music.o: music.c $(HACK_H) nhlua.o: nhlua.c $(HACK_H) ../include/dlb.h nhlsel.o: nhlsel.c $(HACK_H) ../include/sp_lev.h -o_init.o: o_init.c $(HACK_H) ../include/lev.h \ - ../include/integer.h +o_init.o: o_init.c $(HACK_H) ../include/lev.h objects.o: objects.c $(CONFIG_H) ../include/obj.h ../include/objclass.h \ ../include/prop.h ../include/skills.h ../include/color.h objnam.o: objnam.c $(HACK_H) options.o: options.c $(CONFIG_H) ../include/objclass.h ../include/flag.h \ - $(HACK_H) ../include/tcap.h \ - ../include/integer.h + $(HACK_H) ../include/tcap.h pager.o: pager.c $(HACK_H) ../include/dlb.h pickup.o: pickup.c $(HACK_H) pline.o: pline.c $(HACK_H) @@ -1078,17 +1064,13 @@ quest.o: quest.c $(HACK_H) questpgr.o: questpgr.c $(HACK_H) ../include/dlb.h read.o: read.c $(HACK_H) rect.o: rect.c $(HACK_H) -region.o: region.c $(HACK_H) ../include/lev.h \ - ../include/integer.h -restore.o: restore.c $(HACK_H) ../include/lev.h ../include/tcap.h \ - ../include/integer.h +region.o: region.c $(HACK_H) ../include/lev.h +restore.o: restore.c $(HACK_H) ../include/lev.h ../include/tcap.h rip.o: rip.c $(HACK_H) rnd.o: rnd.c $(HACK_H) ../include/isaac64.h role.o: role.c $(HACK_H) -rumors.o: rumors.c $(HACK_H) ../include/lev.h ../include/dlb.h \ - ../include/integer.h -save.o: save.c $(HACK_H) ../include/lev.h \ - ../include/integer.h +rumors.o: rumors.c $(HACK_H) ../include/lev.h ../include/dlb.h +save.o: save.c $(HACK_H) ../include/lev.h sfstruct.o: sfstruct.c $(HACK_H) shk.o: shk.c $(HACK_H) shknam.o: shknam.c $(HACK_H) @@ -1100,8 +1082,7 @@ steal.o: steal.c $(HACK_H) steed.o: steed.c $(HACK_H) sys.o: sys.c $(HACK_H) teleport.o: teleport.c $(HACK_H) -timeout.o: timeout.c $(HACK_H) ../include/lev.h \ - ../include/integer.h +timeout.o: timeout.c $(HACK_H) ../include/lev.h topten.o: topten.c $(HACK_H) ../include/dlb.h ../include/patchlevel.h track.o: track.c $(HACK_H) trap.o: trap.c $(HACK_H) @@ -1109,16 +1090,14 @@ u_init.o: u_init.c $(HACK_H) uhitm.o: uhitm.c $(HACK_H) vault.o: vault.c $(HACK_H) version.o: version.c $(HACK_H) ../include/dlb.h ../include/date.h \ - ../include/lev.h ../include/integer.h \ - ../include/patchlevel.h + ../include/lev.h ../include/patchlevel.h vision.o: vision.c $(HACK_H) ../include/vis_tab.h weapon.o: weapon.c $(HACK_H) were.o: were.c $(HACK_H) wield.o: wield.c $(HACK_H) windows.o: windows.c $(HACK_H) ../include/wingem.h ../include/winGnome.h wizard.o: wizard.c $(HACK_H) -worm.o: worm.c $(HACK_H) ../include/lev.h \ - ../include/integer.h +worm.o: worm.c $(HACK_H) ../include/lev.h worn.o: worn.c $(HACK_H) write.o: write.c $(HACK_H) zap.o: zap.c $(HACK_H) diff --git a/sys/unix/depend.awk b/sys/unix/depend.awk index d10f48a57..c367f97e0 100644 --- a/sys/unix/depend.awk +++ b/sys/unix/depend.awk @@ -41,13 +41,21 @@ FNR == 1 { output_dep() #finish previous file #[3.4.0: gnomehack headers currently aren't in include] #[3.6.2: Qt4 headers aren't in include either] #[3.6.2: curses headers likewise] + #[3.7.0: Qt headers have moved] if (incl ~ /\.h$/) { if (incl ~ "curses\.h") incl = "" # skip "curses.h"; it should be + + else if (incl ~ /^..\/lib\/lua-.*\/src\/l/) + incl = "" # skip lua headers else if (incl ~ /^curs/) # curses special case incl = "../win/curses/" incl - else if (incl ~ /^qt4/) # Qt v4 special case - incl = "../win/Qt4/" incl + else if (incl ~ /^qtext.h/) # qtext.h special case + incl = "../include/" incl + else if (incl ~ /^qt_xpms.h/) # qt_xpms.h special case + incl = "../include/" incl + else if (incl ~ /^qt/) # Qt v4 special case + incl = "../win/Qt/" incl else if (incl ~ /^gn/) # gnomehack special case incl = "../win/gnome/" incl else