Building src objects via Makefile.utl

<Someone> 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 0e233ae196eeb650e5f7e5ec54453d23819a3353..8c4dcb15fae7394ab2c2c07e4f34f475c072e2b7 100644 (file)
--- 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 58d693e9004a8342879dd75b7892a34a0534aa5f..cecf425e0e243697fb5a7fc1fbbb3c74a4fdaae5 100644 (file)
--- 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 27bbad866f530b235a65c26937b3f384a33c2b0c..6b4534f1a6e68f01f07a70ded808a8b96e5edd4f 100644 (file)
--- 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)