summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1998-10-19 01:00:33 +0000
committerAndrew Tridgell <tridge@samba.org>1998-10-19 01:00:33 +0000
commitf52b898a63e8474c360dd2061447c11cbbe34831 (patch)
treec4817c4058daf3e5a1c035d9d40523e6e3d9b857
parentb8aec499dc49b1d86d9f44296e07d40232813642 (diff)
downloadsamba-f52b898a63e8474c360dd2061447c11cbbe34831.tar.gz
samba-f52b898a63e8474c360dd2061447c11cbbe34831.tar.bz2
samba-f52b898a63e8474c360dd2061447c11cbbe34831.zip
- added smbrapper/shared.o
- added suport for C compilers that don't handle -c and -o at once (This used to be commit f1672d055716f4b701e22801cbf5cf5573081685)
-rw-r--r--source3/Makefile.in15
1 files changed, 10 insertions, 5 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 35e98e025b..68738bd6e7 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -166,7 +166,8 @@ SWAT_OBJ = web/cgi.o web/diagnose.o web/startstop.o web/statuspage.o \
SMBRUN_OBJ = utils/smbrun.o
-SMBSH_OBJ = smbwrapper/smbsh.o $(PARAM_OBJ) $(UBIQX_OBJ) $(LIB_OBJ)
+SMBSH_OBJ = smbwrapper/smbsh.o smbwrapper/shared.o \
+ $(PARAM_OBJ) $(UBIQX_OBJ) $(LIB_OBJ)
MAKE_SMBCODEPAGE_OBJ = utils/make_smbcodepage.o $(PARAM_OBJ) \
$(UBIQX_OBJ) $(LIB_OBJ)
@@ -198,7 +199,7 @@ RPCCLIENT_OBJ = rpcclient/rpcclient.o \
SMBWRAPPER_OBJ = smbwrapper/smbw.o smbwrapper/wrapped.o \
smbwrapper/smbw_dir.o smbwrapper/smbw_stat.o \
- smbwrapper/realcalls.o \
+ smbwrapper/realcalls.o smbwrapper/shared.o \
$(LIBSMB_OBJ) $(PARAM_OBJ) \
$(UBIQX_OBJ) $(LIB_OBJ)
@@ -255,7 +256,9 @@ MAKEDIR = || exec false; \
@if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \
dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi
@echo Compiling $*.c
- @$(CC) -I. -I$(srcdir) $(FLAGS) -c $< -o $@ \
+ @rm -f $@
+ @$(CC) -I. -I$(srcdir) $(FLAGS) -c $<
+ @if ! test -f $@; then mv `basename $@` $@; fi \
@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
@@ -265,7 +268,8 @@ 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 $< -o $@.o \
+ @$(CC) -I. -I$(srcdir) $(FLAGS) @PICFLAG@ -c $<
+ @if ! test -f $@; then mv `basename $@` $@; fi \
@MAINT@ -Wp,-MD,.deps/`echo $* | sed s,/,_,g`.P && : >.deps/.stamp
@mv $@.o $@
@@ -274,7 +278,8 @@ MAKEDIR = || exec false; \
@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 $< -o $@.o \
+ @$(CC) -32 -I. -I$(srcdir) $(FLAGS) @PICFLAG@ -c $<
+ @if ! test -f $@; then mv `basename $@` $@; fi \
@MAINT@ -Wp,-MD,.deps/`echo $* | sed s,/,_,g`.P && : >.deps/.stamp
@mv $@.o $@