From bd52d5f513cce2275971e4efb0ba3c8d06485a24 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 20 Oct 1998 03:10:29 +0000
Subject: [PATCH] removed my badly-done attempt at handling compilers that
 don't handle -c and -o at the same time.

my shell script code wasn't portable
(This used to be commit 759c72822b9b1e8c50b378378f3a45f1e7604ade)
---
 source3/Makefile.in | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 68738bd6e7b..43aecf2dc61 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -256,9 +256,7 @@ MAKEDIR = || exec false; \
 	@if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \
 	 dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi
 	@echo Compiling $*.c
-	@rm -f $@
-	@$(CC) -I. -I$(srcdir) $(FLAGS) -c $<
-	@if ! test -f $@; then mv `basename $@` $@; fi \
+	@$(CC) -I. -I$(srcdir) $(FLAGS) -c $< -o $@ \
 	@MAINT@ -Wp,-MD,.deps/`echo $* | sed s,/,_,g`.P && : >.deps/.stamp
 # the line above is for atomatic dependency tracking
 # it will only work with GNU make, gcc and --enable-maintainer-mode
@@ -268,20 +266,16 @@ MAKEDIR = || exec false; \
 	@if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \
 	  dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi
 	@echo Compiling $*.c with @PICFLAG@
-	@$(CC) -I. -I$(srcdir) $(FLAGS) @PICFLAG@ -c $<
-	@if ! test -f $@; then mv `basename $@` $@; fi \
+	@$(CC) -I. -I$(srcdir) $(FLAGS) @PICFLAG@ -c $< -o $@ \
 	@MAINT@ -Wp,-MD,.deps/`echo $* | sed s,/,_,g`.P && : >.deps/.stamp
-	@mv $@.o $@
 
 # this is for IRIX
 .c.po32: @MAINT@ .deps/.dummy
 	@if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \
 	  dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi
 	@echo Compiling $*.c with @PICFLAG@ and -32
-	@$(CC) -32 -I. -I$(srcdir) $(FLAGS) @PICFLAG@ -c $<
-	@if ! test -f $@; then mv `basename $@` $@; fi \
+	@$(CC) -32 -I. -I$(srcdir) $(FLAGS) @PICFLAG@ -c $< -o $@ \
 	@MAINT@ -Wp,-MD,.deps/`echo $* | sed s,/,_,g`.P && : >.deps/.stamp
-	@mv $@.o $@
 
 bin/.dummy:
 	@if (: >> $@ || : > $@) >/dev/null 2>&1; then :; else \
-- 
2.34.1