diff options
| author | Gordon Ross <gwr@nexenta.com> | 2016-04-22 16:13:20 -0400 |
|---|---|---|
| committer | Gordon Ross <gwr@nexenta.com> | 2019-05-17 16:29:13 -0400 |
| commit | 54026d5ae0b8cbf8da5c14341d51f7a3cab03758 (patch) | |
| tree | 4d198e8632a0806aa326fcb5810e2d34816d43e6 /usr/src/tools/quick/make-smbsrv | |
| parent | a9cc46cf4c50667eb8eaf3af6c3bc4a74677b725 (diff) | |
| download | illumos-gate-54026d5ae0b8cbf8da5c14341d51f7a3cab03758.tar.gz | |
10903 Enable compile warnings re. parentheses in smbsrv
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Rick McNeal <rick.mcneal@nexenta.com>
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Jean McCormack <jean.mccormack@nexenta.com>
Approved by: Joshua M. Clulow <josh@sysmgr.org>
Diffstat (limited to 'usr/src/tools/quick/make-smbsrv')
| -rwxr-xr-x | usr/src/tools/quick/make-smbsrv | 56 |
1 files changed, 20 insertions, 36 deletions
diff --git a/usr/src/tools/quick/make-smbsrv b/usr/src/tools/quick/make-smbsrv index 1cc55a999b..d5809420d2 100755 --- a/usr/src/tools/quick/make-smbsrv +++ b/usr/src/tools/quick/make-smbsrv @@ -14,8 +14,8 @@ # Copyright 2018 Nexenta Systems, Inc. All rights reserved. # -# Use distributed make (dmake) by default. -make=${MAKE:-dmake} +# Use normal make (not dmake) by default. +make=${MAKE:-make} CLOSED_IS_PRESENT=no export CLOSED_IS_PRESENT @@ -80,22 +80,28 @@ then (cd $SRC/uts && $make -k all_h) test -f $SRC/head/rpcsvc/nispasswd.h || - (cd $SRC/head && $make -k install_h) + (cd $SRC/head && $make -k $targ) # ... stuff under $ROOT (proto area) test -d $ROOT/usr/include/sys || (cd $SRC && $make rootdirs) test -f $ROOT/usr/include/sys/types.h || - (cd $SRC/uts && $make -k install_h) + (cd $SRC/uts && $make -k $targ) test -f $ROOT/usr/include/rpcsvc/daemon_utils.h || - (cd $SRC/head && $make install_h) + (cd $SRC/head && $make $targ) # always update the smbsrv headers to be safe - (cd $SRC/uts/common/gssapi && $make -k install_h) - (cd $SRC/uts/common/sys && $make -k install_h) - (cd $SRC/uts/common/smb && $make -k install_h) - (cd $SRC/uts/common/smbsrv && $make -k install_h) + (cd $SRC/uts/common/gssapi && $make -k $targ) + (cd $SRC/uts/common/sys && $make -k $targ) + (cd $SRC/uts/common/smb && $make -k $targ) + (cd $SRC/uts/common/smbsrv && $make -k $targ) +fi +if [ "$targ" = lint ] +then + targ=check + (cd $SRC/uts/common/smb && $make -k $targ) + (cd $SRC/uts/common/smbsrv && $make -k $targ) fi # Need some library headers too... @@ -117,7 +123,10 @@ for lib in \ libsmbfs \ libsqlite \ libuutil \ + libzfs_core \ + libzfs \ passwdutil \ + pkcs11 \ smbsrv do (cd $SRC/lib/$lib && $make $targ) @@ -182,19 +191,6 @@ done do_cmds() { -case $1 in -install) - # mount programs need fslib.o - (cd $SRC/cmd/fs.d && $make fslib.o) - (cd $SRC/cmd/fs.d/smbclnt && $make $1 catalog) - ;; -clean|clobber) - (cd $SRC/cmd/fs.d/smbclnt && $make $1) - (cd $SRC/cmd/fs.d && $make ${1}_local) - ;; -esac - -(cd $SRC/cmd/devfsadm && $make $1) (cd $SRC/cmd/smbsrv && $make $1) # Build the MDB modules, WITH the linktest @@ -213,10 +209,6 @@ do $make -k $1 ) ;; esac - (cd $SRC/cmd/mdb/$x/$a/nsmb && - $make $1 KMDB_LINKTEST_ENABLE= ) - (cd $SRC/cmd/mdb/$x/$a/smbfs && - $make $1 KMDB_LINKTEST_ENABLE= ) (cd $SRC/cmd/mdb/$x/$a/smbsrv && $make $1 KMDB_LINKTEST_ENABLE= ) done @@ -235,14 +227,6 @@ do $make $1 ) done - -(cd $SRC/cmd/Adm/sun && $make $1) - -# Deal with mode 0400 file annoyance... -# See usr/src/cmd/Adm/sun/Makefile -if [ $1 = install ]; then - chmod a+r $ROOT/var/smb/smbpasswd -fi } @@ -259,6 +243,7 @@ do_tags() { find uts/common/smbsrv -name '*.[ch]' -print |sort find uts/common/fs/smbsrv -name '*.[ch]' -print |sort find uts/common/gssapi -name '*.[ch]' -print |sort + find common/smbsrv -name '*.[ch]' -print |sort find head -name '*.h' -print |sort find lib/smbsrv -name '*.[ch]' -print |sort find lib/libsmbfs -name '*.[ch]' -print |sort @@ -267,7 +252,6 @@ do_tags() { find lib/libads -name '*.[ch]' -print |sort find lib/libgss -name '*.[ch]' -print |sort find cmd/smbsrv -name '*.[ch]' -print |sort - find common/smbsrv -name '*.[ch]' -print |sort ) > $SRC/cscope.files (cd $SRC ; @@ -296,7 +280,6 @@ usr/lib/smbsrv/libmlsvc.so.1 usr/lib/smbsrv/libsmb.so.1 usr/lib/smbsrv/libsmbns.so.1 usr/lib/smbsrv/smbd -usr/sbin/devfsadm usr/sbin/smbadm usr/sbin/smbstat " @@ -325,6 +308,7 @@ do do_cmds $arg ;; lint) + do_hdrs $arg do_kern $arg do_lib1 $arg do_lib2 $arg |