From: nethack.allison Date: Sat, 15 Feb 2003 13:18:39 +0000 (+0000) Subject: fix djgpp Makefile X-Git-Tag: MOVE2GIT~2174 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=18ea2f8aa5625d3dd25cbf5de95d058b3891c69f;p=nethack fix djgpp Makefile --- diff --git a/sys/msdos/Makefile.GCC b/sys/msdos/Makefile.GCC index b12407050..1cdce958b 100644 --- a/sys/msdos/Makefile.GCC +++ b/sys/msdos/Makefile.GCC @@ -993,128 +993,128 @@ $(O)stubvid.o : $(HACK_H) $(MSYS)/pcvideo.h $(MSYS)/video.c # # The rest are stolen from sys/unix/Makefile.src, -# and -c (which is included in cflags) substituted -# with -o$@ , -# Also an explicit build instruction for dlb.o -# because it requires a .h file in ../sys/msdos. -# Also the PATCHLEV_H macro is substitued for -# $(INCL)/patchlevel.h to work around a long filename -# issue. +# with the following changes: +# o -c (which is included in cflags) substituted with -o$@ , +# o an explicit build instruction for dlb.o because it requires +# a .h file in ../sys/msdos. +# o the PATCHLEV_H macro is substitued for $(INCL)/patchlevel.h +# to work around a long filename issue. +# o $(CFLAGS) changed to $(cflags) # Other than that, these dependencies are untouched. # That means that there is some irrelevant stuff # in here, but maintenance should be easier. # $(O)tos.o: ../sys/atari/tos.c $(HACK_H) $(INCL)/tcap.h - $(CC) $(CFLAGS) -o$@ ../sys/atari/tos.c + $(CC) $(cflags) -o$@ ../sys/atari/tos.c $(O)pcmain.o: ../sys/share/pcmain.c $(HACK_H) $(INCL)/dlb.h \ #$(INCL)/win32api.h - $(CC) $(CFLAGS) -o$@ ../sys/share/pcmain.c + $(CC) $(cflags) -o$@ ../sys/share/pcmain.c $(O)pcsys.o: ../sys/share/pcsys.c $(HACK_H) - $(CC) $(CFLAGS) -o$@ ../sys/share/pcsys.c + $(CC) $(cflags) -o$@ ../sys/share/pcsys.c $(O)pctty.o: ../sys/share/pctty.c $(HACK_H) - $(CC) $(CFLAGS) -o$@ ../sys/share/pctty.c + $(CC) $(cflags) -o$@ ../sys/share/pctty.c $(O)pcunix.o: ../sys/share/pcunix.c $(HACK_H) - $(CC) $(CFLAGS) -o$@ ../sys/share/pcunix.c + $(CC) $(cflags) -o$@ ../sys/share/pcunix.c $(O)random.o: ../sys/share/random.c $(HACK_H) - $(CC) $(CFLAGS) -o$@ ../sys/share/random.c + $(CC) $(cflags) -o$@ ../sys/share/random.c $(O)ioctl.o: ../sys/share/ioctl.c $(HACK_H) $(INCL)/tcap.h - $(CC) $(CFLAGS) -o$@ ../sys/share/ioctl.c + $(CC) $(cflags) -o$@ ../sys/share/ioctl.c $(O)unixtty.o: ../sys/share/unixtty.c $(HACK_H) - $(CC) $(CFLAGS) -o$@ ../sys/share/unixtty.c + $(CC) $(cflags) -o$@ ../sys/share/unixtty.c $(O)unixmain.o: ../sys/unix/unixmain.c $(HACK_H) $(INCL)/dlb.h - $(CC) $(CFLAGS) -o$@ ../sys/unix/unixmain.c + $(CC) $(cflags) -o$@ ../sys/unix/unixmain.c $(O)unixunix.o: ../sys/unix/unixunix.c $(HACK_H) - $(CC) $(CFLAGS) -o$@ ../sys/unix/unixunix.c + $(CC) $(cflags) -o$@ ../sys/unix/unixunix.c $(O)unixres.o: ../sys/unix/unixres.c $(CONFIG_H) - $(CC) $(CFLAGS) -o$@ ../sys/unix/unixres.c + $(CC) $(cflags) -o$@ ../sys/unix/unixres.c $(O)bemain.o: ../sys/be/bemain.c $(HACK_H) $(INCL)/dlb.h - $(CC) $(CFLAGS) -o$@ ../sys/be/bemain.c + $(CC) $(cflags) -o$@ ../sys/be/bemain.c $(O)getline.o: ../win/tty/getline.c $(HACK_H) $(INCL)/func_tab.h - $(CC) $(CFLAGS) -o$@ ../win/tty/getline.c + $(CC) $(cflags) -o$@ ../win/tty/getline.c $(O)termcap.o: ../win/tty/termcap.c $(HACK_H) $(INCL)/tcap.h - $(CC) $(CFLAGS) -o$@ ../win/tty/termcap.c + $(CC) $(cflags) -o$@ ../win/tty/termcap.c $(O)topl.o: ../win/tty/topl.c $(HACK_H) $(INCL)/tcap.h - $(CC) $(CFLAGS) -o$@ ../win/tty/topl.c + $(CC) $(cflags) -o$@ ../win/tty/topl.c $(O)wintty.o: ../win/tty/wintty.c $(HACK_H) $(INCL)/dlb.h \ $(PATCHLEV_H) $(INCL)/tcap.h - $(CC) $(CFLAGS) -o$@ ../win/tty/wintty.c + $(CC) $(cflags) -o$@ ../win/tty/wintty.c $(O)Window.o: ../win/X11/Window.c $(INCL)/xwindowp.h $(INCL)/xwindow.h \ $(CONFIG_H) - $(CC) $(CFLAGS) -o$@ ../win/X11/Window.c + $(CC) $(cflags) -o$@ ../win/X11/Window.c $(O)dialogs.o: ../win/X11/dialogs.c $(CONFIG_H) - $(CC) $(CFLAGS) -o$@ ../win/X11/dialogs.c + $(CC) $(cflags) -o$@ ../win/X11/dialogs.c $(O)winX.o: ../win/X11/winX.c $(HACK_H) $(INCL)/winX.h $(INCL)/dlb.h \ $(PATCHLEV_H) ../win/X11/nh72icon \ ../win/X11/nh56icon ../win/X11/nh32icon - $(CC) $(CFLAGS) -o$@ ../win/X11/winX.c + $(CC) $(cflags) -o$@ ../win/X11/winX.c $(O)winmap.o: ../win/X11/winmap.c $(INCL)/xwindow.h $(HACK_H) $(INCL)/dlb.h \ $(INCL)/winX.h $(INCL)/tile2x11.h - $(CC) $(CFLAGS) -o$@ ../win/X11/winmap.c + $(CC) $(cflags) -o$@ ../win/X11/winmap.c $(O)winmenu.o: ../win/X11/winmenu.c $(HACK_H) $(INCL)/winX.h - $(CC) $(CFLAGS) -o$@ ../win/X11/winmenu.c + $(CC) $(cflags) -o$@ ../win/X11/winmenu.c $(O)winmesg.o: ../win/X11/winmesg.c $(INCL)/xwindow.h $(HACK_H) $(INCL)/winX.h - $(CC) $(CFLAGS) -o$@ ../win/X11/winmesg.c + $(CC) $(cflags) -o$@ ../win/X11/winmesg.c $(O)winmisc.o: ../win/X11/winmisc.c $(HACK_H) $(INCL)/func_tab.h \ $(INCL)/winX.h - $(CC) $(CFLAGS) -o$@ ../win/X11/winmisc.c + $(CC) $(cflags) -o$@ ../win/X11/winmisc.c $(O)winstat.o: ../win/X11/winstat.c $(HACK_H) $(INCL)/winX.h - $(CC) $(CFLAGS) -o$@ ../win/X11/winstat.c + $(CC) $(cflags) -o$@ ../win/X11/winstat.c $(O)wintext.o: ../win/X11/wintext.c $(HACK_H) $(INCL)/winX.h $(INCL)/xwindow.h - $(CC) $(CFLAGS) -o$@ ../win/X11/wintext.c + $(CC) $(cflags) -o$@ ../win/X11/wintext.c $(O)winval.o: ../win/X11/winval.c $(HACK_H) $(INCL)/winX.h - $(CC) $(CFLAGS) -o$@ ../win/X11/winval.c + $(CC) $(cflags) -o$@ ../win/X11/winval.c $(O)tile.o: tile.c $(HACK_H) $(O)gnaskstr.o: ../win/gnome/gnaskstr.c ../win/gnome/gnaskstr.h \ ../win/gnome/gnmain.h - $(CC) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnaskstr.c + $(CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnaskstr.c $(O)gnbind.o: ../win/gnome/gnbind.c ../win/gnome/gnbind.h ../win/gnome/gnmain.h \ ../win/gnome/gnaskstr.h ../win/gnome/gnyesno.h - $(CC) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnbind.c + $(CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnbind.c $(O)gnglyph.o: ../win/gnome/gnglyph.c ../win/gnome/gnglyph.h $(INCL)/tile2x11.h - $(CC) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnglyph.c + $(CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnglyph.c $(O)gnmain.o: ../win/gnome/gnmain.c ../win/gnome/gnmain.h ../win/gnome/gnsignal.h \ ../win/gnome/gnbind.h ../win/gnome/gnopts.h $(HACK_H) \ $(INCL)/date.h - $(CC) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnmain.c + $(CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnmain.c $(O)gnmap.o: ../win/gnome/gnmap.c ../win/gnome/gnmap.h ../win/gnome/gnglyph.h \ ../win/gnome/gnsignal.h $(HACK_H) - $(CC) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnmap.c + $(CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnmap.c $(O)gnmenu.o: ../win/gnome/gnmenu.c ../win/gnome/gnmenu.h ../win/gnome/gnmain.h \ ../win/gnome/gnbind.h - $(CC) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnmenu.c + $(CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnmenu.c $(O)gnmesg.o: ../win/gnome/gnmesg.c ../win/gnome/gnmesg.h ../win/gnome/gnsignal.h - $(CC) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnmesg.c + $(CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnmesg.c $(O)gnopts.o: ../win/gnome/gnopts.c ../win/gnome/gnopts.h ../win/gnome/gnglyph.h \ ../win/gnome/gnmain.h ../win/gnome/gnmap.h $(HACK_H) - $(CC) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnopts.c + $(CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnopts.c $(O)gnplayer.o: ../win/gnome/gnplayer.c ../win/gnome/gnplayer.h \ ../win/gnome/gnmain.h $(HACK_H) - $(CC) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnplayer.c + $(CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnplayer.c $(O)gnsignal.o: ../win/gnome/gnsignal.c ../win/gnome/gnsignal.h \ ../win/gnome/gnmain.h - $(CC) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnsignal.c + $(CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnsignal.c $(O)gnstatus.o: ../win/gnome/gnstatus.c ../win/gnome/gnstatus.h \ ../win/gnome/gnsignal.h ../win/gnome/gn_xpms.h \ ../win/gnome/gnomeprv.h - $(CC) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnstatus.c + $(CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnstatus.c $(O)gntext.o: ../win/gnome/gntext.c ../win/gnome/gntext.h ../win/gnome/gnmain.h \ ../win/gnome/gn_rip.h - $(CC) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gntext.c + $(CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gntext.c $(O)gnworn.o: ../win/gnome/gnworn.c ../win/gnome/gnworn.h ../win/gnome/gnglyph.h \ ../win/gnome/gnsignal.h ../win/gnome/gnomeprv.h - $(CC) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnworn.c + $(CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnworn.c $(O)gnyesno.o: ../win/gnome/gnyesno.c ../win/gnome/gnbind.h ../win/gnome/gnyesno.h - $(CC) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnyesno.c + $(CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnyesno.c $(O)wingem.o: ../win/gem/wingem.c $(HACK_H) $(INCL)/func_tab.h $(INCL)/dlb.h \ $(PATCHLEV_H) $(INCL)/wingem.h - $(CC) $(CFLAGS) -o$@ ../win/gem/wingem.c + $(CC) $(cflags) -o$@ ../win/gem/wingem.c $(O)wingem1.o: ../win/gem/wingem1.c $(INCL)/gem_rsc.h $(INCL)/load_img.h \ $(INCL)/gr_rect.h $(INCL)/wintype.h $(INCL)/wingem.h - $(CC) $(CFLAGS) -o$@ ../win/gem/wingem1.c + $(CC) $(cflags) -o$@ ../win/gem/wingem1.c $(O)load_img.o: ../win/gem/load_img.c $(INCL)/load_img.h - $(CC) $(CFLAGS) -o$@ ../win/gem/load_img.c + $(CC) $(cflags) -o$@ ../win/gem/load_img.c $(O)gr_rect.o: ../win/gem/gr_rect.c $(INCL)/gr_rect.h - $(CC) $(CFLAGS) -o$@ ../win/gem/gr_rect.c + $(CC) $(cflags) -o$@ ../win/gem/gr_rect.c $(O)tile.o: tile.c $(HACK_H) $(O)qt_win.o: ../win/Qt/qt_win.cpp $(HACK_H) $(INCL)/func_tab.h \ $(INCL)/dlb.h $(PATCHLEV_H) $(INCL)/tile2x11.h \