summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerb Lewis <herb@samba.org>2003-06-06 23:35:22 +0000
committerHerb Lewis <herb@samba.org>2003-06-06 23:35:22 +0000
commit6ae4c3c966c0428c5f1fd3f511dd522402f3e059 (patch)
tree20d5afe53a67084d7c94e4e8f4d904e4be4640ab
parentbabab82d9a7f9de5409c8f53b0d66b7f8ffefd94 (diff)
downloadsamba-6ae4c3c966c0428c5f1fd3f511dd522402f3e059.tar.gz
samba-6ae4c3c966c0428c5f1fd3f511dd522402f3e059.tar.xz
samba-6ae4c3c966c0428c5f1fd3f511dd522402f3e059.zip
remove o32 targets for IRIX. kerberos and ldap libraries are n32 only so
linking smbwrappers will fail. (This used to be commit f95f306729d95c5205ed541289673e579abc0769)
-rw-r--r--source3/Makefile.in15
1 files changed, 2 insertions, 13 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 18512ca05cd..32da7c7c241 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -567,7 +567,6 @@ NSS_OBJ_0 = nsswitch/wins.o $(PARAM_OBJ) $(UBIQX_OBJ) $(LIBSMB_OBJ) \
NSS_OBJ = $(NSS_OBJ_0:.o=.po)
PICOBJS = $(SMBWRAPPER_OBJ:.o=.po)
-PICOBJS32 = $(SMBWRAPPER_OBJ:.o=.po32)
LIBSMBCLIENT_PICOBJS = $(LIBSMBCLIENT_OBJ:.o=.po)
PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \
@@ -658,7 +657,7 @@ modules: SHOWFLAGS proto_exists $(MODULES)
everything: all libsmbclient debug2html smbfilter talloctort modules torture
.SUFFIXES:
-.SUFFIXES: .c .o .po .po32 .lo
+.SUFFIXES: .c .o .po .lo
SHOWFLAGS:
@echo "Using FLAGS = $(FLAGS)"
@@ -718,16 +717,6 @@ smbd/build_options.c: include/config.h.in script/mkbuildoptions.awk
@BROKEN_CC@ -mv `echo $@ | sed -e 's%^.*/%%g' -e 's%\.po$$%.o%'` $@
@POBAD_CC@ @mv $*.po.o $@
-# this is for IRIX
-.c.po32:
- @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) $(FLAGS32) $(PATH_FLAGS) @PICFLAG@ -c $< \
- -o $*.po32.o
-@BROKEN_CC@ -mv `echo $@ | sed -e 's%^.*/%%g' -e 's%\.po32$$%.o%'` $@.o
- @mv $*.po32.o $@
-
bin/.dummy:
@if (: >> $@ || : > $@) >/dev/null 2>&1; then :; else \
dir=bin $(MAKEDIR); fi
@@ -1231,7 +1220,7 @@ uninstallscripts:
TOPFILES=dynconfig.o dynconfig.po
clean: delheaders python_clean
- -rm -f core */*~ *~ */*.o */*.po */*.po32 */*.@SHLIBEXT@ \
+ -rm -f core */*~ *~ */*.o */*.po */*.@SHLIBEXT@ \
$(TOPFILES) $(BIN_PROGS) $(SBIN_PROGS) $(MODULES) $(TORTURE_PROGS) \
$(LIBSMBCLIENT) $(EVERYTHING_PROGS) .headers.stamp