summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1998-10-20 03:10:29 +0000
committerAndrew Tridgell <tridge@samba.org>1998-10-20 03:10:29 +0000
commitbd52d5f513cce2275971e4efb0ba3c8d06485a24 (patch)
treec98c2d61e506cef0cfb730d9d29aae3abfa0bfea
parentef234c67d5da10e4eca6870855983f010f2f01b0 (diff)
downloadsamba-bd52d5f513cce2275971e4efb0ba3c8d06485a24.tar.gz
samba-bd52d5f513cce2275971e4efb0ba3c8d06485a24.tar.bz2
samba-bd52d5f513cce2275971e4efb0ba3c8d06485a24.zip
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)
-rw-r--r--source3/Makefile.in12
1 files changed, 3 insertions, 9 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 68738bd6e7..43aecf2dc6 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 \