Annotation of /trunk/samba/patches/samba-3.0.22-subins-makefile.patch
Parent Directory
| 
Revision Log
Revision 153 -
(hide annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 1 month ago) by niro
File size: 3569 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 1 month ago) by niro
File size: 3569 byte(s)
-import
| 1 | niro | 153 | --- source/Makefile.in.ORIG 2006-01-01 18:58:09.000000000 -0500 |
| 2 | +++ source/Makefile.in 2006-01-01 19:56:21.000000000 -0500 | ||
| 3 | @@ -25,6 +25,7 @@ | ||
| 4 | PYTHON=@PYTHON@ | ||
| 5 | PERL=@PERL@ | ||
| 6 | |||
| 7 | +LAZYLDFLAGS=-Wl,-z,now | ||
| 8 | TERMLDFLAGS=@TERMLDFLAGS@ | ||
| 9 | TERMLIBS=@TERMLIBS@ | ||
| 10 | PRINT_LIBS=@PRINT_LIBS@ | ||
| 11 | @@ -72,6 +73,9 @@ | ||
| 12 | # The permissions to give the executables | ||
| 13 | INSTALLPERMS = 0755 | ||
| 14 | |||
| 15 | +# The permissions for setuid executables | ||
| 16 | +INSTALLSUPERMS = 4755 | ||
| 17 | + | ||
| 18 | # set these to where to find various files | ||
| 19 | # These can be overridden by command line switches (see smbd(8)) | ||
| 20 | # or in smb.conf (see smb.conf(5)) | ||
| 21 | @@ -136,6 +140,8 @@ | ||
| 22 | bin/profiles@EXEEXT@ bin/ntlm_auth@EXEEXT@ \ | ||
| 23 | bin/smbcquotas@EXEEXT@ bin/eventlogadm@EXEEXT@ | ||
| 24 | |||
| 25 | +SUBIN_PROGS = @EXTRA_SUBIN_PROGS@ | ||
| 26 | + | ||
| 27 | TORTURE_PROGS = bin/smbtorture@EXEEXT@ bin/msgtest@EXEEXT@ \ | ||
| 28 | bin/masktest@EXEEXT@ bin/locktest@EXEEXT@ \ | ||
| 29 | bin/locktest2@EXEEXT@ bin/nsstest@EXEEXT@ bin/vfstest@EXEEXT@ | ||
| 30 | @@ -584,6 +590,10 @@ | ||
| 31 | |||
| 32 | UMOUNT_OBJ = client/smbumount.o | ||
| 33 | |||
| 34 | +MCIFS_OBJ = client/mount.cifs.o | ||
| 35 | + | ||
| 36 | +UMCIFS_OBJ = client/umount.cifs.o | ||
| 37 | + | ||
| 38 | NMBLOOKUP_OBJ = utils/nmblookup.o $(PARAM_OBJ) $(LIBNMB_OBJ) \ | ||
| 39 | $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) $(SECRETS_OBJ) $(LIBSAMBA_OBJ) | ||
| 40 | |||
| 41 | @@ -740,7 +750,7 @@ | ||
| 42 | ###################################################################### | ||
| 43 | # now the rules... | ||
| 44 | ###################################################################### | ||
| 45 | -all : SHOWFLAGS proto_exists $(SBIN_PROGS) $(BIN_PROGS) $(SHLIBS) \ | ||
| 46 | +all : SHOWFLAGS proto_exists $(SBIN_PROGS) $(BIN_PROGS) $(SUBIN_PROGS) $(SHLIBS) \ | ||
| 47 | $(MODULES) @EXTRA_ALL_TARGETS@ | ||
| 48 | |||
| 49 | pam_smbpass : SHOWFLAGS bin/pam_smbpass.@SHLIBEXT@ | ||
| 50 | @@ -927,11 +937,19 @@ | ||
| 51 | |||
| 52 | bin/smbmnt@EXEEXT@: $(MNT_OBJ) bin/.dummy | ||
| 53 | @echo Linking $@ | ||
| 54 | - @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(MNT_OBJ) $(DYNEXP) $(LDFLAGS) | ||
| 55 | + @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(MNT_OBJ) $(DYNEXP) $(LDFLAGS) $(LAZYLDFLAGS) | ||
| 56 | |||
| 57 | bin/smbumount@EXEEXT@: $(UMOUNT_OBJ) bin/.dummy | ||
| 58 | @echo Linking $@ | ||
| 59 | - @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) | ||
| 60 | + @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(LAZYLDFLAGS) | ||
| 61 | + | ||
| 62 | +client/mount.cifs@EXEEXT@: $(MCIFS_OBJ) bin/.dummy | ||
| 63 | + @echo Linking $@ | ||
| 64 | + @$(CC) $(FLAGS) -o $@ $(MCIFS_OBJ) $(DYNEXP) $(LDFLAGS) $(LAZYLDFLAGS) | ||
| 65 | + | ||
| 66 | +client/umount.cifs@EXEEXT@: $(UMCIFS_OBJ) bin/.dummy | ||
| 67 | + @echo Linking $@ | ||
| 68 | + @$(CC) $(FLAGS) -o $@ $(UMCIFS_OBJ) $(DYNEXP) $(LDFLAGS) $(LAZYLDFLAGS) | ||
| 69 | |||
| 70 | bin/testparm@EXEEXT@: $(TESTPARM_OBJ) @BUILD_POPT@ bin/.dummy | ||
| 71 | @echo Linking $@ | ||
| 72 | @@ -1389,7 +1407,7 @@ | ||
| 73 | |||
| 74 | bin/t_snprintf@EXEEXT@: lib/snprintf.c | ||
| 75 | $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) -DTEST_SNPRINTF lib/snprintf.c -lm | ||
| 76 | -install: installbin installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ | ||
| 77 | +install: installbin installsubin installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ | ||
| 78 | |||
| 79 | install-everything: install installmodules | ||
| 80 | |||
| 81 | @@ -1411,6 +1429,8 @@ | ||
| 82 | @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(SBIN_PROGS) | ||
| 83 | @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(BIN_PROGS) | ||
| 84 | |||
| 85 | +installsubin: all installdirs | ||
| 86 | + @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLSUPERMS) $(DESTDIR) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(SUBIN_PROGS) | ||
| 87 | |||
| 88 | # Some symlinks are required for the 'probing' of modules. | ||
| 89 | # This mechanism should go at some point.. |