diff options
| author | John Levon <john.levon@joyent.com> | 2020-05-26 13:57:13 +0000 |
|---|---|---|
| committer | John Levon <john.levon@joyent.com> | 2020-05-26 13:57:13 +0000 |
| commit | 5b2acc0949194447bba6e45a0fa44d0b5f42f208 (patch) | |
| tree | 7ea9eb87bc68fee386dd39035ce715e87a0e673c /usr/src/lib/smbsrv/libsmb | |
| parent | 8ca018083101bf1cb175869679bc123187fb1bab (diff) | |
| parent | 2a1277d3064386cd5c4e372301007aa330bf1d5e (diff) | |
| download | illumos-joyent-gcc9.tar.gz | |
mergegcc9
Diffstat (limited to 'usr/src/lib/smbsrv/libsmb')
| -rw-r--r-- | usr/src/lib/smbsrv/libsmb/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/smbsrv/libsmb/Makefile.com | 3 | ||||
| -rw-r--r-- | usr/src/lib/smbsrv/libsmb/amd64/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/lib/smbsrv/libsmb/i386/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/smbsrv/libsmb/sparc/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/smbsrv/libsmb/sparcv9/Makefile | 4 |
6 files changed, 5 insertions, 12 deletions
diff --git a/usr/src/lib/smbsrv/libsmb/Makefile b/usr/src/lib/smbsrv/libsmb/Makefile index 8aad6f1bc3..58f2e8018d 100644 --- a/usr/src/lib/smbsrv/libsmb/Makefile +++ b/usr/src/lib/smbsrv/libsmb/Makefile @@ -28,7 +28,7 @@ HDRS= libsmb.h GENSRCS = common/smb_status_tbl.h CLEANFILES += $(GENSRCS) -all install lint: $(GENSRCS) +all install: $(GENSRCS) include ../Makefile.smbsrv diff --git a/usr/src/lib/smbsrv/libsmb/Makefile.com b/usr/src/lib/smbsrv/libsmb/Makefile.com index 37f853498d..617e9c8352 100644 --- a/usr/src/lib/smbsrv/libsmb/Makefile.com +++ b/usr/src/lib/smbsrv/libsmb/Makefile.com @@ -76,9 +76,6 @@ include ../../Makefile.lib INCS += -I$(SRC)/common/smbsrv INCS += -I$(SRC)/lib/libsmbfs/smb -LINTCHECKFLAGS += -erroff=E_INCONS_ARG_DECL2 -LINTCHECKFLAGS += -erroff=E_BAD_FORMAT_STR2 - LDLIBS += $(MACH_LDLIBS) # perfer to keep libs ordered by dependence LDLIBS += -lscf -lmd -luuid -lpkcs11 -lcryptoutil diff --git a/usr/src/lib/smbsrv/libsmb/amd64/Makefile b/usr/src/lib/smbsrv/libsmb/amd64/Makefile index 03c6ea5b61..0e9136b72a 100644 --- a/usr/src/lib/smbsrv/libsmb/amd64/Makefile +++ b/usr/src/lib/smbsrv/libsmb/amd64/Makefile @@ -22,8 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# MACH_LDLIBS += -L$(ROOT)/usr/lib/smbsrv/$(MACH64) @@ -32,4 +30,4 @@ include ../../../Makefile.lib.64 DYNFLAGS += -R/usr/lib/smbsrv/$(MACH64) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/smbsrv/libsmb/i386/Makefile b/usr/src/lib/smbsrv/libsmb/i386/Makefile index 1e368c15be..1fff614d80 100644 --- a/usr/src/lib/smbsrv/libsmb/i386/Makefile +++ b/usr/src/lib/smbsrv/libsmb/i386/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com LDLIBS += -lsqlite-sys DYNFLAGS += -R/usr/lib/smbsrv -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/smbsrv/libsmb/sparc/Makefile b/usr/src/lib/smbsrv/libsmb/sparc/Makefile index 1e368c15be..1fff614d80 100644 --- a/usr/src/lib/smbsrv/libsmb/sparc/Makefile +++ b/usr/src/lib/smbsrv/libsmb/sparc/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com LDLIBS += -lsqlite-sys DYNFLAGS += -R/usr/lib/smbsrv -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/smbsrv/libsmb/sparcv9/Makefile b/usr/src/lib/smbsrv/libsmb/sparcv9/Makefile index 03c6ea5b61..0e9136b72a 100644 --- a/usr/src/lib/smbsrv/libsmb/sparcv9/Makefile +++ b/usr/src/lib/smbsrv/libsmb/sparcv9/Makefile @@ -22,8 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# MACH_LDLIBS += -L$(ROOT)/usr/lib/smbsrv/$(MACH64) @@ -32,4 +30,4 @@ include ../../../Makefile.lib.64 DYNFLAGS += -R/usr/lib/smbsrv/$(MACH64) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) |