Annotation of /trunk/samba/patches/samba-3.0.28-subins-makefile.patch
Parent Directory
| 
Revision Log
Revision 575 -
(hide annotations)
(download)
Tue Apr 22 22:30:42 2008 UTC (16 years, 1 month ago) by niro
File size: 4132 byte(s)
Tue Apr 22 22:30:42 2008 UTC (16 years, 1 month ago) by niro
File size: 4132 byte(s)
-removed cifs-tools from SUBIN
| 1 | niro | 575 | diff -Naur samba-3.0.27/source/Makefile.in samba-3.0.27-magellan/source/Makefile.in |
| 2 | --- samba-3.0.27/source/Makefile.in 2007-11-15 04:15:03.000000000 +0100 | ||
| 3 | +++ samba-3.0.27-magellan/source/Makefile.in 2007-11-17 14:19:58.000000000 +0100 | ||
| 4 | @@ -33,6 +33,7 @@ | ||
| 5 | PYTHON=@PYTHON@ | ||
| 6 | PERL=@PERL@ | ||
| 7 | |||
| 8 | +LAZYLDFLAGS=-Wl,-z,now | ||
| 9 | TERMLDFLAGS=@TERMLDFLAGS@ | ||
| 10 | TERMLIBS=@TERMLIBS@ | ||
| 11 | PRINT_LIBS=@PRINT_LIBS@ | ||
| 12 | @@ -87,6 +88,9 @@ | ||
| 13 | # The permissions to give the executables | ||
| 14 | INSTALLPERMS = 0755 | ||
| 15 | |||
| 16 | +# The permissions for setuid executables | ||
| 17 | +INSTALLSUPERMS = 4755 | ||
| 18 | + | ||
| 19 | # set these to where to find various files | ||
| 20 | # These can be overridden by command line switches (see smbd(8)) | ||
| 21 | # or in smb.conf (see smb.conf(5)) | ||
| 22 | @@ -146,7 +150,7 @@ | ||
| 23 | |||
| 24 | SBIN_PROGS = bin/smbd@EXEEXT@ bin/nmbd@EXEEXT@ bin/swat@EXEEXT@ @EXTRA_SBIN_PROGS@ | ||
| 25 | |||
| 26 | -ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@ | ||
| 27 | +SUBIN_PROGS = @EXTRA_SUBIN_PROGS@ | ||
| 28 | |||
| 29 | BIN_PROGS1 = bin/smbclient@EXEEXT@ bin/net@EXEEXT@ bin/smbspool@EXEEXT@ \ | ||
| 30 | bin/testparm@EXEEXT@ bin/smbstatus@EXEEXT@ bin/smbget@EXEEXT@ | ||
| 31 | @@ -828,7 +832,7 @@ | ||
| 32 | ###################################################################### | ||
| 33 | # now the rules... | ||
| 34 | ###################################################################### | ||
| 35 | -all : SHOWFLAGS $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \ | ||
| 36 | +all : SHOWFLAGS $(SBIN_PROGS) $(BIN_PROGS) $(SUBIN_PROGS) \ | ||
| 37 | $(SHLIBS) $(MODULES) $(NSS_MODULES) $(PAM_MODULES) @EXTRA_ALL_TARGETS@ | ||
| 38 | |||
| 39 | nss_modules : $(NSS_MODULES) | ||
| 40 | @@ -1008,19 +1012,19 @@ | ||
| 41 | |||
| 42 | bin/smbmnt@EXEEXT@: proto_exists $(MNT_OBJ) bin/.dummy | ||
| 43 | @echo Linking $@ | ||
| 44 | - @$(CC) $(FLAGS) -o $@ $(MNT_OBJ) $(DYNEXP) $(LDFLAGS) | ||
| 45 | + @$(CC) $(FLAGS) -o $@ $(MNT_OBJ) $(DYNEXP) $(LDFLAGS) $(LAZYLDFLAGS) | ||
| 46 | |||
| 47 | bin/smbumount@EXEEXT@: proto_exists $(UMOUNT_OBJ) bin/.dummy | ||
| 48 | @echo Linking $@ | ||
| 49 | - @$(CC) $(FLAGS) -o $@ $(UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) | ||
| 50 | + @$(CC) $(FLAGS) -o $@ $(UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(LAZYLDFLAGS) | ||
| 51 | |||
| 52 | bin/mount.cifs@EXEEXT@: $(CIFS_MOUNT_OBJ) bin/.dummy | ||
| 53 | @echo Linking $@ | ||
| 54 | - @$(CC) $(FLAGS) -o $@ $(CIFS_MOUNT_OBJ) $(DYNEXP) $(LDFLAGS) | ||
| 55 | + @$(CC) $(FLAGS) -o $@ $(CIFS_MOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(LAZYLDFLAGS) | ||
| 56 | |||
| 57 | bin/umount.cifs@EXEEXT@: $(CIFS_UMOUNT_OBJ) bin/.dummy | ||
| 58 | @echo Linking $@ | ||
| 59 | - @$(CC) $(FLAGS) -o $@ $(CIFS_UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) | ||
| 60 | + @$(CC) $(FLAGS) -o $@ $(CIFS_UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(LAZYLDFLAGS) | ||
| 61 | |||
| 62 | bin/testparm@EXEEXT@: proto_exists $(TESTPARM_OBJ) @BUILD_POPT@ bin/.dummy | ||
| 63 | @echo Linking $@ | ||
| 64 | @@ -1566,7 +1570,7 @@ | ||
| 65 | @echo Linking $@ | ||
| 66 | @$(CC) $(FLAGS) -o $@ $(DYNEXP) script/tests/timelimit.o | ||
| 67 | |||
| 68 | -install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@ @INSTALL_LIBSMBSHAREMODES@ | ||
| 69 | +install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@ @INSTALL_LIBSMBSHAREMODES@ installsubin | ||
| 70 | |||
| 71 | |||
| 72 | install-everything: install installmodules | ||
| 73 | @@ -1588,9 +1592,12 @@ | ||
| 74 | installbin: all installdirs | ||
| 75 | @$(SHELL) script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(BINDIR) $(BIN_PROGS) | ||
| 76 | |||
| 77 | +installsubin: all installdirs | ||
| 78 | + @$(SHELL) script/installbin.sh $(INSTALLSUPERMS) $(DESTDIR) $(prefix) $(BINDIR) $(SUBIN_PROGS) | ||
| 79 | + | ||
| 80 | installcifsmount: @CIFSMOUNT_PROGS@ | ||
| 81 | @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) $(ROOTSBINDIR) | ||
| 82 | - @$(SHELL) script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(ROOTSBINDIR) @CIFSMOUNT_PROGS@ | ||
| 83 | + @$(SHELL) script/installbin.sh $(INSTALLSUPERMS) $(DESTDIR) $(prefix) $(ROOTSBINDIR) @CIFSMOUNT_PROGS@ | ||
| 84 | |||
| 85 | # Some symlinks are required for the 'probing' of modules. | ||
| 86 | # This mechanism should go at some point.. | ||
| 87 | @@ -1772,7 +1779,7 @@ | ||
| 88 | clean: delheaders python_clean | ||
| 89 | -rm -f core */*~ *~ */*.o */*/*.o */*/*/*.o \ | ||
| 90 | */*.@SHLIBEXT@ */*/*.@SHLIBEXT@ */*/*/*.@SHLIBEXT@ \ | ||
| 91 | - $(TOPFILES) $(BIN_PROGS) $(SBIN_PROGS) $(ROOT_SBIN_PROGS) \ | ||
| 92 | + $(TOPFILES) $(BIN_PROGS) $(SBIN_PROGS) $(SUBIN_PROGS) \ | ||
| 93 | $(MODULES) $(TORTURE_PROGS) $(LIBSMBCLIENT) $(LIBADDNS) \ | ||
| 94 | $(LIBSMBSHAREMODES) $(EVERYTHING_PROGS) $(LIBMSRPC) \ | ||
| 95 | .headers.stamp */src/*.o proto_exists |