From: cohrs Date: Sun, 2 Mar 2003 06:21:29 +0000 (+0000) Subject: Building src objects via Makefile.utl X-Git-Tag: MOVE2GIT~2123 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f60f576727892029cf02ca302fcfe38f80e31443;p=nethack Building src objects via Makefile.utl noticed that if one builds something in util and the required .o files aren't already built in src, the .o gets placed in the wrong place. Added the missing '-o $@' to the compilation command. --- diff --git a/doc/fixes34.2 b/doc/fixes34.2 index 0e233ae19..8c4dcb15f 100644 --- a/doc/fixes34.2 +++ b/doc/fixes34.2 @@ -8,6 +8,7 @@ avoid panic when secondary weapon is cursed while generating bones level Platform- and/or Interface-Specific Fixes ----------------------------------------- Gnome: compilation problems on Redhat 7.2 and 8.0 +unix: Makefile.utl would put OBJDIR objects in the wrong directory General New Features diff --git a/doc/fixes35.0 b/doc/fixes35.0 index 58d693e90..cecf425e0 100644 --- a/doc/fixes35.0 +++ b/doc/fixes35.0 @@ -9,6 +9,7 @@ avoid panic when secondary weapon is cursed while generating bones level Platform- and/or Interface-Specific Fixes ----------------------------------------- Gnome: compilation problems on Redhat 7.2 and 8.0 +unix: Makefile.utl would put OBJDIR objects in the wrong directory General New Features diff --git a/sys/unix/Makefile.utl b/sys/unix/Makefile.utl index 27bbad866..6b4534f1a 100644 --- a/sys/unix/Makefile.utl +++ b/sys/unix/Makefile.utl @@ -364,17 +364,17 @@ tile2beos.o: ../win/BeOS/tile2beos.cpp $(HACK_H) ../include/tile.h # make sure object files from src are available when needed # $(OBJDIR)/alloc.o: ../src/alloc.c $(CONFIG_H) - $(CC) $(CFLAGS) -c ../src/alloc.c + $(CC) $(CFLAGS) -c ../src/alloc.c -o $@ $(OBJDIR)/drawing.o: ../src/drawing.c $(CONFIG_H) - $(CC) $(CFLAGS) -c ../src/drawing.c + $(CC) $(CFLAGS) -c ../src/drawing.c -o $@ $(OBJDIR)/decl.o: ../src/decl.c $(CONFIG_H) - $(CC) $(CFLAGS) -c ../src/decl.c + $(CC) $(CFLAGS) -c ../src/decl.c -o $@ $(OBJDIR)/monst.o: ../src/monst.c $(CONFIG_H) - $(CC) $(CFLAGS) -c ../src/monst.c + $(CC) $(CFLAGS) -c ../src/monst.c -o $@ $(OBJDIR)/objects.o: ../src/objects.c $(CONFIG_H) - $(CC) $(CFLAGS) -c ../src/objects.c + $(CC) $(CFLAGS) -c ../src/objects.c -o $@ $(OBJDIR)/dlb.o: ../src/dlb.c $(HACK_H) ../include/dlb.h - $(CC) $(CFLAGS) -c ../src/dlb.c + $(CC) $(CFLAGS) -c ../src/dlb.c -o $@ # make sure hack.h dependencies get transitive information $(HACK_H): $(CONFIG_H)