diff options
Diffstat (limited to 'usr/src')
1591 files changed, 2315 insertions, 6670 deletions
diff --git a/usr/src/Targetdirs b/usr/src/Targetdirs index 9fbd858bc7..c5ff31d9ef 100644 --- a/usr/src/Targetdirs +++ b/usr/src/Targetdirs @@ -42,9 +42,6 @@ DIRLINKS= $(SYM.DIRS) $(BUILD64) DIRLINKS += $(SYM.DIRS64) -FILELINKS= $(SYM.USRCCSLIB) $(SYM.USRLIB) -$(BUILD64) FILELINKS += $(SYM.USRCCSLIB64) $(SYM.USRLIB64) - TARGETDIRS= $(DIRS) $(BUILD64) TARGETDIRS += $(DIRS64) @@ -517,9 +514,6 @@ SYM.DIRS= \ /dev/stdin \ /dev/stdout \ /dev/stderr \ - /etc/lib/ld.so.1 \ - /etc/lib/libdl.so.1 \ - /etc/lib/nss_files.so.1 \ /etc/log \ /lib/32 \ /lib/crypto/32 \ @@ -638,9 +632,6 @@ $(ROOT)/usr/pub:= LINKDEST=share/lib/pub $(ROOT)/usr/man:= LINKDEST=share/man $(ROOT)/usr/src:= LINKDEST=share/src $(ROOT)/usr/adm:= LINKDEST=../var/adm -$(ROOT)/etc/lib/ld.so.1:= LINKDEST=../../lib/ld.so.1 -$(ROOT)/etc/lib/libdl.so.1:= LINKDEST=../../lib/libdl.so.1 -$(ROOT)/etc/lib/nss_files.so.1:= LINKDEST=../../lib/nss_files.so.1 $(ROOT)/etc/log:= LINKDEST=../var/adm/log $(ROOT)/usr/mail:= LINKDEST=../var/mail $(ROOT)/usr/news:= LINKDEST=../var/news @@ -681,852 +672,3 @@ $(BUILD64) $(ROOT)/usr/ucblib/64:= LINKDEST=$(MACH64) # $(DIRLINKS:%=$(ROOT)%):= \ INS.dir= -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@ - -# Special symlinks to populate usr/ccs/lib, whose objects -# have actually been moved to usr/lib -# Rather than adding another set of rules, we add usr/lib/lwp files here -$(ROOT)/usr/ccs/lib/libcurses.so:= REALPATH=../../../lib/libcurses.so.1 -$(ROOT)/usr/ccs/lib/libform.so:= REALPATH=../../lib/libform.so.1 -$(ROOT)/usr/ccs/lib/libgen.so:= REALPATH=../../../lib/libgen.so.1 -$(ROOT)/usr/ccs/lib/libmalloc.so:= REALPATH=../../lib/libmalloc.so.1 -$(ROOT)/usr/ccs/lib/libmenu.so:= REALPATH=../../lib/libmenu.so.1 -$(ROOT)/usr/ccs/lib/libpanel.so:= REALPATH=../../lib/libpanel.so.1 -$(ROOT)/usr/ccs/lib/libtermlib.so:= REALPATH=../../../lib/libcurses.so.1 -$(ROOT)/usr/ccs/lib/libtermcap.so:= REALPATH=../../../lib/libtermcap.so.1 -$(ROOT)/usr/ccs/lib/values-Xa.o:= REALPATH=../../lib/values-Xa.o -$(ROOT)/usr/ccs/lib/values-Xc.o:= REALPATH=../../lib/values-Xc.o -$(ROOT)/usr/ccs/lib/values-Xs.o:= REALPATH=../../lib/values-Xs.o -$(ROOT)/usr/ccs/lib/values-Xt.o:= REALPATH=../../lib/values-Xt.o -$(ROOT)/usr/ccs/lib/values-xpg4.o:= REALPATH=../../lib/values-xpg4.o -$(ROOT)/usr/ccs/lib/values-xpg6.o:= REALPATH=../../lib/values-xpg6.o -$(ROOT)/usr/ccs/lib/libl.so:= REALPATH=../../lib/libl.so.1 -$(ROOT)/usr/ccs/lib/liby.so:= REALPATH=../../lib/liby.so.1 -$(ROOT)/usr/lib/lwp/libthread.so.1:= REALPATH=../libthread.so.1 -$(ROOT)/usr/lib/lwp/libthread_db.so.1:= REALPATH=../libthread_db.so.1 - -# symlinks to populate usr/ccs/lib/$(MACH64) -$(ROOT)/usr/ccs/lib/$(MACH64)/libcurses.so:= \ - REALPATH=../../../../lib/$(MACH64)/libcurses.so.1 -$(ROOT)/usr/ccs/lib/$(MACH64)/libform.so:= \ - REALPATH=../../../lib/$(MACH64)/libform.so.1 -$(ROOT)/usr/ccs/lib/$(MACH64)/libgen.so:= \ - REALPATH=../../../../lib/$(MACH64)/libgen.so.1 -$(ROOT)/usr/ccs/lib/$(MACH64)/libmalloc.so:= \ - REALPATH=../../../lib/$(MACH64)/libmalloc.so.1 -$(ROOT)/usr/ccs/lib/$(MACH64)/libmenu.so:= \ - REALPATH=../../../lib/$(MACH64)/libmenu.so.1 -$(ROOT)/usr/ccs/lib/$(MACH64)/libpanel.so:= \ - REALPATH=../../../lib/$(MACH64)/libpanel.so.1 -$(ROOT)/usr/ccs/lib/$(MACH64)/libtermlib.so:= \ - REALPATH=../../../../lib/$(MACH64)/libcurses.so.1 -$(ROOT)/usr/ccs/lib/$(MACH64)/libtermcap.so:= \ - REALPATH=../../../../lib/$(MACH64)/libtermcap.so.1 -$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xa.o:= \ - REALPATH=../../../lib/$(MACH64)/values-Xa.o -$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xc.o:= \ - REALPATH=../../../lib/$(MACH64)/values-Xc.o -$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xs.o:= \ - REALPATH=../../../lib/$(MACH64)/values-Xs.o -$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xt.o:= \ - REALPATH=../../../lib/$(MACH64)/values-Xt.o -$(ROOT)/usr/ccs/lib/$(MACH64)/values-xpg4.o:= \ - REALPATH=../../../lib/$(MACH64)/values-xpg4.o -$(ROOT)/usr/ccs/lib/$(MACH64)/values-xpg6.o:= \ - REALPATH=../../../lib/$(MACH64)/values-xpg6.o -$(ROOT)/usr/ccs/lib/$(MACH64)/libl.so:= \ - REALPATH=../../../lib/$(MACH64)/libl.so.1 -$(ROOT)/usr/ccs/lib/$(MACH64)/liby.so:= \ - REALPATH=../../../lib/$(MACH64)/liby.so.1 -$(ROOT)/usr/lib/lwp/$(MACH64)/libthread.so.1:= \ - REALPATH=../../$(MACH64)/libthread.so.1 -$(ROOT)/usr/lib/lwp/$(MACH64)/libthread_db.so.1:= \ - REALPATH=../../$(MACH64)/libthread_db.so.1 - -SYM.USRCCSLIB= \ - /usr/ccs/lib/libcurses.so \ - /usr/ccs/lib/libform.so \ - /usr/ccs/lib/libgen.so \ - /usr/ccs/lib/libmalloc.so \ - /usr/ccs/lib/libmenu.so \ - /usr/ccs/lib/libpanel.so \ - /usr/ccs/lib/libtermlib.so \ - /usr/ccs/lib/libtermcap.so \ - /usr/ccs/lib/values-Xa.o \ - /usr/ccs/lib/values-Xc.o \ - /usr/ccs/lib/values-Xs.o \ - /usr/ccs/lib/values-Xt.o \ - /usr/ccs/lib/values-xpg4.o \ - /usr/ccs/lib/values-xpg6.o \ - /usr/ccs/lib/libl.so \ - /usr/ccs/lib/liby.so \ - /usr/lib/lwp/libthread.so.1 \ - /usr/lib/lwp/libthread_db.so.1 - -SYM.USRCCSLIB64= \ - /usr/ccs/lib/$(MACH64)/libcurses.so \ - /usr/ccs/lib/$(MACH64)/libform.so \ - /usr/ccs/lib/$(MACH64)/libgen.so \ - /usr/ccs/lib/$(MACH64)/libmalloc.so \ - /usr/ccs/lib/$(MACH64)/libmenu.so \ - /usr/ccs/lib/$(MACH64)/libpanel.so \ - /usr/ccs/lib/$(MACH64)/libtermlib.so \ - /usr/ccs/lib/$(MACH64)/libtermcap.so \ - /usr/ccs/lib/$(MACH64)/values-Xa.o \ - /usr/ccs/lib/$(MACH64)/values-Xc.o \ - /usr/ccs/lib/$(MACH64)/values-Xs.o \ - /usr/ccs/lib/$(MACH64)/values-Xt.o \ - /usr/ccs/lib/$(MACH64)/values-xpg4.o \ - /usr/ccs/lib/$(MACH64)/values-xpg6.o \ - /usr/ccs/lib/$(MACH64)/libl.so \ - /usr/ccs/lib/$(MACH64)/liby.so \ - /usr/lib/lwp/$(MACH64)/libthread.so.1 \ - /usr/lib/lwp/$(MACH64)/libthread_db.so.1 - -# Special symlinks to direct libraries that have been moved -# from /usr/lib to /lib in order to live in the root filesystem. -$(ROOT)/lib/libposix4.so.1:= REALPATH=librt.so.1 -$(ROOT)/lib/libposix4.so:= REALPATH=libposix4.so.1 -$(ROOT)/lib/libthread_db.so.1:= REALPATH=libc_db.so.1 -$(ROOT)/lib/libthread_db.so:= REALPATH=libc_db.so.1 -$(ROOT)/usr/lib/ld.so.1:= REALPATH=../../lib/ld.so.1 -$(ROOT)/usr/lib/libadm.so.1:= REALPATH=../../lib/libadm.so.1 -$(ROOT)/usr/lib/libadm.so:= REALPATH=../../lib/libadm.so.1 -$(ROOT)/usr/lib/libaio.so.1:= REALPATH=../../lib/libaio.so.1 -$(ROOT)/usr/lib/libaio.so:= REALPATH=../../lib/libaio.so.1 -$(ROOT)/usr/lib/libavl.so.1:= REALPATH=../../lib/libavl.so.1 -$(ROOT)/usr/lib/libavl.so:= REALPATH=../../lib/libavl.so.1 -$(ROOT)/usr/lib/libbsm.so.1:= REALPATH=../../lib/libbsm.so.1 -$(ROOT)/usr/lib/libbsm.so:= REALPATH=../../lib/libbsm.so.1 -$(ROOT)/usr/lib/libc.so.1:= REALPATH=../../lib/libc.so.1 -$(ROOT)/usr/lib/libc.so:= REALPATH=../../lib/libc.so.1 -$(ROOT)/usr/lib/libc_db.so.1:= REALPATH=../../lib/libc_db.so.1 -$(ROOT)/usr/lib/libc_db.so:= REALPATH=../../lib/libc_db.so.1 -$(ROOT)/usr/lib/libcmdutils.so.1:= REALPATH=../../lib/libcmdutils.so.1 -$(ROOT)/usr/lib/libcmdutils.so:= REALPATH=../../lib/libcmdutils.so.1 -$(ROOT)/usr/lib/libcontract.so.1:= REALPATH=../../lib/libcontract.so.1 -$(ROOT)/usr/lib/libcontract.so:= REALPATH=../../lib/libcontract.so.1 -$(ROOT)/usr/lib/libcryptoutil.so.1:= REALPATH=../../lib/libcryptoutil.so.1 -$(ROOT)/usr/lib/libcryptoutil.so:= REALPATH=../../lib/libcryptoutil.so.1 -$(ROOT)/usr/lib/libctf.so.1:= REALPATH=../../lib/libctf.so.1 -$(ROOT)/usr/lib/libctf.so:= REALPATH=../../lib/libctf.so.1 -$(ROOT)/usr/lib/libcurses.so.1:= REALPATH=../../lib/libcurses.so.1 -$(ROOT)/usr/lib/libcurses.so:= REALPATH=../../lib/libcurses.so.1 -$(ROOT)/usr/lib/libdevice.so.1:= REALPATH=../../lib/libdevice.so.1 -$(ROOT)/usr/lib/libdevice.so:= REALPATH=../../lib/libdevice.so.1 -$(ROOT)/usr/lib/libdevid.so.1:= REALPATH=../../lib/libdevid.so.1 -$(ROOT)/usr/lib/libdevid.so:= REALPATH=../../lib/libdevid.so.1 -$(ROOT)/usr/lib/libdevinfo.so.1:= REALPATH=../../lib/libdevinfo.so.1 -$(ROOT)/usr/lib/libdevinfo.so:= REALPATH=../../lib/libdevinfo.so.1 -$(ROOT)/usr/lib/libdhcpagent.so.1:= REALPATH=../../lib/libdhcpagent.so.1 -$(ROOT)/usr/lib/libdhcpagent.so:= REALPATH=../../lib/libdhcpagent.so.1 -$(ROOT)/usr/lib/libdhcputil.so.1:= REALPATH=../../lib/libdhcputil.so.1 -$(ROOT)/usr/lib/libdhcputil.so:= REALPATH=../../lib/libdhcputil.so.1 -$(ROOT)/usr/lib/libdl.so.1:= REALPATH=../../lib/libdl.so.1 -$(ROOT)/usr/lib/libdl.so:= REALPATH=../../lib/libdl.so.1 -$(ROOT)/usr/lib/libdlpi.so.1:= REALPATH=../../lib/libdlpi.so.1 -$(ROOT)/usr/lib/libdlpi.so:= REALPATH=../../lib/libdlpi.so.1 -$(ROOT)/usr/lib/libdoor.so.1:= REALPATH=../../lib/libdoor.so.1 -$(ROOT)/usr/lib/libdoor.so:= REALPATH=../../lib/libdoor.so.1 -$(ROOT)/usr/lib/libdwarf.so.1:= REALPATH=../../lib/libdwarf.so.1 -$(ROOT)/usr/lib/libdwarf.so:= REALPATH=../../lib/libdwarf.so.1 -$(ROOT)/usr/lib/libefi.so.1:= REALPATH=../../lib/libefi.so.1 -$(ROOT)/usr/lib/libefi.so:= REALPATH=../../lib/libefi.so.1 -$(ROOT)/usr/lib/libelf.so.1:= REALPATH=../../lib/libelf.so.1 -$(ROOT)/usr/lib/libelf.so:= REALPATH=../../lib/libelf.so.1 -$(ROOT)/usr/lib/libfakekernel.so.1:= REALPATH=../../lib/libfakekernel.so.1 -$(ROOT)/usr/lib/libfakekernel.so:= REALPATH=../../lib/libfakekernel.so.1 -$(ROOT)/usr/lib/libfdisk.so.1:= REALPATH=../../lib/libfdisk.so.1 -$(ROOT)/usr/lib/libfdisk.so:= REALPATH=../../lib/libfdisk.so.1 -$(ROOT)/usr/lib/libgen.so.1:= REALPATH=../../lib/libgen.so.1 -$(ROOT)/usr/lib/libgen.so:= REALPATH=../../lib/libgen.so.1 -$(ROOT)/usr/lib/libinetutil.so.1:= REALPATH=../../lib/libinetutil.so.1 -$(ROOT)/usr/lib/libinetutil.so:= REALPATH=../../lib/libinetutil.so.1 -$(ROOT)/usr/lib/libintl.so.1:= REALPATH=../../lib/libintl.so.1 -$(ROOT)/usr/lib/libintl.so:= REALPATH=../../lib/libintl.so.1 -$(ROOT)/usr/lib/libkmf.so.1:= REALPATH=../../lib/libkmf.so.1 -$(ROOT)/usr/lib/libkmf.so:= REALPATH=../../lib/libkmf.so.1 -$(ROOT)/usr/lib/libkmfberder.so.1:= REALPATH=../../lib/libkmfberder.so.1 -$(ROOT)/usr/lib/libkmfberder.so:= REALPATH=../../lib/libkmfberder.so.1 -$(ROOT)/usr/lib/libkstat.so.1:= REALPATH=../../lib/libkstat.so.1 -$(ROOT)/usr/lib/libkstat.so:= REALPATH=../../lib/libkstat.so.1 -$(ROOT)/usr/lib/liblddbg.so.4:= REALPATH=../../lib/liblddbg.so.4 -$(ROOT)/usr/lib/libm.so.1:= REALPATH=../../lib/libm.so.1 -$(ROOT)/usr/lib/libm.so.2:= REALPATH=../../lib/libm.so.2 -$(ROOT)/usr/lib/libm.so:= REALPATH=../../lib/libm.so.2 -$(ROOT)/usr/lib/libmd.so.1:= REALPATH=../../lib/libmd.so.1 -$(ROOT)/usr/lib/libmd.so:= REALPATH=../../lib/libmd.so.1 -$(ROOT)/usr/lib/libmd5.so.1:= REALPATH=../../lib/libmd5.so.1 -$(ROOT)/usr/lib/libmd5.so:= REALPATH=../../lib/libmd5.so.1 -$(ROOT)/usr/lib/libmp.so.1:= REALPATH=../../lib/libmp.so.1 -$(ROOT)/usr/lib/libmp.so.2:= REALPATH=../../lib/libmp.so.2 -$(ROOT)/usr/lib/libmp.so:= REALPATH=../../lib/libmp.so.2 -$(ROOT)/usr/lib/libmvec.so.1:= REALPATH=../../lib/libmvec.so.1 -$(ROOT)/usr/lib/libmvec.so:= REALPATH=../../lib/libmvec.so.1 -$(ROOT)/usr/lib/libnsl.so.1:= REALPATH=../../lib/libnsl.so.1 -$(ROOT)/usr/lib/libnsl.so:= REALPATH=../../lib/libnsl.so.1 -$(ROOT)/usr/lib/libnvpair.so.1:= REALPATH=../../lib/libnvpair.so.1 -$(ROOT)/usr/lib/libnvpair.so:= REALPATH=../../lib/libnvpair.so.1 -$(ROOT)/usr/lib/libpam.so.1:= REALPATH=../../lib/libpam.so.1 -$(ROOT)/usr/lib/libpam.so:= REALPATH=../../lib/libpam.so.1 -$(ROOT)/usr/lib/libposix4.so.1:= REALPATH=../../lib/librt.so.1 -$(ROOT)/usr/lib/libposix4.so:= REALPATH=../../lib/librt.so.1 -$(ROOT)/usr/lib/libproc.so.1:= REALPATH=../../lib/libproc.so.1 -$(ROOT)/usr/lib/libproc.so:= REALPATH=../../lib/libproc.so.1 -$(ROOT)/usr/lib/libpthread.so.1:= REALPATH=../../lib/libpthread.so.1 -$(ROOT)/usr/lib/libpthread.so:= REALPATH=../../lib/libpthread.so.1 -$(ROOT)/usr/lib/librcm.so.1:= REALPATH=../../lib/librcm.so.1 -$(ROOT)/usr/lib/librcm.so:= REALPATH=../../lib/librcm.so.1 -$(ROOT)/usr/lib/libresolv.so.1:= REALPATH=../../lib/libresolv.so.1 -$(ROOT)/usr/lib/libresolv.so.2:= REALPATH=../../lib/libresolv.so.2 -$(ROOT)/usr/lib/libresolv.so:= REALPATH=../../lib/libresolv.so.2 -$(ROOT)/usr/lib/librestart.so.1:= REALPATH=../../lib/librestart.so.1 -$(ROOT)/usr/lib/librestart.so:= REALPATH=../../lib/librestart.so.1 -$(ROOT)/usr/lib/librpcsvc.so.1:= REALPATH=../../lib/librpcsvc.so.1 -$(ROOT)/usr/lib/librpcsvc.so:= REALPATH=../../lib/librpcsvc.so.1 -$(ROOT)/usr/lib/librt.so.1:= REALPATH=../../lib/librt.so.1 -$(ROOT)/usr/lib/librt.so:= REALPATH=../../lib/librt.so.1 -$(ROOT)/usr/lib/librtld.so.1:= REALPATH=../../lib/librtld.so.1 -$(ROOT)/usr/lib/librtld_db.so.1:= REALPATH=../../lib/librtld_db.so.1 -$(ROOT)/usr/lib/librtld_db.so:= REALPATH=../../lib/librtld_db.so.1 -$(ROOT)/usr/lib/libscf.so.1:= REALPATH=../../lib/libscf.so.1 -$(ROOT)/usr/lib/libscf.so:= REALPATH=../../lib/libscf.so.1 -$(ROOT)/usr/lib/libsec.so.1:= REALPATH=../../lib/libsec.so.1 -$(ROOT)/usr/lib/libsec.so:= REALPATH=../../lib/libsec.so.1 -$(ROOT)/usr/lib/libsecdb.so.1:= REALPATH=../../lib/libsecdb.so.1 -$(ROOT)/usr/lib/libsecdb.so:= REALPATH=../../lib/libsecdb.so.1 -$(ROOT)/usr/lib/libsendfile.so.1:= REALPATH=../../lib/libsendfile.so.1 -$(ROOT)/usr/lib/libsendfile.so:= REALPATH=../../lib/libsendfile.so.1 -$(ROOT)/usr/lib/libsocket.so.1:= REALPATH=../../lib/libsocket.so.1 -$(ROOT)/usr/lib/libsocket.so:= REALPATH=../../lib/libsocket.so.1 -$(ROOT)/usr/lib/libsysevent.so.1:= REALPATH=../../lib/libsysevent.so.1 -$(ROOT)/usr/lib/libsysevent.so:= REALPATH=../../lib/libsysevent.so.1 -$(ROOT)/usr/lib/libtermcap.so.1:= REALPATH=../../lib/libtermcap.so.1 -$(ROOT)/usr/lib/libtermcap.so:= REALPATH=../../lib/libtermcap.so.1 -$(ROOT)/usr/lib/libtermlib.so.1:= REALPATH=../../lib/libcurses.so.1 -$(ROOT)/usr/lib/libtermlib.so:= REALPATH=../../lib/libcurses.so.1 -$(ROOT)/usr/lib/libthread.so.1:= REALPATH=../../lib/libthread.so.1 -$(ROOT)/usr/lib/libthread.so:= REALPATH=../../lib/libthread.so.1 -$(ROOT)/usr/lib/libthread_db.so.1:= REALPATH=../../lib/libc_db.so.1 -$(ROOT)/usr/lib/libthread_db.so:= REALPATH=../../lib/libc_db.so.1 -$(ROOT)/usr/lib/libtsnet.so.1:= REALPATH=../../lib/libtsnet.so.1 -$(ROOT)/usr/lib/libtsnet.so:= REALPATH=../../lib/libtsnet.so.1 -$(ROOT)/usr/lib/libtsol.so.2:= REALPATH=../../lib/libtsol.so.2 -$(ROOT)/usr/lib/libtsol.so:= REALPATH=../../lib/libtsol.so.2 -$(ROOT)/usr/lib/libumem.so.1:= REALPATH=../../lib/libumem.so.1 -$(ROOT)/usr/lib/libumem.so:= REALPATH=../../lib/libumem.so.1 -$(ROOT)/usr/lib/libuuid.so.1:= REALPATH=../../lib/libuuid.so.1 -$(ROOT)/usr/lib/libuuid.so:= REALPATH=../../lib/libuuid.so.1 -$(ROOT)/usr/lib/libuutil.so.1:= REALPATH=../../lib/libuutil.so.1 -$(ROOT)/usr/lib/libuutil.so:= REALPATH=../../lib/libuutil.so.1 -$(ROOT)/usr/lib/libw.so.1:= REALPATH=../../lib/libw.so.1 -$(ROOT)/usr/lib/libw.so:= REALPATH=../../lib/libw.so.1 -$(ROOT)/usr/lib/libxnet.so.1:= REALPATH=../../lib/libxnet.so.1 -$(ROOT)/usr/lib/libxnet.so:= REALPATH=../../lib/libxnet.so.1 -$(ROOT)/usr/lib/libzfs.so.1:= REALPATH=../../lib/libzfs.so.1 -$(ROOT)/usr/lib/libzfs.so:= REALPATH=../../lib/libzfs.so.1 -$(ROOT)/usr/lib/libzfs_core.so.1:= REALPATH=../../lib/libzfs_core.so.1 -$(ROOT)/usr/lib/libzfs_core.so:= REALPATH=../../lib/libzfs_core.so.1 -$(ROOT)/usr/lib/libzutil.so.1:= REALPATH=../../lib/libzutil.so.1 -$(ROOT)/usr/lib/libzutil.so:= REALPATH=../../lib/libzutil.so.1 -$(ROOT)/usr/lib/nss_compat.so.1:= REALPATH=../../lib/nss_compat.so.1 -$(ROOT)/usr/lib/nss_dns.so.1:= REALPATH=../../lib/nss_dns.so.1 -$(ROOT)/usr/lib/nss_files.so.1:= REALPATH=../../lib/nss_files.so.1 -$(ROOT)/usr/lib/nss_nis.so.1:= REALPATH=../../lib/nss_nis.so.1 -$(ROOT)/usr/lib/nss_user.so.1:= REALPATH=../../lib/nss_user.so.1 -$(ROOT)/usr/lib/fm/libfmevent.so.1:= REALPATH=../../../lib/fm/libfmevent.so.1 -$(ROOT)/usr/lib/fm/libfmevent.so:= REALPATH=../../../lib/fm/libfmevent.so.1 - -$(ROOT)/lib/$(MACH64)/libposix4.so.1:= \ - REALPATH=librt.so.1 -$(ROOT)/lib/$(MACH64)/libposix4.so:= \ - REALPATH=libposix4.so.1 -$(ROOT)/lib/$(MACH64)/libthread_db.so.1:= \ - REALPATH=libc_db.so.1 -$(ROOT)/lib/$(MACH64)/libthread_db.so:= \ - REALPATH=libc_db.so.1 -$(ROOT)/usr/lib/$(MACH64)/ld.so.1:= \ - REALPATH=../../../lib/$(MACH64)/ld.so.1 -$(ROOT)/usr/lib/$(MACH64)/libadm.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libadm.so.1 -$(ROOT)/usr/lib/$(MACH64)/libadm.so:= \ - REALPATH=../../../lib/$(MACH64)/libadm.so.1 -$(ROOT)/usr/lib/$(MACH64)/libaio.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libaio.so.1 -$(ROOT)/usr/lib/$(MACH64)/libaio.so:= \ - REALPATH=../../../lib/$(MACH64)/libaio.so.1 -$(ROOT)/usr/lib/$(MACH64)/libavl.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libavl.so.1 -$(ROOT)/usr/lib/$(MACH64)/libavl.so:= \ - REALPATH=../../../lib/$(MACH64)/libavl.so.1 -$(ROOT)/usr/lib/$(MACH64)/libbsm.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libbsm.so.1 -$(ROOT)/usr/lib/$(MACH64)/libbsm.so:= \ - REALPATH=../../../lib/$(MACH64)/libbsm.so.1 -$(ROOT)/usr/lib/$(MACH64)/libc.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libc.so.1 -$(ROOT)/usr/lib/$(MACH64)/libc.so:= \ - REALPATH=../../../lib/$(MACH64)/libc.so.1 -$(ROOT)/usr/lib/$(MACH64)/libc_db.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libc_db.so.1 -$(ROOT)/usr/lib/$(MACH64)/libc_db.so:= \ - REALPATH=../../../lib/$(MACH64)/libc_db.so.1 -$(ROOT)/usr/lib/$(MACH64)/libcmdutils.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libcmdutils.so.1 -$(ROOT)/usr/lib/$(MACH64)/libcmdutils.so:= \ - REALPATH=../../../lib/$(MACH64)/libcmdutils.so.1 -$(ROOT)/usr/lib/$(MACH64)/libcontract.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libcontract.so.1 -$(ROOT)/usr/lib/$(MACH64)/libcontract.so:= \ - REALPATH=../../../lib/$(MACH64)/libcontract.so.1 -$(ROOT)/usr/lib/$(MACH64)/libctf.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libctf.so.1 -$(ROOT)/usr/lib/$(MACH64)/libctf.so:= \ - REALPATH=../../../lib/$(MACH64)/libctf.so.1 -$(ROOT)/usr/lib/$(MACH64)/libcurses.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libcurses.so.1 -$(ROOT)/usr/lib/$(MACH64)/libcurses.so:= \ - REALPATH=../../../lib/$(MACH64)/libcurses.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdevice.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libdevice.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdevice.so:= \ - REALPATH=../../../lib/$(MACH64)/libdevice.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdevid.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libdevid.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdevid.so:= \ - REALPATH=../../../lib/$(MACH64)/libdevid.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdevinfo.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libdevinfo.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdevinfo.so:= \ - REALPATH=../../../lib/$(MACH64)/libdevinfo.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdhcpagent.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libdhcpagent.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdhcpagent.so:= \ - REALPATH=../../../lib/$(MACH64)/libdhcpagent.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdhcputil.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libdhcputil.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdhcputil.so:= \ - REALPATH=../../../lib/$(MACH64)/libdhcputil.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdl.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libdl.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdl.so:= \ - REALPATH=../../../lib/$(MACH64)/libdl.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdlpi.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libdlpi.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdlpi.so:= \ - REALPATH=../../../lib/$(MACH64)/libdlpi.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdoor.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libdoor.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdoor.so:= \ - REALPATH=../../../lib/$(MACH64)/libdoor.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdwarf.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libdwarf.so.1 -$(ROOT)/usr/lib/$(MACH64)/libdwarf.so:= \ - REALPATH=../../../lib/$(MACH64)/libdwarf.so.1 -$(ROOT)/usr/lib/$(MACH64)/libefi.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libefi.so.1 -$(ROOT)/usr/lib/$(MACH64)/libefi.so:= \ - REALPATH=../../../lib/$(MACH64)/libefi.so.1 -$(ROOT)/usr/lib/$(MACH64)/libelf.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libelf.so.1 -$(ROOT)/usr/lib/$(MACH64)/libelf.so:= \ - REALPATH=../../../lib/$(MACH64)/libelf.so.1 -$(ROOT)/usr/lib/$(MACH64)/libgen.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libgen.so.1 -$(ROOT)/usr/lib/$(MACH64)/libgen.so:= \ - REALPATH=../../../lib/$(MACH64)/libgen.so.1 -$(ROOT)/usr/lib/$(MACH64)/libinetutil.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libinetutil.so.1 -$(ROOT)/usr/lib/$(MACH64)/libinetutil.so:= \ - REALPATH=../../../lib/$(MACH64)/libinetutil.so.1 -$(ROOT)/usr/lib/$(MACH64)/libintl.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libintl.so.1 -$(ROOT)/usr/lib/$(MACH64)/libintl.so:= \ - REALPATH=../../../lib/$(MACH64)/libintl.so.1 -$(ROOT)/usr/lib/$(MACH64)/libkstat.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libkstat.so.1 -$(ROOT)/usr/lib/$(MACH64)/libkstat.so:= \ - REALPATH=../../../lib/$(MACH64)/libkstat.so.1 -$(ROOT)/usr/lib/$(MACH64)/liblddbg.so.4:= \ - REALPATH=../../../lib/$(MACH64)/liblddbg.so.4 -$(ROOT)/usr/lib/$(MACH64)/libm.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libm.so.1 -$(ROOT)/usr/lib/$(MACH64)/libm.so.2:= \ - REALPATH=../../../lib/$(MACH64)/libm.so.2 -$(ROOT)/usr/lib/$(MACH64)/libm.so:= \ - REALPATH=../../../lib/$(MACH64)/libm.so.2 -$(ROOT)/usr/lib/$(MACH64)/libmd.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libmd.so.1 -$(ROOT)/usr/lib/$(MACH64)/libmd.so:= \ - REALPATH=../../../lib/$(MACH64)/libmd.so.1 -$(ROOT)/usr/lib/$(MACH64)/libmd5.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libmd5.so.1 -$(ROOT)/usr/lib/$(MACH64)/libmd5.so:= \ - REALPATH=../../../lib/$(MACH64)/libmd5.so.1 -$(ROOT)/usr/lib/$(MACH64)/libmp.so.2:= \ - REALPATH=../../../lib/$(MACH64)/libmp.so.2 -$(ROOT)/usr/lib/$(MACH64)/libmp.so:= \ - REALPATH=../../../lib/$(MACH64)/libmp.so.2 -$(ROOT)/usr/lib/$(MACH64)/libmvec.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libmvec.so.1 -$(ROOT)/usr/lib/$(MACH64)/libmvec.so:= \ - REALPATH=../../../lib/$(MACH64)/libmvec.so.1 -$(ROOT)/usr/lib/$(MACH64)/libnsl.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libnsl.so.1 -$(ROOT)/usr/lib/$(MACH64)/libnsl.so:= \ - REALPATH=../../../lib/$(MACH64)/libnsl.so.1 -$(ROOT)/usr/lib/$(MACH64)/libnvpair.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libnvpair.so.1 -$(ROOT)/usr/lib/$(MACH64)/libnvpair.so:= \ - REALPATH=../../../lib/$(MACH64)/libnvpair.so.1 -$(ROOT)/usr/lib/$(MACH64)/libpam.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libpam.so.1 -$(ROOT)/usr/lib/$(MACH64)/libpam.so:= \ - REALPATH=../../../lib/$(MACH64)/libpam.so.1 -$(ROOT)/usr/lib/$(MACH64)/libposix4.so.1:= \ - REALPATH=../../../lib/$(MACH64)/librt.so.1 -$(ROOT)/usr/lib/$(MACH64)/libposix4.so:= \ - REALPATH=../../../lib/$(MACH64)/librt.so.1 -$(ROOT)/usr/lib/$(MACH64)/libproc.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libproc.so.1 -$(ROOT)/usr/lib/$(MACH64)/libproc.so:= \ - REALPATH=../../../lib/$(MACH64)/libproc.so.1 -$(ROOT)/usr/lib/$(MACH64)/libpthread.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libpthread.so.1 -$(ROOT)/usr/lib/$(MACH64)/libpthread.so:= \ - REALPATH=../../../lib/$(MACH64)/libpthread.so.1 -$(ROOT)/usr/lib/$(MACH64)/librcm.so.1:= \ - REALPATH=../../../lib/$(MACH64)/librcm.so.1 -$(ROOT)/usr/lib/$(MACH64)/librcm.so:= \ - REALPATH=../../../lib/$(MACH64)/librcm.so.1 -$(ROOT)/usr/lib/$(MACH64)/libresolv.so.2:= \ - REALPATH=../../../lib/$(MACH64)/libresolv.so.2 -$(ROOT)/usr/lib/$(MACH64)/libresolv.so:= \ - REALPATH=../../../lib/$(MACH64)/libresolv.so.2 -$(ROOT)/usr/lib/$(MACH64)/librestart.so.1:= \ - REALPATH=../../../lib/$(MACH64)/librestart.so.1 -$(ROOT)/usr/lib/$(MACH64)/librestart.so:= \ - REALPATH=../../../lib/$(MACH64)/librestart.so.1 -$(ROOT)/usr/lib/$(MACH64)/librpcsvc.so.1:= \ - REALPATH=../../../lib/$(MACH64)/librpcsvc.so.1 -$(ROOT)/usr/lib/$(MACH64)/librpcsvc.so:= \ - REALPATH=../../../lib/$(MACH64)/librpcsvc.so.1 -$(ROOT)/usr/lib/$(MACH64)/librt.so.1:= \ - REALPATH=../../../lib/$(MACH64)/librt.so.1 -$(ROOT)/usr/lib/$(MACH64)/librt.so:= \ - REALPATH=../../../lib/$(MACH64)/librt.so.1 -$(ROOT)/usr/lib/$(MACH64)/librtld.so.1:= \ - REALPATH=../../../lib/$(MACH64)/librtld.so.1 -$(ROOT)/usr/lib/$(MACH64)/librtld_db.so.1:= \ - REALPATH=../../../lib/$(MACH64)/librtld_db.so.1 -$(ROOT)/usr/lib/$(MACH64)/librtld_db.so:= \ - REALPATH=../../../lib/$(MACH64)/librtld_db.so.1 -$(ROOT)/usr/lib/$(MACH64)/libscf.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libscf.so.1 -$(ROOT)/usr/lib/$(MACH64)/libscf.so:= \ - REALPATH=../../../lib/$(MACH64)/libscf.so.1 -$(ROOT)/usr/lib/$(MACH64)/libsec.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libsec.so.1 -$(ROOT)/usr/lib/$(MACH64)/libsec.so:= \ - REALPATH=../../../lib/$(MACH64)/libsec.so.1 -$(ROOT)/usr/lib/$(MACH64)/libsecdb.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libsecdb.so.1 -$(ROOT)/usr/lib/$(MACH64)/libsecdb.so:= \ - REALPATH=../../../lib/$(MACH64)/libsecdb.so.1 -$(ROOT)/usr/lib/$(MACH64)/libsendfile.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libsendfile.so.1 -$(ROOT)/usr/lib/$(MACH64)/libsendfile.so:= \ - REALPATH=../../../lib/$(MACH64)/libsendfile.so.1 -$(ROOT)/usr/lib/$(MACH64)/libsocket.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libsocket.so.1 -$(ROOT)/usr/lib/$(MACH64)/libsocket.so:= \ - REALPATH=../../../lib/$(MACH64)/libsocket.so.1 -$(ROOT)/usr/lib/$(MACH64)/libsysevent.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libsysevent.so.1 -$(ROOT)/usr/lib/$(MACH64)/libsysevent.so:= \ - REALPATH=../../../lib/$(MACH64)/libsysevent.so.1 -$(ROOT)/usr/lib/$(MACH64)/libtermcap.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libtermcap.so.1 -$(ROOT)/usr/lib/$(MACH64)/libtermcap.so:= \ - REALPATH=../../../lib/$(MACH64)/libtermcap.so.1 -$(ROOT)/usr/lib/$(MACH64)/libtermlib.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libcurses.so.1 -$(ROOT)/usr/lib/$(MACH64)/libtermlib.so:= \ - REALPATH=../../../lib/$(MACH64)/libcurses.so.1 -$(ROOT)/usr/lib/$(MACH64)/libthread.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libthread.so.1 -$(ROOT)/usr/lib/$(MACH64)/libthread.so:= \ - REALPATH=../../../lib/$(MACH64)/libthread.so.1 -$(ROOT)/usr/lib/$(MACH64)/libthread_db.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libc_db.so.1 -$(ROOT)/usr/lib/$(MACH64)/libthread_db.so:= \ - REALPATH=../../../lib/$(MACH64)/libc_db.so.1 -$(ROOT)/usr/lib/$(MACH64)/libtsnet.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libtsnet.so.1 -$(ROOT)/usr/lib/$(MACH64)/libtsnet.so:= \ - REALPATH=../../../lib/$(MACH64)/libtsnet.so.1 -$(ROOT)/usr/lib/$(MACH64)/libtsol.so.2:= \ - REALPATH=../../../lib/$(MACH64)/libtsol.so.2 -$(ROOT)/usr/lib/$(MACH64)/libtsol.so:= \ - REALPATH=../../../lib/$(MACH64)/libtsol.so.2 -$(ROOT)/usr/lib/$(MACH64)/libumem.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libumem.so.1 -$(ROOT)/usr/lib/$(MACH64)/libumem.so:= \ - REALPATH=../../../lib/$(MACH64)/libumem.so.1 -$(ROOT)/usr/lib/$(MACH64)/libuuid.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libuuid.so.1 -$(ROOT)/usr/lib/$(MACH64)/libuuid.so:= \ - REALPATH=../../../lib/$(MACH64)/libuuid.so.1 -$(ROOT)/usr/lib/$(MACH64)/libuutil.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libuutil.so.1 -$(ROOT)/usr/lib/$(MACH64)/libuutil.so:= \ - REALPATH=../../../lib/$(MACH64)/libuutil.so.1 -$(ROOT)/usr/lib/$(MACH64)/libw.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libw.so.1 -$(ROOT)/usr/lib/$(MACH64)/libw.so:= \ - REALPATH=../../../lib/$(MACH64)/libw.so.1 -$(ROOT)/usr/lib/$(MACH64)/libxnet.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libxnet.so.1 -$(ROOT)/usr/lib/$(MACH64)/libxnet.so:= \ - REALPATH=../../../lib/$(MACH64)/libxnet.so.1 -$(ROOT)/usr/lib/$(MACH64)/libzfs.so:= \ - REALPATH=../../../lib/$(MACH64)/libzfs.so.1 -$(ROOT)/usr/lib/$(MACH64)/libzfs.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libzfs.so.1 -$(ROOT)/usr/lib/$(MACH64)/libzfs_core.so:= \ - REALPATH=../../../lib/$(MACH64)/libzfs_core.so.1 -$(ROOT)/usr/lib/$(MACH64)/libzfs_core.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libzfs_core.so.1 -$(ROOT)/usr/lib/$(MACH64)/libzutil.so:= \ - REALPATH=../../../lib/$(MACH64)/libzutil.so.1 -$(ROOT)/usr/lib/$(MACH64)/libzutil.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libzutil.so.1 -$(ROOT)/usr/lib/$(MACH64)/libfakekernel.so:= \ - REALPATH=../../../lib/$(MACH64)/libfakekernel.so.1 -$(ROOT)/usr/lib/$(MACH64)/libfakekernel.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libfakekernel.so.1 -$(ROOT)/usr/lib/$(MACH64)/libfdisk.so.1:= \ - REALPATH=../../../lib/$(MACH64)/libfdisk.so.1 -$(ROOT)/usr/lib/$(MACH64)/libfdisk.so:= \ - REALPATH=../../../lib/$(MACH64)/libfdisk.so.1 -$(ROOT)/usr/lib/$(MACH64)/nss_compat.so.1:= \ - REALPATH=../../../lib/$(MACH64)/nss_compat.so.1 -$(ROOT)/usr/lib/$(MACH64)/nss_dns.so.1:= \ - REALPATH=../../../lib/$(MACH64)/nss_dns.so.1 -$(ROOT)/usr/lib/$(MACH64)/nss_files.so.1:= \ - REALPATH=../../../lib/$(MACH64)/nss_files.so.1 -$(ROOT)/usr/lib/$(MACH64)/nss_nis.so.1:= \ - REALPATH=../../../lib/$(MACH64)/nss_nis.so.1 -$(ROOT)/usr/lib/$(MACH64)/nss_user.so.1:= \ - REALPATH=../../../lib/$(MACH64)/nss_user.so.1 -$(ROOT)/usr/lib/fm/$(MACH64)/libfmevent.so.1:= \ - REALPATH=../../../../lib/fm/$(MACH64)/libfmevent.so.1 -$(ROOT)/usr/lib/fm/$(MACH64)/libfmevent.so:= \ - REALPATH=../../../../lib/fm/$(MACH64)/libfmevent.so.1 - -i386_SYM.USRLIB= \ - /usr/lib/libfdisk.so \ - /usr/lib/libfdisk.so.1 - -SYM.USRLIB= \ - $($(MACH)_SYM.USRLIB) \ - /lib/libposix4.so \ - /lib/libposix4.so.1 \ - /lib/libthread_db.so \ - /lib/libthread_db.so.1 \ - /usr/lib/ld.so.1 \ - /usr/lib/libadm.so \ - /usr/lib/libadm.so.1 \ - /usr/lib/libaio.so \ - /usr/lib/libaio.so.1 \ - /usr/lib/libavl.so \ - /usr/lib/libavl.so.1 \ - /usr/lib/libbsm.so \ - /usr/lib/libbsm.so.1 \ - /usr/lib/libc.so \ - /usr/lib/libc.so.1 \ - /usr/lib/libc_db.so \ - /usr/lib/libc_db.so.1 \ - /usr/lib/libcmdutils.so \ - /usr/lib/libcmdutils.so.1 \ - /usr/lib/libcontract.so \ - /usr/lib/libcontract.so.1 \ - /usr/lib/libctf.so \ - /usr/lib/libctf.so.1 \ - /usr/lib/libcurses.so \ - /usr/lib/libcurses.so.1 \ - /usr/lib/libdevice.so \ - /usr/lib/libdevice.so.1 \ - /usr/lib/libdevid.so \ - /usr/lib/libdevid.so.1 \ - /usr/lib/libdevinfo.so \ - /usr/lib/libdevinfo.so.1 \ - /usr/lib/libdhcpagent.so \ - /usr/lib/libdhcpagent.so.1 \ - /usr/lib/libdhcputil.so \ - /usr/lib/libdhcputil.so.1 \ - /usr/lib/libdl.so \ - /usr/lib/libdl.so.1 \ - /usr/lib/libdlpi.so \ - /usr/lib/libdlpi.so.1 \ - /usr/lib/libdoor.so \ - /usr/lib/libdoor.so.1 \ - /usr/lib/libdwarf.so \ - /usr/lib/libdwarf.so.1 \ - /usr/lib/libefi.so \ - /usr/lib/libefi.so.1 \ - /usr/lib/libelf.so \ - /usr/lib/libelf.so.1 \ - /usr/lib/libfakekernel.so \ - /usr/lib/libfakekernel.so.1 \ - /usr/lib/libgen.so \ - /usr/lib/libgen.so.1 \ - /usr/lib/libinetutil.so \ - /usr/lib/libinetutil.so.1 \ - /usr/lib/libintl.so \ - /usr/lib/libintl.so.1 \ - /usr/lib/libkstat.so \ - /usr/lib/libkstat.so.1 \ - /usr/lib/liblddbg.so.4 \ - /usr/lib/libm.so.1 \ - /usr/lib/libm.so.2 \ - /usr/lib/libm.so \ - /usr/lib/libmd.so \ - /usr/lib/libmd.so.1 \ - /usr/lib/libmd5.so \ - /usr/lib/libmd5.so.1 \ - /usr/lib/libmp.so \ - /usr/lib/libmp.so.1 \ - /usr/lib/libmp.so.2 \ - /usr/lib/libmvec.so.1 \ - /usr/lib/libmvec.so \ - /usr/lib/libnsl.so \ - /usr/lib/libnsl.so.1 \ - /usr/lib/libnvpair.so \ - /usr/lib/libnvpair.so.1 \ - /usr/lib/libpam.so \ - /usr/lib/libpam.so.1 \ - /usr/lib/libposix4.so \ - /usr/lib/libposix4.so.1 \ - /usr/lib/libproc.so \ - /usr/lib/libproc.so.1 \ - /usr/lib/libpthread.so \ - /usr/lib/libpthread.so.1 \ - /usr/lib/librcm.so \ - /usr/lib/librcm.so.1 \ - /usr/lib/libresolv.so \ - /usr/lib/libresolv.so.1 \ - /usr/lib/libresolv.so.2 \ - /usr/lib/librestart.so \ - /usr/lib/librestart.so.1 \ - /usr/lib/librpcsvc.so \ - /usr/lib/librpcsvc.so.1 \ - /usr/lib/librt.so \ - /usr/lib/librt.so.1 \ - /usr/lib/librtld.so.1 \ - /usr/lib/librtld_db.so \ - /usr/lib/librtld_db.so.1 \ - /usr/lib/libscf.so \ - /usr/lib/libscf.so.1 \ - /usr/lib/libsec.so \ - /usr/lib/libsec.so.1 \ - /usr/lib/libsecdb.so \ - /usr/lib/libsecdb.so.1 \ - /usr/lib/libsendfile.so \ - /usr/lib/libsendfile.so.1 \ - /usr/lib/libsocket.so \ - /usr/lib/libsocket.so.1 \ - /usr/lib/libsysevent.so \ - /usr/lib/libsysevent.so.1 \ - /usr/lib/libtermcap.so \ - /usr/lib/libtermcap.so.1 \ - /usr/lib/libtermlib.so \ - /usr/lib/libtermlib.so.1 \ - /usr/lib/libthread.so \ - /usr/lib/libthread.so.1 \ - /usr/lib/libthread_db.so \ - /usr/lib/libthread_db.so.1 \ - /usr/lib/libtsnet.so \ - /usr/lib/libtsnet.so.1 \ - /usr/lib/libtsol.so \ - /usr/lib/libtsol.so.2 \ - /usr/lib/libumem.so \ - /usr/lib/libumem.so.1 \ - /usr/lib/libuuid.so \ - /usr/lib/libuuid.so.1 \ - /usr/lib/libuutil.so \ - /usr/lib/libuutil.so.1 \ - /usr/lib/libw.so \ - /usr/lib/libw.so.1 \ - /usr/lib/libxnet.so \ - /usr/lib/libxnet.so.1 \ - /usr/lib/libzfs.so \ - /usr/lib/libzfs.so.1 \ - /usr/lib/libzfs_core.so \ - /usr/lib/libzfs_core.so.1 \ - /usr/lib/libzutil.so \ - /usr/lib/libzutil.so.1 \ - /usr/lib/nss_compat.so.1 \ - /usr/lib/nss_dns.so.1 \ - /usr/lib/nss_files.so.1 \ - /usr/lib/nss_nis.so.1 \ - /usr/lib/nss_user.so.1 \ - /usr/lib/fm/libfmevent.so \ - /usr/lib/fm/libfmevent.so.1 - -sparcv9_SYM.USRLIB64= - -amd64_SYM.USRLIB64= \ - /usr/lib/amd64/libfdisk.so \ - /usr/lib/amd64/libfdisk.so.1 - - -SYM.USRLIB64= \ - $($(MACH64)_SYM.USRLIB64) \ - /lib/$(MACH64)/libposix4.so \ - /lib/$(MACH64)/libposix4.so.1 \ - /lib/$(MACH64)/libthread_db.so \ - /lib/$(MACH64)/libthread_db.so.1 \ - /usr/lib/$(MACH64)/ld.so.1 \ - /usr/lib/$(MACH64)/libadm.so \ - /usr/lib/$(MACH64)/libadm.so.1 \ - /usr/lib/$(MACH64)/libaio.so \ - /usr/lib/$(MACH64)/libaio.so.1 \ - /usr/lib/$(MACH64)/libavl.so \ - /usr/lib/$(MACH64)/libavl.so.1 \ - /usr/lib/$(MACH64)/libbsm.so \ - /usr/lib/$(MACH64)/libbsm.so.1 \ - /usr/lib/$(MACH64)/libc.so \ - /usr/lib/$(MACH64)/libc.so.1 \ - /usr/lib/$(MACH64)/libc_db.so \ - /usr/lib/$(MACH64)/libc_db.so.1 \ - /usr/lib/$(MACH64)/libcmdutils.so \ - /usr/lib/$(MACH64)/libcmdutils.so.1 \ - /usr/lib/$(MACH64)/libcontract.so \ - /usr/lib/$(MACH64)/libcontract.so.1 \ - /usr/lib/$(MACH64)/libctf.so \ - /usr/lib/$(MACH64)/libctf.so.1 \ - /usr/lib/$(MACH64)/libcurses.so \ - /usr/lib/$(MACH64)/libcurses.so.1 \ - /usr/lib/$(MACH64)/libdevice.so \ - /usr/lib/$(MACH64)/libdevice.so.1 \ - /usr/lib/$(MACH64)/libdevid.so \ - /usr/lib/$(MACH64)/libdevid.so.1 \ - /usr/lib/$(MACH64)/libdevinfo.so \ - /usr/lib/$(MACH64)/libdevinfo.so.1 \ - /usr/lib/$(MACH64)/libdhcpagent.so \ - /usr/lib/$(MACH64)/libdhcpagent.so.1 \ - /usr/lib/$(MACH64)/libdhcputil.so \ - /usr/lib/$(MACH64)/libdhcputil.so.1 \ - /usr/lib/$(MACH64)/libdl.so \ - /usr/lib/$(MACH64)/libdl.so.1 \ - /usr/lib/$(MACH64)/libdlpi.so \ - /usr/lib/$(MACH64)/libdlpi.so.1 \ - /usr/lib/$(MACH64)/libdoor.so \ - /usr/lib/$(MACH64)/libdoor.so.1 \ - /usr/lib/$(MACH64)/libdwarf.so \ - /usr/lib/$(MACH64)/libdwarf.so.1 \ - /usr/lib/$(MACH64)/libefi.so \ - /usr/lib/$(MACH64)/libefi.so.1 \ - /usr/lib/$(MACH64)/libelf.so \ - /usr/lib/$(MACH64)/libelf.so.1 \ - /usr/lib/$(MACH64)/libfakekernel.so \ - /usr/lib/$(MACH64)/libfakekernel.so.1 \ - /usr/lib/$(MACH64)/libgen.so \ - /usr/lib/$(MACH64)/libgen.so.1 \ - /usr/lib/$(MACH64)/libinetutil.so \ - /usr/lib/$(MACH64)/libinetutil.so.1 \ - /usr/lib/$(MACH64)/libintl.so \ - /usr/lib/$(MACH64)/libintl.so.1 \ - /usr/lib/$(MACH64)/libkstat.so \ - /usr/lib/$(MACH64)/libkstat.so.1 \ - /usr/lib/$(MACH64)/liblddbg.so.4 \ - /usr/lib/$(MACH64)/libm.so.1 \ - /usr/lib/$(MACH64)/libm.so.2 \ - /usr/lib/$(MACH64)/libm.so \ - /usr/lib/$(MACH64)/libmd.so \ - /usr/lib/$(MACH64)/libmd.so.1 \ - /usr/lib/$(MACH64)/libmd5.so \ - /usr/lib/$(MACH64)/libmd5.so.1 \ - /usr/lib/$(MACH64)/libmp.so \ - /usr/lib/$(MACH64)/libmp.so.2 \ - /usr/lib/$(MACH64)/libmvec.so.1 \ - /usr/lib/$(MACH64)/libmvec.so \ - /usr/lib/$(MACH64)/libnsl.so \ - /usr/lib/$(MACH64)/libnsl.so.1 \ - /usr/lib/$(MACH64)/libnvpair.so \ - /usr/lib/$(MACH64)/libnvpair.so.1 \ - /usr/lib/$(MACH64)/libpam.so \ - /usr/lib/$(MACH64)/libpam.so.1 \ - /usr/lib/$(MACH64)/libposix4.so \ - /usr/lib/$(MACH64)/libposix4.so.1 \ - /usr/lib/$(MACH64)/libproc.so \ - /usr/lib/$(MACH64)/libproc.so.1 \ - /usr/lib/$(MACH64)/libpthread.so \ - /usr/lib/$(MACH64)/libpthread.so.1 \ - /usr/lib/$(MACH64)/librcm.so \ - /usr/lib/$(MACH64)/librcm.so.1 \ - /usr/lib/$(MACH64)/libresolv.so \ - /usr/lib/$(MACH64)/libresolv.so.2 \ - /usr/lib/$(MACH64)/librestart.so \ - /usr/lib/$(MACH64)/librestart.so.1 \ - /usr/lib/$(MACH64)/librpcsvc.so \ - /usr/lib/$(MACH64)/librpcsvc.so.1 \ - /usr/lib/$(MACH64)/librt.so \ - /usr/lib/$(MACH64)/librt.so.1 \ - /usr/lib/$(MACH64)/librtld.so.1 \ - /usr/lib/$(MACH64)/librtld_db.so \ - /usr/lib/$(MACH64)/librtld_db.so.1 \ - /usr/lib/$(MACH64)/libscf.so \ - /usr/lib/$(MACH64)/libscf.so.1 \ - /usr/lib/$(MACH64)/libsec.so \ - /usr/lib/$(MACH64)/libsec.so.1 \ - /usr/lib/$(MACH64)/libsecdb.so \ - /usr/lib/$(MACH64)/libsecdb.so.1 \ - /usr/lib/$(MACH64)/libsendfile.so \ - /usr/lib/$(MACH64)/libsendfile.so.1 \ - /usr/lib/$(MACH64)/libsocket.so \ - /usr/lib/$(MACH64)/libsocket.so.1 \ - /usr/lib/$(MACH64)/libsysevent.so \ - /usr/lib/$(MACH64)/libsysevent.so.1 \ - /usr/lib/$(MACH64)/libtermcap.so \ - /usr/lib/$(MACH64)/libtermcap.so.1 \ - /usr/lib/$(MACH64)/libtermlib.so \ - /usr/lib/$(MACH64)/libtermlib.so.1 \ - /usr/lib/$(MACH64)/libthread.so \ - /usr/lib/$(MACH64)/libthread.so.1 \ - /usr/lib/$(MACH64)/libthread_db.so \ - /usr/lib/$(MACH64)/libthread_db.so.1 \ - /usr/lib/$(MACH64)/libtsnet.so \ - /usr/lib/$(MACH64)/libtsnet.so.1 \ - /usr/lib/$(MACH64)/libtsol.so \ - /usr/lib/$(MACH64)/libtsol.so.2 \ - /usr/lib/$(MACH64)/libumem.so \ - /usr/lib/$(MACH64)/libumem.so.1 \ - /usr/lib/$(MACH64)/libuuid.so \ - /usr/lib/$(MACH64)/libuuid.so.1 \ - /usr/lib/$(MACH64)/libuutil.so \ - /usr/lib/$(MACH64)/libuutil.so.1 \ - /usr/lib/$(MACH64)/libw.so \ - /usr/lib/$(MACH64)/libw.so.1 \ - /usr/lib/$(MACH64)/libxnet.so \ - /usr/lib/$(MACH64)/libxnet.so.1 \ - /usr/lib/$(MACH64)/libzfs.so \ - /usr/lib/$(MACH64)/libzfs.so.1 \ - /usr/lib/$(MACH64)/libzfs_core.so \ - /usr/lib/$(MACH64)/libzfs_core.so.1 \ - /usr/lib/$(MACH64)/libzutil.so \ - /usr/lib/$(MACH64)/libzutil.so.1 \ - /usr/lib/$(MACH64)/nss_compat.so.1 \ - /usr/lib/$(MACH64)/nss_dns.so.1 \ - /usr/lib/$(MACH64)/nss_files.so.1 \ - /usr/lib/$(MACH64)/nss_nis.so.1 \ - /usr/lib/$(MACH64)/nss_user.so.1 \ - /usr/lib/fm/$(MACH64)/libfmevent.so \ - /usr/lib/fm/$(MACH64)/libfmevent.so.1 - -# -# usr/src/Makefile uses INS.dir for any member of ROOTDIRS, the fact -# these are symlinks to files has no bearing on this. -# -$(FILELINKS:%=$(ROOT)%):= \ - INS.dir= -$(RM) $@; $(SYMLINK) $(REALPATH) $@ diff --git a/usr/src/cmd/abi/spectrans/parser/Makefile.targ b/usr/src/cmd/abi/spectrans/parser/Makefile.targ index 8c62e3e315..44c2de493f 100644 --- a/usr/src/cmd/abi/spectrans/parser/Makefile.targ +++ b/usr/src/cmd/abi/spectrans/parser/Makefile.targ @@ -40,7 +40,7 @@ SRCS = $(OBJECTS:%.o=../%.c) LINTFLAGS += -xsuF -errtags=yes CLEANFILES += $(LINTOUT) -CLOBBERFILES += $(LINTLIB) $(LIBRARY) +CLOBBERFILES += $(LIBRARY) CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-unused-label diff --git a/usr/src/cmd/backup/lib/Makefile b/usr/src/cmd/backup/lib/Makefile index 0cccf936d7..60ca868cc3 100644 --- a/usr/src/cmd/backup/lib/Makefile +++ b/usr/src/cmd/backup/lib/Makefile @@ -67,10 +67,7 @@ CERRWARN += -_gcc=-Wno-implicit-function-declaration CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-unused-label CERRWARN += -_gcc=-Wno-unused-variable -LINTOUT= lint.out -CLEANFILES= $(OBJECTS) $(LINTOUT) $(LINTLIB) $(DEBUGS) *.ln \ - $(YSRC) $(LIBRARY) -LINTFLAGS += -y +CLEANFILES= $(OBJECTS) $(DEBUGS) $(YSRC) $(LIBRARY) # support for -g library GLIB= libdump_g.a @@ -103,15 +100,7 @@ install: all $(POFILE): $(POFILES) $(RM) $@; cat $(POFILES) > $@ -# rpcgen produces unused local variables that we can't easily suppress. -# It is also stupid about 32/64 bit integers. Since we don't support -# the RPC subsystem any more, just ignore complaints about it all. -# We have no control over yaccpar, and it has lots of 32/64 complaints. -# Assumes lint run with -s argument -lint: lint.out - sed -f lint.sed lint.out - -lint.out: $(LINTLIB) +lint: check: $(HDRS) $(CSTYLE) $(CSTYLEFLAGS) `echo $(SRCS) | sed -e s/getdate.c//` $(HDRS) diff --git a/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop.c b/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop.c index 6ee99a06c6..6abda78efc 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop.c @@ -776,45 +776,45 @@ usage(void) { (void) fprintf(stderr, "\nUsage: snoop\n"); (void) fprintf(stderr, - "\t[ -a ] # Listen to packets on audio\n"); + "\t[ -a ] # Listen to packets on audio\n"); (void) fprintf(stderr, - "\t[ -d link ] # Listen on named link\n"); + "\t[ -d link ] # Listen on named link\n"); (void) fprintf(stderr, - "\t[ -s snaplen ] # Truncate packets\n"); + "\t[ -s snaplen ] # Truncate packets\n"); (void) fprintf(stderr, - "\t[ -I IP interface ] # Listen on named IP interface\n"); + "\t[ -I IP interface ] # Listen on named IP interface\n"); (void) fprintf(stderr, - "\t[ -c count ] # Quit after count packets\n"); + "\t[ -c count ] # Quit after count packets\n"); (void) fprintf(stderr, - "\t[ -P ] # Turn OFF promiscuous mode\n"); + "\t[ -P ] # Turn OFF promiscuous mode\n"); (void) fprintf(stderr, - "\t[ -D ] # Report dropped packets\n"); + "\t[ -D ] # Report dropped packets\n"); (void) fprintf(stderr, - "\t[ -S ] # Report packet size\n"); + "\t[ -S ] # Report packet size\n"); (void) fprintf(stderr, - "\t[ -i file ] # Read previously captured packets\n"); + "\t[ -i file ] # Read previously captured packets\n"); (void) fprintf(stderr, - "\t[ -o file ] # Capture packets in file\n"); + "\t[ -o file ] # Capture packets in file\n"); (void) fprintf(stderr, - "\t[ -n file ] # Load addr-to-name table from file\n"); + "\t[ -n file ] # Load addr-to-name table from file\n"); (void) fprintf(stderr, - "\t[ -N ] # Create addr-to-name table\n"); + "\t[ -N ] # Create addr-to-name table\n"); (void) fprintf(stderr, - "\t[ -t r|a|d ] # Time: Relative, Absolute or Delta\n"); + "\t[ -t r|a|d ] # Time: Relative, Absolute or Delta\n"); (void) fprintf(stderr, - "\t[ -v ] # Verbose packet display\n"); + "\t[ -v ] # Verbose packet display\n"); (void) fprintf(stderr, - "\t[ -V ] # Show all summary lines\n"); + "\t[ -V ] # Show all summary lines\n"); (void) fprintf(stderr, - "\t[ -p first[,last] ] # Select packet(s) to display\n"); + "\t[ -p first[,last] ] # Select packet(s) to display\n"); (void) fprintf(stderr, - "\t[ -x offset[,length] ] # Hex dump from offset for length\n"); + "\t[ -x offset[,length] ] # Hex dump from offset for length\n"); (void) fprintf(stderr, - "\t[ -C ] # Print packet filter code\n"); + "\t[ -C ] # Print packet filter code\n"); (void) fprintf(stderr, - "\t[ -q ] # Suppress printing packet count\n"); + "\t[ -q ] # Suppress printing packet count\n"); (void) fprintf(stderr, - "\t[ -r ] # Do not resolve address to name\n"); + "\t[ -r ] # Do not resolve address to name\n"); (void) fprintf(stderr, "\t[ -z zone ] # Open links from named zone\n"); (void) fprintf(stderr, diff --git a/usr/src/cmd/ldap/i386/Makefile b/usr/src/cmd/ldap/i386/Makefile index 3d21272402..20c550edf4 100644 --- a/usr/src/cmd/ldap/i386/Makefile +++ b/usr/src/cmd/ldap/i386/Makefile @@ -20,17 +20,14 @@ # CDDL HEADER END # # -#pragma ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1996-1997 by Sun Microsystems, Inc. # All rights reserved. # -# cmd/ldap/sparc/Makefile -# + include ../Makefile.com .KEEP_STATE: -install: $(ALLPROG) $(ROOTPROG) $(ROOTLINKS) $(ROOTLINT) +install: $(ALLPROG) $(ROOTPROG) $(ROOTLINKS) FRC: diff --git a/usr/src/cmd/ldap/sparc/Makefile b/usr/src/cmd/ldap/sparc/Makefile index 3d21272402..20c550edf4 100644 --- a/usr/src/cmd/ldap/sparc/Makefile +++ b/usr/src/cmd/ldap/sparc/Makefile @@ -20,17 +20,14 @@ # CDDL HEADER END # # -#pragma ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1996-1997 by Sun Microsystems, Inc. # All rights reserved. # -# cmd/ldap/sparc/Makefile -# + include ../Makefile.com .KEEP_STATE: -install: $(ALLPROG) $(ROOTPROG) $(ROOTLINKS) $(ROOTLINT) +install: $(ALLPROG) $(ROOTPROG) $(ROOTLINKS) FRC: diff --git a/usr/src/cmd/picl/plugins/common/memcfg/Makefile b/usr/src/cmd/picl/plugins/common/memcfg/Makefile index d1d28fadb3..cb92bf8c29 100644 --- a/usr/src/cmd/picl/plugins/common/memcfg/Makefile +++ b/usr/src/cmd/picl/plugins/common/memcfg/Makefile @@ -35,14 +35,10 @@ include $(SRC)/lib/Makefile.lib include $(SRC)/cmd/picl/plugins/Makefile.com -SRCS= $(OBJECTS:%.o=%.c) - LIBS = $(DYNLIB) ROOTLIBDIR = $(USR_LIB_PLUGINDIR) -CLEANFILES= $(LINTOUT) $(LINTLIB) - CPPFLAGS += -I$(SRC)/uts/sun4u/sys -I$(SRC)/cmd/picl/plugins/common/memcfg CFLAGS += $(CCVERBOSE) $(C_PICFLAGS) @@ -58,7 +54,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg POFILE= piclmemcfg_comm.po @@ -81,8 +76,7 @@ $(LIBLINKS): FRC include $(SRC)/cmd/picl/plugins/Makefile.targ include $(SRC)/lib/Makefile.targ -lint : - $(LINT.c) $(SRCS) +lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/Makefile.com b/usr/src/cmd/picl/plugins/lib/picld_pluginutil/Makefile.com index e803da9e56..e9aae72fa4 100644 --- a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/Makefile.com +++ b/usr/src/cmd/picl/plugins/lib/picld_pluginutil/Makefile.com @@ -36,17 +36,9 @@ SRCS= $(OBJECTS:%.o=../%.c) CLOBBERFILES += $(LIBLINKS) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) -LINTFLAGS = -uxmn -I.. -I$(SRC)/lib/libpicl -I$(SRC)/lib/libpicltree -LINTFLAGS += -D_REENTRANT -LINTOUT= lint.out - -LINTSRC = $(LINTLIB:%.ln=%) -ROOTLINTDIR = $(ROOTLIBDIR) -ROOTLINT = $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES= $(LINTOUT) $(LINTLIB) +CLEANFILES= $(LINTOUT) XGETFLAGS += -a POFILE= picld_pluginutil.po @@ -62,15 +54,11 @@ DYNFLAGS += $(ZNOLAZYLOAD) LDLIBS += -L$(SRC)/lib/libpicltree/$(MACH) LDLIBS += -lc -lpicltree -$(LINTLIB) := SRCS = ../llib-lpicld_pluginutil -$(LINTLIB) := LINTFLAGS = -nvx -I.. - .KEEP_STATE: all : $(LIBS) lint : - $(LINT.c) $(SRCS) %.po: ../%.c $(CP) $< $<.i @@ -89,6 +77,3 @@ include $(SRC)/lib/Makefile.targ pics/%.o: ../%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) - -$(ROOTLINTDIR)/%: ../% - $(INS.file) diff --git a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/i386/Makefile b/usr/src/cmd/picl/plugins/lib/picld_pluginutil/i386/Makefile index 8787dcca02..19d62a5750 100644 --- a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/i386/Makefile +++ b/usr/src/cmd/picl/plugins/lib/picld_pluginutil/i386/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -37,4 +35,4 @@ $(LIBLINKS): $(ROOTLIBDIR): $(INS.dir) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/sparc/Makefile b/usr/src/cmd/picl/plugins/lib/picld_pluginutil/sparc/Makefile index 8787dcca02..19d62a5750 100644 --- a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/sparc/Makefile +++ b/usr/src/cmd/picl/plugins/lib/picld_pluginutil/sparc/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -37,4 +35,4 @@ $(LIBLINKS): $(ROOTLIBDIR): $(INS.dir) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/cmd/picl/plugins/sun4u/boston/devtree/Makefile b/usr/src/cmd/picl/plugins/sun4u/boston/devtree/Makefile index 391bc77645..6b7ed5294d 100644 --- a/usr/src/cmd/picl/plugins/sun4u/boston/devtree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/boston/devtree/Makefile @@ -40,8 +40,6 @@ CONF= picldevtree.conf picl_asr.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -50,9 +48,8 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -all: +all: install: $(ROOTLIBDIR) $(ROOTCONF) @@ -60,9 +57,6 @@ install: $(ROOTLIBDIR) $(ROOTCONF) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/boston/envmon/Makefile b/usr/src/cmd/picl/plugins/sun4u/boston/envmon/Makefile index 1d09484472..ced1eefb21 100644 --- a/usr/src/cmd/picl/plugins/sun4u/boston/envmon/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/boston/envmon/Makefile @@ -42,8 +42,6 @@ ROOTCONF= $(CONFS:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 MAININFO= $(CONFS:%.conf=%.info) -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -52,9 +50,8 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -all: $(CONFS) +all: $(CONFS) install: $(ROOTLIBDIR) $(ROOTCONF) @@ -72,9 +69,6 @@ $(CONFS): $(MAININFO) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/boston/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/boston/frudata/Makefile index 01da1eba92..315203cbe7 100644 --- a/usr/src/cmd/picl/plugins/sun4u/boston/frudata/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/boston/frudata/Makefile @@ -41,8 +41,6 @@ CONF= libpiclfrudata.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -51,7 +49,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: $(CONF) @@ -61,9 +58,6 @@ install: $(ROOTLIBDIR) $(ROOTCONF) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/boston/frudr/Makefile b/usr/src/cmd/picl/plugins/sun4u/boston/frudr/Makefile index a7d32c8460..34bd6109f2 100644 --- a/usr/src/cmd/picl/plugins/sun4u/boston/frudr/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/boston/frudr/Makefile @@ -60,8 +60,6 @@ OTHERINFOS += fru_usb-a-3_data.info fru_usb-a-4_data.info OTHERINFOS += fru_FT0_data.info fru_FT1_data.info fru_FT2_data.info OTHERINFOS += fru_FT3_data.info fru_FT4_data.info fru_FT5_data.info -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS = @@ -70,7 +68,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: $(LIBS) $(LIBLINKS) $(CONFS) @@ -91,9 +88,6 @@ $(CONFS): $(MAININFO) $(OTHERINFOS) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/boston/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/boston/frutree/Makefile index cb4272fbe3..1821150cc0 100644 --- a/usr/src/cmd/picl/plugins/sun4u/boston/frutree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/boston/frutree/Makefile @@ -71,8 +71,6 @@ OTHERINFOS += $(INCDIR2)/fru_FT3_data.info OTHERINFOS += $(INCDIR2)/fru_FT4_data.info OTHERINFOS += $(INCDIR2)/fru_FT5_data.info -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -81,9 +79,8 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -all: $(CONFS) +all: $(CONFS) install: $(ROOTLIBDIR) $(ROOTCONF) @@ -101,9 +98,6 @@ $(CONFS): $(MAININFO) $(OTHERINFOS) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/chalupa/devtree/Makefile b/usr/src/cmd/picl/plugins/sun4u/chalupa/devtree/Makefile index ce6525bcdd..c0cd68fe4d 100644 --- a/usr/src/cmd/picl/plugins/sun4u/chalupa/devtree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/chalupa/devtree/Makefile @@ -38,8 +38,6 @@ CONF= picldevtree.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -48,9 +46,8 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -all: +all: install: $(ROOTLIBDIR) $(ROOTCONF) @@ -58,9 +55,6 @@ install: $(ROOTLIBDIR) $(ROOTCONF) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/chalupa/envmon/Makefile b/usr/src/cmd/picl/plugins/sun4u/chalupa/envmon/Makefile index f6aa7e7964..55c254dffe 100644 --- a/usr/src/cmd/picl/plugins/sun4u/chalupa/envmon/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/chalupa/envmon/Makefile @@ -41,8 +41,6 @@ ROOTCONF= $(CONFS:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 MAININFO= $(CONFS:%.conf=%.info) -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -51,9 +49,8 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -all: $(CONFS) +all: $(CONFS) install: $(ROOTLIBDIR) $(ROOTCONF) @@ -71,9 +68,6 @@ $(CONFS): $(MAININFO) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/chalupa/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/chalupa/frudata/Makefile index 36eebd137e..afe6ef852a 100644 --- a/usr/src/cmd/picl/plugins/sun4u/chalupa/frudata/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/chalupa/frudata/Makefile @@ -39,8 +39,6 @@ CONF= libpiclfrudata.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -49,7 +47,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: $(CONF) @@ -59,9 +56,6 @@ install: $(ROOTLIBDIR) $(ROOTCONF) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/chalupa/frudr/Makefile b/usr/src/cmd/picl/plugins/sun4u/chalupa/frudr/Makefile index c6bda23a4f..eeedf0de23 100644 --- a/usr/src/cmd/picl/plugins/sun4u/chalupa/frudr/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/chalupa/frudr/Makefile @@ -48,8 +48,6 @@ OTHERINFOS += fru_HDD0_data.info fru_HDD1_data.info OTHERINFOS += fru_HDD2_data.info fru_HDD3_data.info OTHERINFOS += fru_SC_data.info SB-tables.info -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS = @@ -58,7 +56,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: $(LIBS) $(LIBLINKS) $(CONFS) @@ -77,9 +74,6 @@ $(CONFS): $(MAININFO) $(OTHERINFOS) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/chalupa/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/chalupa/frutree/Makefile index a8bab74a81..1ad6d3e9cb 100644 --- a/usr/src/cmd/picl/plugins/sun4u/chalupa/frutree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/chalupa/frutree/Makefile @@ -51,8 +51,6 @@ OTHERINFOS += $(INCDIR2)/fru_PS0_data.info OTHERINFOS += $(INCDIR2)/fru_PS1_data.info OTHERINFOS += $(INCDIR2)/fru_SC_data.info -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -61,9 +59,8 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -all: $(CONFS) +all: $(CONFS) install: $(ROOTLIBDIR) $(ROOTCONF) @@ -81,9 +78,6 @@ $(CONFS): $(MAININFO) $(OTHERINFOS) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/cherrystone/conf/Makefile b/usr/src/cmd/picl/plugins/sun4u/cherrystone/conf/Makefile index 197b3a4b80..bc3320138c 100644 --- a/usr/src/cmd/picl/plugins/sun4u/cherrystone/conf/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/cherrystone/conf/Makefile @@ -20,13 +20,9 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 2001 by Sun Microsystems, Inc. # All rights reserved. # -# cmd/picl/plugins/sun4u/cherrystone/conf/Makefile -# OBJECTS= @@ -44,16 +40,12 @@ install := FILEMODE = 0444 CONF= platsvcd.conf psvcobj.conf ROOTCONF= $(CONF:%=$(USR_PSM_LIB_DIR)/%) -SRCS= +SRCS= LIBS = $(DYNLIB) -CLEANFILES= $(LINTOUT) $(LINTLIB) - ZDEFS = -LINTFLAGS += - .KEEP_STATE: SUBDIRS= @@ -62,7 +54,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: diff --git a/usr/src/cmd/picl/plugins/sun4u/cherrystone/devtree/Makefile b/usr/src/cmd/picl/plugins/sun4u/cherrystone/devtree/Makefile index 1532dd3343..ed24f0138b 100644 --- a/usr/src/cmd/picl/plugins/sun4u/cherrystone/devtree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/cherrystone/devtree/Makefile @@ -39,8 +39,6 @@ install := FILEMODE = 0444 CONF= picldevtree.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -49,9 +47,8 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -all: +all: install: $(ROOTLIBDIR) $(ROOTCONF) @@ -59,9 +56,6 @@ install: $(ROOTLIBDIR) $(ROOTCONF) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/cherrystone/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/cherrystone/frudata/Makefile index f53806da57..5461817470 100644 --- a/usr/src/cmd/picl/plugins/sun4u/cherrystone/frudata/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/cherrystone/frudata/Makefile @@ -38,9 +38,6 @@ CONF= libpiclfrudata.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 - -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -49,7 +46,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: $(CONF) @@ -59,9 +55,6 @@ install: $(ROOTLIBDIR) $(ROOTCONF) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/cherrystone/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/cherrystone/frutree/Makefile index f8cdfe960c..75a8b4c285 100644 --- a/usr/src/cmd/picl/plugins/sun4u/cherrystone/frutree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/cherrystone/frutree/Makefile @@ -53,11 +53,6 @@ ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 INFOS= $(CONF:%.conf=%.info) -LINTSRC = $(LINTLIB:%.ln=%) -ROOTLINTDIR = $(ROOTLIBDIR) -ROOTLINT = $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES= $(LINTOUT) $(LINTLIB) CLOBBERFILES += $(LIBLINKS) DEVTREE_SRC_DIR = $(SRC)/cmd/picl/plugins/common/devtree @@ -78,7 +73,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: $(LIBS) $(LIBLINKS) $(CONF) @@ -99,11 +93,7 @@ $(LIBLINKS): FRC include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint : - $(LINT.c) $(SRCS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/cherrystone/psvcplugin/Makefile b/usr/src/cmd/picl/plugins/sun4u/cherrystone/psvcplugin/Makefile index 77267c4004..9c5e25dfe6 100644 --- a/usr/src/cmd/picl/plugins/sun4u/cherrystone/psvcplugin/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/cherrystone/psvcplugin/Makefile @@ -42,8 +42,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-480R ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR) -CLEANFILES= $(LINTOUT) $(LINTLIB) - CPPFLAGS += -I$(SRC)/uts/sun4u CPPFLAGS += -I$(SRC)/cmd/picl/plugins/sun4u/psvc/psvcobj CPPFLAGS += -D_REENTRANT @@ -56,8 +54,6 @@ DYNFLAGS += -R/usr/platform/\$$PLATFORM/lib/picl/plugins:/usr/platform/sun4u/lib LDLIBS += -lc -lpicltree -lpicl -lpsvcobj -lpsvcplugin -LINTFLAGS += - .KEEP_STATE: SUBDIRS= @@ -69,7 +65,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: $(LIBS) $(LIBLINKS) @@ -91,7 +86,6 @@ include $(SRC)/cmd/picl/plugins/Makefile.targ include $(SRC)/lib/Makefile.targ lint : - $(LINT.c) $(SRCS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/cherrystone/psvcpolicy/Makefile b/usr/src/cmd/picl/plugins/sun4u/cherrystone/psvcpolicy/Makefile index fbc632dfb6..827839e69e 100644 --- a/usr/src/cmd/picl/plugins/sun4u/cherrystone/psvcpolicy/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/cherrystone/psvcpolicy/Makefile @@ -23,8 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY= libpsvcpolicy_psr.a VERS= .1 @@ -43,8 +41,6 @@ LIBS = $(DYNLIB) PLATFORM=SUNW,Sun-Fire-480R -CLEANFILES= $(LINTOUT) $(LINTLIB) - CPPFLAGS += -I$(SRC)/uts/sun4u CPPFLAGS += -I$(SRC)/cmd/picl/plugins/sun4u/psvc/psvcobj CPPFLAGS += -D_REENTRANT @@ -59,8 +55,6 @@ DYNFLAGS += -R/usr/platform/\$$PLATFORM/lib/picl/plugins:/usr/platform/sun4u/lib LDLIBS += -lpicltree -lpsvcobj -lpsvcplugin LDLIBS += -lc -ldevice -ldevinfo -lHBAAPI -LINTFLAGS += - .KEEP_STATE: PLATLIBS= $(USR_PLAT_DIR)/$(PLATFORM)/lib/ @@ -76,7 +70,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: $(LIBS) $(LIBLINKS) @@ -107,7 +100,6 @@ $(USR_PSM_LIB_DIR)/%: % $(USR_PSM_LIB_DIR) $(SYMLINK) ./libpsvcpolicy_psr.so$(VERS) $(USR_PSM_LIB_DIR)/libpsvcpolicy_psr.so lint : - $(LINT.c) $(SRCS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/chicago/envd/Makefile b/usr/src/cmd/picl/plugins/sun4u/chicago/envd/Makefile index b7f00d4e1d..c46f80e843 100644 --- a/usr/src/cmd/picl/plugins/sun4u/chicago/envd/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/chicago/envd/Makefile @@ -29,7 +29,7 @@ include $(SRC)/Makefile.psm LIBRARY= libpiclenvd.a VERS= .1 -OBJECTS= piclenvd.o piclenvsetup.o +OBJECTS= piclenvd.o piclenvsetup.o # include library definitions include $(SRC)/lib/Makefile.lib @@ -54,12 +54,6 @@ ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 INFOS= envmodel.info -LINTSRC = $(LINTLIB:%.ln=%) -ROOTLINTDIR = $(ROOTLIBDIR) -ROOTLINT = $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES= $(LINTOUT) $(LINTLIB) - CFLAGS += $(CCVERBOSE) DYNFLAGS += -R/usr/platform/\$$PLATFORM/lib/picl/plugins:/usr/platform/sun4u/lib/picl/plugins:/usr/lib/picl/plugins LDLIBS += -L$(SRC)/lib/libpicltree/$(MACH) @@ -80,7 +74,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: $(LIBS) $(CONF) $(LIBLINKS) @@ -110,11 +103,7 @@ $(LIBLINKS): FRC include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: - $(LINT.c) $(SRCS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/chicago/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/chicago/frudata/Makefile index 7c880814c8..62d8f7e5ce 100644 --- a/usr/src/cmd/picl/plugins/sun4u/chicago/frudata/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/chicago/frudata/Makefile @@ -39,8 +39,6 @@ CONF= libpiclfrudata.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -49,7 +47,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: $(CONF) @@ -59,9 +56,6 @@ install: $(ROOTLIBDIR) $(ROOTCONF) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/chicago/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/chicago/frutree/Makefile index d968a8f8da..fa3ad7676f 100644 --- a/usr/src/cmd/picl/plugins/sun4u/chicago/frutree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/chicago/frutree/Makefile @@ -40,8 +40,6 @@ ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 INFOS= piclfrutree.info system-board.info -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -50,9 +48,8 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -all: $(CONF) +all: $(CONF) install: $(ROOTLIBDIR) $(ROOTCONF) @@ -64,9 +61,6 @@ $(CONF): $(INFOS) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/daktari/conf/Makefile b/usr/src/cmd/picl/plugins/sun4u/daktari/conf/Makefile index e90180b858..a0b392bda0 100644 --- a/usr/src/cmd/picl/plugins/sun4u/daktari/conf/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/daktari/conf/Makefile @@ -20,13 +20,9 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 2000 by Sun Microsystems, Inc. # All rights reserved. # -# cmd/picl/plugins/sun4u/daktari/conf/Makefile -# OBJECTS= @@ -44,16 +40,12 @@ install := FILEMODE = 0444 CONF= platsvcd.conf psvcobj.conf ROOTCONF= $(CONF:%=$(USR_PSM_LIB_DIR)/%) -SRCS= +SRCS= LIBS = $(DYNLIB) -CLEANFILES= $(LINTOUT) $(LINTLIB) - ZDEFS = -LINTFLAGS += - .KEEP_STATE: SUBDIRS= @@ -62,7 +54,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: diff --git a/usr/src/cmd/picl/plugins/sun4u/daktari/devtree/Makefile b/usr/src/cmd/picl/plugins/sun4u/daktari/devtree/Makefile index e8ac4501da..36496be822 100644 --- a/usr/src/cmd/picl/plugins/sun4u/daktari/devtree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/daktari/devtree/Makefile @@ -39,8 +39,6 @@ install := FILEMODE = 0444 CONF= picldevtree.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -49,9 +47,8 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -all: +all: install: $(ROOTLIBDIR) $(ROOTCONF) diff --git a/usr/src/cmd/picl/plugins/sun4u/daktari/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/daktari/frudata/Makefile index e0bb53d26e..3df0acb5f9 100644 --- a/usr/src/cmd/picl/plugins/sun4u/daktari/frudata/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/daktari/frudata/Makefile @@ -38,9 +38,6 @@ CONF= libpiclfrudata.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 - -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -49,7 +46,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: $(CONF) @@ -59,9 +55,6 @@ install: $(ROOTLIBDIR) $(ROOTCONF) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/daktari/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/daktari/frutree/Makefile index fe246c15c3..837f83cb8d 100644 --- a/usr/src/cmd/picl/plugins/sun4u/daktari/frutree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/daktari/frutree/Makefile @@ -54,11 +54,6 @@ ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 INFOS= $(CONF:%.conf=%.info) -LINTSRC = $(LINTLIB:%.ln=%) -ROOTLINTDIR = $(ROOTLIBDIR) -ROOTLINT = $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES= $(LINTOUT) $(LINTLIB) CLOBBERFILES += $(LIBLINKS) DEVTREE_SRC_DIR = $(SRC)/cmd/picl/plugins/common/devtree @@ -79,7 +74,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: $(LIBS) $(LIBLINKS) $(CONF) @@ -100,11 +94,7 @@ $(LIBLINKS): FRC include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint : - $(LINT.c) $(SRCS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/daktari/psvcplugin/Makefile b/usr/src/cmd/picl/plugins/sun4u/daktari/psvcplugin/Makefile index 0c5b10e469..a3cea6f5e9 100644 --- a/usr/src/cmd/picl/plugins/sun4u/daktari/psvcplugin/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/daktari/psvcplugin/Makefile @@ -45,8 +45,6 @@ DYNFLAGS_COM = /usr/lib/picl/plugins ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR) -CLEANFILES= $(LINTOUT) $(LINTLIB) - CPPFLAGS += -I$(SRC)/uts/sun4u CPPFLAGS += -I$(SRC)/cmd/picl/plugins/sun4u/psvc/psvcobj CPPFLAGS += -D_REENTRANT @@ -59,8 +57,6 @@ DYNFLAGS += -R$(DYNFLAGS_PLAT):$(DYNFLAGS_SUN4U):$(DYNFLAGS_COM) LDLIBS += -lc -lpicltree -lpicl -lpsvcobj -lpsvcplugin -LINTFLAGS += - .KEEP_STATE: SUBDIRS= @@ -72,7 +68,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: $(LIBS) $(LIBLINKS) @@ -94,7 +89,6 @@ include $(SRC)/cmd/picl/plugins/Makefile.targ include $(SRC)/lib/Makefile.targ lint : - $(LINT.c) $(SRCS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/daktari/psvcpolicy/Makefile b/usr/src/cmd/picl/plugins/sun4u/daktari/psvcpolicy/Makefile index 1d70cb512d..5341f7acd2 100644 --- a/usr/src/cmd/picl/plugins/sun4u/daktari/psvcpolicy/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/daktari/psvcpolicy/Makefile @@ -22,10 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# cmd/picl/plugins/sun4u/daktari/psvcpolicy/Makefile -# + LIBRARY= libpsvcpolicy_psr.a VERS= .1 @@ -46,10 +43,8 @@ DYNFLAGS_PLAT = /usr/platform/\$$PLATFORM/lib/picl/plugins DYNFLAGS_SUN4U = /usr/platform/sun4u/lib/picl/plugins DYNFLAGS_COM = /usr/lib/picl/plugins -CLEANFILES= $(LINTOUT) $(LINTLIB) - CPPFLAGS += -I$(SRC)/uts/sun4u -CPPFLAGS += -I$(ROOT)/usr/platform/sun4u/include +CPPFLAGS += -I$(ROOT)/usr/platform/sun4u/include CPPFLAGS += -I$(SRC)/cmd/picl/plugins/sun4u/psvc/psvcobj CPPFLAGS += -D_REENTRANT @@ -64,8 +59,6 @@ DYNFLAGS += -R$(DYNFLAGS_PLAT):$(DYNFLAGS_SUN4U):$(DYNFLAGS_COM) LDLIBS += -lpicltree -lpsvcobj -lpsvcplugin LDLIBS += -lc -ldevice -lcfgadm -LINTFLAGS += - .KEEP_STATE: PLATLIBS= $(USR_PLAT_DIR)/$(PLATFORM)/lib/ @@ -81,7 +74,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: $(LIBS) $(LIBLINKS) @@ -112,7 +104,6 @@ $(USR_PSM_LIB_DIR)/%: % $(USR_PSM_LIB_DIR) $(SYMLINK) ./libpsvcpolicy_psr.so$(VERS) $(USR_PSM_LIB_DIR)/libpsvcpolicy_psr.so lint : - $(LINT.c) $(SRCS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/enchilada/envd/Makefile b/usr/src/cmd/picl/plugins/sun4u/enchilada/envd/Makefile index 8a82b9ee5a..8f086c3b28 100644 --- a/usr/src/cmd/picl/plugins/sun4u/enchilada/envd/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/enchilada/envd/Makefile @@ -29,7 +29,7 @@ include $(SRC)/Makefile.psm LIBRARY= libpiclenvd.a VERS= .1 -OBJECTS= piclenvd.o piclenvsetup.o +OBJECTS= piclenvd.o piclenvsetup.o # include library definitions include $(SRC)/lib/Makefile.lib @@ -54,12 +54,6 @@ ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 INFOS= envmodel.info -LINTSRC = $(LINTLIB:%.ln=%) -ROOTLINTDIR = $(ROOTLIBDIR) -ROOTLINT = $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES= $(LINTOUT) $(LINTLIB) - CFLAGS += $(CCVERBOSE) DYNFLAGS += -R/usr/platform/\$$PLATFORM/lib/picl/plugins:/usr/platform/sun4u/lib/picl/plugins:/usr/lib/picl/plugins LDLIBS += -L$(SRC)/lib/libpicltree/$(MACH) @@ -80,7 +74,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: $(LIBS) $(CONF) $(LIBLINKS) @@ -110,11 +103,7 @@ $(LIBLINKS): FRC include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: - $(LINT.c) $(SRCS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/enchilada/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/enchilada/frudata/Makefile index 742a6e15ea..3d3bc5207a 100644 --- a/usr/src/cmd/picl/plugins/sun4u/enchilada/frudata/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/enchilada/frudata/Makefile @@ -39,8 +39,6 @@ CONF= libpiclfrudata.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -49,7 +47,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: $(CONF) @@ -59,9 +56,6 @@ install: $(ROOTLIBDIR) $(ROOTCONF) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/enchilada/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/enchilada/frutree/Makefile index fb9ff5bce6..e39aa55ba6 100644 --- a/usr/src/cmd/picl/plugins/sun4u/enchilada/frutree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/enchilada/frutree/Makefile @@ -40,8 +40,6 @@ ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 INFOS= piclfrutree.info system-board.info -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -50,9 +48,8 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -all: $(CONF) +all: $(CONF) install: $(ROOTLIBDIR) $(ROOTCONF) @@ -64,9 +61,6 @@ $(CONF): $(INFOS) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/ents/devtree/Makefile b/usr/src/cmd/picl/plugins/sun4u/ents/devtree/Makefile index 4ac6eea388..5b2bb38b89 100644 --- a/usr/src/cmd/picl/plugins/sun4u/ents/devtree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/ents/devtree/Makefile @@ -38,8 +38,6 @@ CONF= picldevtree.conf picl_asr.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -48,9 +46,8 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -all: +all: install: $(ROOTLIBDIR) $(ROOTCONF) @@ -58,9 +55,6 @@ install: $(ROOTLIBDIR) $(ROOTCONF) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/ents/envmon/Makefile b/usr/src/cmd/picl/plugins/sun4u/ents/envmon/Makefile index c187457c0b..6562f0e1be 100644 --- a/usr/src/cmd/picl/plugins/sun4u/ents/envmon/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/ents/envmon/Makefile @@ -41,8 +41,6 @@ ROOTCONF= $(CONFS:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 MAININFO= $(CONFS:%.conf=%.info) -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -51,9 +49,8 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -all: $(CONFS) +all: $(CONFS) install: $(ROOTLIBDIR) $(ROOTCONF) @@ -71,9 +68,6 @@ $(CONFS): $(MAININFO) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/ents/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/ents/frudata/Makefile index 03a1424c95..0b25d4ea58 100644 --- a/usr/src/cmd/picl/plugins/sun4u/ents/frudata/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/ents/frudata/Makefile @@ -39,8 +39,6 @@ CONF= libpiclfrudata.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -49,7 +47,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: $(CONF) @@ -59,9 +56,6 @@ install: $(ROOTLIBDIR) $(ROOTCONF) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/ents/frudr/Makefile b/usr/src/cmd/picl/plugins/sun4u/ents/frudr/Makefile index ff0ac687ba..bc16ab475b 100644 --- a/usr/src/cmd/picl/plugins/sun4u/ents/frudr/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/ents/frudr/Makefile @@ -57,8 +57,6 @@ OTHERINFOS += fru_SC_data.info SB-tables.info OTHERINFOS += fru_usb-a-1_data.info fru_usb-a-2_data.info OTHERINFOS += fru_usb-b-1_data.info fru_usb-b-2_data.info -CLEANFILES = $(LINTOUT) $(LINTLIB) - .KEEP_STATE: all: $(CONFS) @@ -87,11 +85,7 @@ $(LIBLINKS): FRC include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: - @echo "nothing to lint" FRC: diff --git a/usr/src/cmd/picl/plugins/sun4u/ents/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/ents/frutree/Makefile index 7a6132b8ef..94f4690106 100644 --- a/usr/src/cmd/picl/plugins/sun4u/ents/frutree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/ents/frutree/Makefile @@ -60,8 +60,6 @@ OTHERINFOS += $(INCDIR2)/fru_usb-a-2_data.info OTHERINFOS += $(INCDIR2)/fru_usb-b-1_data.info OTHERINFOS += $(INCDIR2)/fru_usb-b-2_data.info -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -70,9 +68,8 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -all: $(CONFS) +all: $(CONFS) install: $(ROOTLIBDIR) $(ROOTCONF) @@ -90,9 +87,6 @@ $(CONFS): $(MAININFO) $(OTHERINFOS) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/envmon/Makefile b/usr/src/cmd/picl/plugins/sun4u/envmon/Makefile index 8d1f065dee..ac1a31716e 100644 --- a/usr/src/cmd/picl/plugins/sun4u/envmon/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/envmon/Makefile @@ -44,17 +44,10 @@ LIBS = $(DYNLIB) ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR) -LINTSRC = $(LINTLIB:%.ln=%) -ROOTLINTDIR = $(ROOTLIBDIR) -ROOTLINT = $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES= $(LINTOUT) $(LINTLIB) - CPPFLAGS += -I$(SRC)/uts/sun4u/ -I$(SRC)/uts/common/ CPPFLAGS += -I$(SRC)/cmd/picl/plugins/lib/picld_pluginutil CPPFLAGS += -D_REENTRANT CFLAGS += $(CCVERBOSE) -LINTFLAGS = -uxmn -I.. -I$(SRC)/lib/libpicl -I$(SRC)/lib/libpicltree DYNFLAGS += -R/usr/platform/sun4u/lib/picl/plugins:/usr/lib/picl/plugins LDLIBS += -L$(SRC)/cmd/picl/plugins/lib/picld_pluginutil/$(MACH) LDLIBS += -L$(SRC)/lib/libpicltree/$(MACH) @@ -62,7 +55,7 @@ LDLIBS += -L$(SRC)/cmd/picl/plugins/common/piclevent LDLIBS += -L$(SRC)/cmd/picl/plugins/common/memcfg LDLIBS += -L$(SRC)/cmd/picl/plugins/common/devtree LDLIBS += -lnvpair -ldevinfo -lc -LDLIBS += -lpicltree -lpicld_pluginutil -lpiclevent -lpicldevtree +LDLIBS += -lpicltree -lpicld_pluginutil -lpiclevent -lpicldevtree .KEEP_STATE: @@ -72,7 +65,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg POFILE = piclenvmon_sun4u.po @@ -100,11 +92,7 @@ $(LIBLINKS): FRC include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: - $(LINT.c) $(SRCS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/excalibur/envd/Makefile b/usr/src/cmd/picl/plugins/sun4u/excalibur/envd/Makefile index afe5362311..e441499565 100644 --- a/usr/src/cmd/picl/plugins/sun4u/excalibur/envd/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/excalibur/envd/Makefile @@ -28,7 +28,7 @@ include $(SRC)/Makefile.psm LIBRARY= libpiclenvd.a VERS= .1 -OBJECTS= piclenvd.o piclenvsetup.o +OBJECTS= piclenvd.o piclenvsetup.o # include library definitions include $(SRC)/lib/Makefile.lib @@ -53,12 +53,6 @@ ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 INFOS= envmodel.info -LINTSRC = $(LINTLIB:%.ln=%) -ROOTLINTDIR = $(ROOTLIBDIR) -ROOTLINT = $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES= $(LINTOUT) $(LINTLIB) - CFLAGS += $(CCVERBOSE) DYNFLAGS += -R/usr/platform/\$$PLATFORM/lib/picl/plugins:/usr/platform/sun4u/lib/picl/plugins:/usr/lib/picl/plugins LDLIBS += -L$(SRC)/lib/libpicltree/$(MACH) @@ -79,7 +73,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: $(LIBS) $(LIBLINKS) @@ -109,11 +102,7 @@ $(LIBLINKS): FRC include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: - $(LINT.c) $(SRCS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/excalibur/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/excalibur/frudata/Makefile index 00fda41e12..1f9357e218 100644 --- a/usr/src/cmd/picl/plugins/sun4u/excalibur/frudata/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/excalibur/frudata/Makefile @@ -39,8 +39,6 @@ ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 #INFOS= piclfrutree.info system-board.info -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -49,7 +47,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: $(CONF) @@ -59,9 +56,6 @@ install: $(ROOTLIBDIR) $(ROOTCONF) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/excalibur/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/excalibur/frutree/Makefile index 799e66fc55..0cf1ee4f96 100644 --- a/usr/src/cmd/picl/plugins/sun4u/excalibur/frutree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/excalibur/frutree/Makefile @@ -39,8 +39,6 @@ ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 INFOS= piclfrutree.info system-board.info -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -49,7 +47,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: $(CONF) @@ -63,9 +60,6 @@ $(CONF): $(INFOS) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/frudata/Makefile index 988aa07611..375d7f990e 100644 --- a/usr/src/cmd/picl/plugins/sun4u/frudata/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/frudata/Makefile @@ -43,7 +43,6 @@ LIBS = $(DYNLIB) ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR) -CLEANFILES= $(LINTOUT) $(LINTLIB) CLOBBERFILES += $(LIBLINKS) CSTYLE = cstyle -p -P HDRCHK = hdrchk @@ -69,7 +68,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg POFILE= $(LIBRARY:.a=.po) @@ -108,7 +106,6 @@ include $(SRC)/cmd/picl/plugins/Makefile.targ include $(SRC)/lib/Makefile.targ lint : - $(LINT.c) $(SRCS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/grover/envd/Makefile b/usr/src/cmd/picl/plugins/sun4u/grover/envd/Makefile index 6002d0c4d9..481f1d6d48 100644 --- a/usr/src/cmd/picl/plugins/sun4u/grover/envd/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/grover/envd/Makefile @@ -28,7 +28,7 @@ include $(SRC)/Makefile.psm LIBRARY= libpiclenvd.a VERS= .1 -OBJECTS= piclenvd.o piclenvsetup.o +OBJECTS= piclenvd.o piclenvsetup.o # include library definitions include $(SRC)/lib/Makefile.lib @@ -51,12 +51,6 @@ ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 INFOS= envmodel.info -LINTSRC = $(LINTLIB:%.ln=%) -ROOTLINTDIR = $(ROOTLIBDIR) -ROOTLINT = $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES= $(LINTOUT) $(LINTLIB) - CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(SRC)/cmd/picl/plugins/lib/picld_pluginutil DYNFLAGS += -R/usr/platform/\$$PLATFORM/lib/picl/plugins:/usr/platform/sun4u/lib/picl/plugins:/usr/lib/picl/plugins @@ -77,7 +71,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: $(LIBS) $(LIBLINKS) @@ -105,11 +98,7 @@ $(LIBLINKS): FRC include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint : - $(LINT.c) $(SRCS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/grover/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/grover/frutree/Makefile index c6f93ba6b4..eabffc5363 100644 --- a/usr/src/cmd/picl/plugins/sun4u/grover/frutree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/grover/frutree/Makefile @@ -39,8 +39,6 @@ ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 INFOS= piclfrutree.info system-board.info -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -49,7 +47,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: $(CONF) @@ -63,9 +60,6 @@ $(CONF): $(INFOS) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/grover/memcfg/Makefile b/usr/src/cmd/picl/plugins/sun4u/grover/memcfg/Makefile index a1a6034e34..96f5b718fd 100644 --- a/usr/src/cmd/picl/plugins/sun4u/grover/memcfg/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/grover/memcfg/Makefile @@ -44,12 +44,6 @@ LIBS = $(DYNLIB) ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR) -LINTSRC = $(LINTLIB:%.ln=%) -ROOTLINTDIR = $(ROOTLIBDIR) -ROOTLINT = $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES= $(LINTOUT) $(LINTLIB) - CPPFLAGS += -I$(SRC)/cmd/picl/plugins/common/memcfg CFLAGS += $(CCVERBOSE) LDLIBS += -L$(SRC)/lib/libpicltree/$(MACH) @@ -68,7 +62,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg POFILE= piclmemcfg.po @@ -91,11 +84,7 @@ $(LIBLINKS): FRC include $(SRC)/cmd/picl/plugins/Makefile.targ include $(SRC)/lib/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint : - $(LINT.c) $(SRCS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/lib/fruaccess/Makefile b/usr/src/cmd/picl/plugins/sun4u/lib/fruaccess/Makefile index ab16c18b3f..046f2155ab 100644 --- a/usr/src/cmd/picl/plugins/sun4u/lib/fruaccess/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/lib/fruaccess/Makefile @@ -42,17 +42,14 @@ LIBS= $(DYNLIB) ROOTLIBDIR = $(ROOT_PLATFORM)/lib -CONF = fru_container.conf +CONF = fru_container.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 - -CLEANFILES= $(LINTOUT) $(LINTLIB) CLOBBERFILES += $(LIBLINKS) CSTYLE = cstyle -p -P HDRCHK = hdrchk - CPPFLAGS += -I$(SRC)/lib/libfru/include CPPFLAGS += -I$(SRC)/lib/libfruutils/ CFLAGS += $(CCVERBOSE) -DBIG_ENDIAN @@ -71,7 +68,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg LN = ln -s @@ -107,7 +103,6 @@ include $(SRC)/cmd/picl/plugins/Makefile.targ include $(SRC)/lib/Makefile.targ lint : - $(LINT.c) -m $(SRCS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/littleneck/conf/Makefile b/usr/src/cmd/picl/plugins/sun4u/littleneck/conf/Makefile index a2b3c705ad..b0a8e11fae 100644 --- a/usr/src/cmd/picl/plugins/sun4u/littleneck/conf/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/littleneck/conf/Makefile @@ -20,13 +20,9 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1999-2000 by Sun Microsystems, Inc. # All rights reserved. # -# cmd/picl/plugins/sun4u/littleneck/conf/Makefile -# OBJECTS= @@ -44,16 +40,12 @@ install := FILEMODE = 0444 CONF= platsvcd.conf psvcobj.conf ROOTCONF= $(CONF:%=$(USR_PSM_LIB_DIR)/%) -SRCS= +SRCS= LIBS = $(DYNLIB) -CLEANFILES= $(LINTOUT) $(LINTLIB) - ZDEFS = -LINTFLAGS += - .KEEP_STATE: SUBDIRS= @@ -62,7 +54,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: diff --git a/usr/src/cmd/picl/plugins/sun4u/littleneck/devtree/Makefile b/usr/src/cmd/picl/plugins/sun4u/littleneck/devtree/Makefile index 730e4518f3..dc83c086e4 100644 --- a/usr/src/cmd/picl/plugins/sun4u/littleneck/devtree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/littleneck/devtree/Makefile @@ -39,8 +39,6 @@ install := FILEMODE = 0444 CONF= picldevtree.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -49,9 +47,8 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -all: +all: install: $(ROOTLIBDIR) $(ROOTCONF) diff --git a/usr/src/cmd/picl/plugins/sun4u/littleneck/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/littleneck/frudata/Makefile index b740b5f92f..8e63545e8e 100644 --- a/usr/src/cmd/picl/plugins/sun4u/littleneck/frudata/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/littleneck/frudata/Makefile @@ -38,9 +38,6 @@ CONF= libpiclfrudata.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 - -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -49,7 +46,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: $(CONF) @@ -59,9 +55,6 @@ install: $(ROOTLIBDIR) $(ROOTCONF) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/littleneck/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/littleneck/frutree/Makefile index 5d672d87f4..5826a15c23 100644 --- a/usr/src/cmd/picl/plugins/sun4u/littleneck/frutree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/littleneck/frutree/Makefile @@ -23,8 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY= libpiclfrutree.a VERS= .1 @@ -51,7 +49,6 @@ ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 INFOS= $(CONF:%.conf=%.info) -CLEANFILES= $(LINTOUT) $(LINTLIB) CLOBBERFILES += $(LIBLINKS) CPPFLAGS += -I$(SRC)/lib/libdevfsevent -I$(SRC)/uts/common @@ -64,7 +61,6 @@ LDLIBS += -L$(ROOT)/usr/lib/picl/plugins LDLIBS += -L$(SRC)/lib/libptree/$(MACH) LDLIBS += -lc -lpicltree -lpicldevtree DYNFLAGS += -R/usr/platform/\$$PLATFORM/lib/picl/plugins:/usr/platform/sun4u/lib/picl/plugins:/usr/lib/picl/plugins -LINTFLAGS += -L$(SRC)/lib/libptree/$(MACH) -lpicltree .KEEP_STATE: @@ -77,7 +73,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: $(LIBS) $(LIBLINKS) $(CONF) @@ -99,7 +94,6 @@ include $(SRC)/cmd/picl/plugins/Makefile.targ include $(SRC)/lib/Makefile.targ lint : - $(LINT.c) $(SRCS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/littleneck/psvcplugin/Makefile b/usr/src/cmd/picl/plugins/sun4u/littleneck/psvcplugin/Makefile index c1a0ec767c..e9589f5d17 100644 --- a/usr/src/cmd/picl/plugins/sun4u/littleneck/psvcplugin/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/littleneck/psvcplugin/Makefile @@ -23,8 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY= libpsvcplugin_psr.a VERS= .1 @@ -45,8 +43,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-280R ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR) -CLEANFILES= $(LINTOUT) $(LINTLIB) - CPPFLAGS += -I$(SRC)/uts/sun4u CPPFLAGS += -I$(SRC)/cmd/picl/plugins/sun4u/psvc/psvcobj CPPFLAGS += -D_REENTRANT @@ -59,8 +55,6 @@ DYNFLAGS += -R/usr/platform/\$$PLATFORM/lib/picl/plugins:/usr/platform/sun4u/lib LDLIBS += -lc -lpicltree -lpicl -lpsvcobj -lpsvcplugin -LINTFLAGS += - .KEEP_STATE: SUBDIRS= @@ -72,7 +66,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: $(LIBS) $(LIBLINKS) @@ -94,7 +87,6 @@ include $(SRC)/cmd/picl/plugins/Makefile.targ include $(SRC)/lib/Makefile.targ lint : - $(LINT.c) $(SRCS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/littleneck/psvcpolicy/Makefile b/usr/src/cmd/picl/plugins/sun4u/littleneck/psvcpolicy/Makefile index e867640d53..57dbd4e21d 100644 --- a/usr/src/cmd/picl/plugins/sun4u/littleneck/psvcpolicy/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/littleneck/psvcpolicy/Makefile @@ -23,8 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY= libpsvcpolicy_psr.a VERS= .1 @@ -43,8 +41,6 @@ LIBS = $(DYNLIB) PLATFORM=SUNW,Sun-Fire-280R -CLEANFILES= $(LINTOUT) $(LINTLIB) - CPPFLAGS += -I$(SRC)/uts/sun4u CPPFLAGS += -I$(SRC)/cmd/picl/plugins/sun4u/psvc/psvcobj CPPFLAGS += -D_REENTRANT @@ -57,9 +53,7 @@ LDLIBS += -L$(SRC)/cmd/picl/plugins/sun4u/psvc/psvcplugin DYNFLAGS += -R/usr/platform/\$$PLATFORM/lib/picl/plugins:/usr/platform/sun4u/lib/picl/plugins:/usr/lib/picl/plugins:/usr/platform/sun4u/lib LDLIBS += -lpicltree -lpsvcobj -lpsvcplugin -LDLIBS += -lc -ldevice - -LINTFLAGS += +LDLIBS += -lc -ldevice .KEEP_STATE: @@ -76,7 +70,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: $(LIBS) $(LIBLINKS) @@ -107,7 +100,6 @@ $(USR_PSM_LIB_DIR)/%: % $(USR_PSM_LIB_DIR) $(SYMLINK) ./libpsvcpolicy_psr.so$(VERS) $(USR_PSM_LIB_DIR)/libpsvcpolicy_psr.so lint : - $(LINT.c) $(SRCS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/lw2plus/devtree/Makefile b/usr/src/cmd/picl/plugins/sun4u/lw2plus/devtree/Makefile index b063122f37..eeff700683 100644 --- a/usr/src/cmd/picl/plugins/sun4u/lw2plus/devtree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/lw2plus/devtree/Makefile @@ -38,8 +38,6 @@ CONF= picldevtree.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -48,9 +46,8 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -all: +all: install: $(ROOTLIBDIR) $(ROOTCONF) @@ -58,9 +55,6 @@ install: $(ROOTLIBDIR) $(ROOTCONF) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/lw2plus/fcal_leds/Makefile b/usr/src/cmd/picl/plugins/sun4u/lw2plus/fcal_leds/Makefile index b133401eee..8f4b2cb9be 100644 --- a/usr/src/cmd/picl/plugins/sun4u/lw2plus/fcal_leds/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/lw2plus/fcal_leds/Makefile @@ -47,12 +47,6 @@ CONF= fcal_leds.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 -LINTSRC = $(LINTLIB:%.ln=%) -ROOTLINTDIR = $(ROOTLIBDIR) -ROOTLINT = $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES= $(LINTOUT) $(LINTLIB) - CPPFLAGS += -I$(SRC)/uts/sun4u/ -I$(SRC)/uts/common/ CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS CPPFLAGS += -D_REENTRANT @@ -82,7 +76,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg POFILE = piclfcal_leds_lw2plus.po @@ -110,11 +103,7 @@ $(LIBLINKS): FRC include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: - $(LINT.c) $(SRCS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/lw2plus/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/lw2plus/frudata/Makefile index fb21e574fc..dd60c4c1aa 100644 --- a/usr/src/cmd/picl/plugins/sun4u/lw2plus/frudata/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/lw2plus/frudata/Makefile @@ -39,8 +39,6 @@ CONF= libpiclfrudata.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -49,7 +47,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: $(CONF) @@ -59,9 +56,6 @@ install: $(ROOTLIBDIR) $(ROOTCONF) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/lw2plus/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/lw2plus/frutree/Makefile index edc856be27..9eabe5f501 100644 --- a/usr/src/cmd/picl/plugins/sun4u/lw2plus/frutree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/lw2plus/frutree/Makefile @@ -40,8 +40,6 @@ ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 INFOS= piclfrutree.info system-board.info -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -50,9 +48,8 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -all: $(CONF) +all: $(CONF) install: $(ROOTLIBDIR) $(ROOTCONF) @@ -65,9 +62,6 @@ $(CONF): $(INFOS) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/lw8/fruaccess/Makefile b/usr/src/cmd/picl/plugins/sun4u/lw8/fruaccess/Makefile index 29a68aec18..bd51e39ecf 100644 --- a/usr/src/cmd/picl/plugins/sun4u/lw8/fruaccess/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/lw8/fruaccess/Makefile @@ -47,12 +47,6 @@ LIBS = $(DYNLIB) ROOTLIBDIR = $(ROOT_PLAT_LIBDIR) -LINTSRC = $(LINTLIB:%.ln=%) -ROOTLINTDIR = $(ROOTLIBDIR) -ROOTLINT = $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES= $(LINTOUT) $(LINTLIB) - CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(SRC)/uts/sun4u/lw8 CPPFLAGS += -I$(SRC)/cmd/picl/plugins/sun4u/lib/fruaccess @@ -69,7 +63,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg POFILE= libfruaccess.po @@ -92,11 +85,7 @@ $(LIBLINKS): FRC include $(SRC)/cmd/picl/plugins/Makefile.targ include $(SRC)/lib/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint : - $(LINT.c) $(SRCS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/lw8/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/lw8/frutree/Makefile index 2819caf8bd..8c156163bd 100644 --- a/usr/src/cmd/picl/plugins/sun4u/lw8/frutree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/lw8/frutree/Makefile @@ -50,13 +50,6 @@ LIBS = $(DYNLIB) ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR) -LINTSRC = $(LINTLIB:%.ln=%) -ROOTLINTDIR = $(ROOTLIBDIR) -ROOTLINT = $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES = $(LINTOUT) $(LINTLIB) - - CPPFLAGS += -D_SGFRU CFLAGS += $(CCVERBOSE) DYNFLAGS += -R/usr/platform/\$$PLATFORM/lib/picl/plugins:/usr/platform/sun4u/lib/picl/plugins:/usr/lib/picl/plugins @@ -77,7 +70,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: $(LIBS) $(LIBLINKS) @@ -98,11 +90,7 @@ $(LIBLINKS): FRC include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: - $(LINT.c) $(SRCS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/mpxu/devtree/Makefile b/usr/src/cmd/picl/plugins/sun4u/mpxu/devtree/Makefile index 5353fc53e9..342f09cda5 100644 --- a/usr/src/cmd/picl/plugins/sun4u/mpxu/devtree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/mpxu/devtree/Makefile @@ -38,8 +38,6 @@ CONF= picldevtree.conf picl_asr.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -48,9 +46,8 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -all: +all: install: $(ROOTLIBDIR) $(ROOTCONF) @@ -58,9 +55,6 @@ install: $(ROOTLIBDIR) $(ROOTCONF) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/mpxu/envmon/Makefile b/usr/src/cmd/picl/plugins/sun4u/mpxu/envmon/Makefile index 5f2229f5ff..ce2be3f2d8 100644 --- a/usr/src/cmd/picl/plugins/sun4u/mpxu/envmon/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/mpxu/envmon/Makefile @@ -40,8 +40,6 @@ ROOTCONF= $(CONFS:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 MAININFO= $(CONFS:%.conf=%.info) -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -50,9 +48,8 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -all: $(CONFS) +all: $(CONFS) install: $(ROOTLIBDIR) $(ROOTCONF) @@ -70,9 +67,6 @@ $(CONFS): $(MAININFO) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/mpxu/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/mpxu/frudata/Makefile index ff1bf2e376..48012c187e 100644 --- a/usr/src/cmd/picl/plugins/sun4u/mpxu/frudata/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/mpxu/frudata/Makefile @@ -39,8 +39,6 @@ CONF= libpiclfrudata.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -49,7 +47,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: $(CONF) @@ -59,9 +56,6 @@ install: $(ROOTLIBDIR) $(ROOTCONF) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/mpxu/frudr/Makefile b/usr/src/cmd/picl/plugins/sun4u/mpxu/frudr/Makefile index 7624c2cf55..f5fcac6054 100644 --- a/usr/src/cmd/picl/plugins/sun4u/mpxu/frudr/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/mpxu/frudr/Makefile @@ -69,12 +69,6 @@ OTHERINFOS += fru_HDD2_data.info fru_HDD3_data.info OTHERINFOS += fru_SC_data.info SB-tables.info OTHERINFOS += fru_usb-a-1_data.info fru_usb-a-2_data.info -LINTSRC = $(LINTLIB:%.ln=%) -ROOTLINTDIR = $(ROOTLIBDIR) -ROOTLINT = $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES = $(LINTOUT) $(LINTLIB) - CPPFLAGS += -D_REENTRANT CPPFLAGS += -I$(SRC)/cmd/picl/plugins/lib/picld_pluginutil CPPFLAGS += -I$(SRC)/uts/sun4u/mpxu @@ -108,7 +102,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: $(LIBS) $(LIBLINKS) $(CONFS) @@ -163,11 +156,7 @@ $(USR_PLAT_PLUGINS_LIBLINKS): $(PLAT_PLUGINS_DIRS) $(RM) -r $@ ;\ $(SYMLINK) $(MPXU_DYNLIB_DIR)/$(DYNLIB) $@ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: - $(LINT.c) $(SRCS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/mpxu/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/mpxu/frutree/Makefile index 1574d19255..5f705f0ddd 100644 --- a/usr/src/cmd/picl/plugins/sun4u/mpxu/frutree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/mpxu/frutree/Makefile @@ -53,8 +53,6 @@ OTHERINFOS += $(INCDIR2)/fru_SC_data.info OTHERINFOS += $(INCDIR2)/fru_usb-a-1_data.info OTHERINFOS += $(INCDIR2)/fru_usb-a-2_data.info -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -63,9 +61,8 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -all: $(CONFS) +all: $(CONFS) install: $(ROOTLIBDIR) $(ROOTCONF) @@ -83,9 +80,6 @@ $(CONFS): $(MAININFO) $(OTHERINFOS) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/psvc/psvcobj/Makefile b/usr/src/cmd/picl/plugins/sun4u/psvc/psvcobj/Makefile index 45048a9e68..c7e3de6004 100644 --- a/usr/src/cmd/picl/plugins/sun4u/psvc/psvcobj/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/psvc/psvcobj/Makefile @@ -23,8 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY= libpsvcobj.a VERS= .1 @@ -45,15 +43,11 @@ PLATFORM = sun4u USR_PLAT_PSVCOBJ = $(LIBS:%=$(USR_PSM_LIB_DIR)/%) -CLEANFILES= $(LINTOUT) $(LINTLIB) - CPPFLAGS += -I$(SRC)/uts/sun4u -I. CFLAGS += $(CCVERBOSE) LDLIBS += -L$(SRC)/lib/libdevfsevent -LDLIBS += -lc - -LINTFLAGS += +LDLIBS += -lc # definitions for install_h target HDRS= psvc_objects.h @@ -70,7 +64,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: $(LIBS) $(LIBLINKS) @@ -90,7 +83,7 @@ include $(SRC)/lib/Makefile.targ $(USR_PSM_LIB_DIR): FRC $(INS.dir) - + $(USR_PSM_INCL_DIR)/%: % $(INS.file) @@ -100,7 +93,6 @@ $(USR_PSM_LIB_DIR)/%: % $(USR_PSM_LIB_DIR) $(SYMLINK) ./libpsvcobj.so$(VERS) $(USR_PSM_LIB_DIR)/libpsvcobj.so lint : - $(LINT.c) $(SRCS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/psvc/psvcplugin/Makefile b/usr/src/cmd/picl/plugins/sun4u/psvc/psvcplugin/Makefile index 8beda734ab..0f2e5104ef 100644 --- a/usr/src/cmd/picl/plugins/sun4u/psvc/psvcplugin/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/psvc/psvcplugin/Makefile @@ -58,8 +58,6 @@ USR_PLAT_PLUGINS_DYNLIBS = $(PLAT_PLUGINS_DIRS:%=%/$(DYNLIB)) USR_PLAT_PLUGINS_LIBLINKS = $(PLAT_PLUGINS_DIRS:%=%/$(LIBLINKS)) LNECK_DYNLIB_DIR = ../../../../SUNW,Sun-Fire-280R/lib/picl/plugins -CLEANFILES= $(LINTOUT) $(LINTLIB) - CPPFLAGS += -I$(SRC)/uts/sun4u CPPFLAGS += -I$(SRC)/cmd/picl/plugins/sun4u/psvc/psvcobj @@ -71,7 +69,6 @@ LDLIBS += -R/usr/platform/sun4u/lib LDLIBS += -lc -lpicltree -lpicl -lpsvcobj DYNFLAGS += -Wl,-f/usr/platform/\$$PLATFORM/lib/$(DYNLIBPSR) -LINTFLAGS += .KEEP_STATE: @@ -83,7 +80,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: $(LIBS) $(LIBLINKS) @@ -131,7 +127,6 @@ $(USR_PLAT_PLUGINS_LIBLINKS): $(PLAT_PLUGINS_DIRS) $(SYMLINK) $(LNECK_DYNLIB_DIR)/$(DYNLIB) $@ lint : - $(LINT.c) $(SRCS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/psvc/psvcpolicy/Makefile b/usr/src/cmd/picl/plugins/sun4u/psvc/psvcpolicy/Makefile index c33ecf85d9..45537c0dc7 100644 --- a/usr/src/cmd/picl/plugins/sun4u/psvc/psvcpolicy/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/psvc/psvcpolicy/Makefile @@ -23,10 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# cmd/picl/plugins/sun4u/psvc/psvcpolicy/Makefile -# + LIBRARY= libpsvcpolicy.a VERS= .1 @@ -46,12 +43,10 @@ PLATFORM = sun4u USR_PLAT_PSVCPOL = $(LIBS:%=$(USR_PSM_LIB_DIR)/%) -CLEANFILES= $(LINTOUT) $(LINTLIB) - CPPFLAGS += -I$(SRC)/uts/sun4u CPPFLAGS += -I$(SRC)/cmd/picl/plugins/sun4u/psvc/psvcobj -ZDEFS = +ZDEFS = CFLAGS += $(CCVERBOSE) LDLIBS += $(ZNODEFS) LDLIBS += -L$(SRC)/lib/libpicl/$(MACH) -L$(SRC)/lib/libpicltree/$(MACH) @@ -62,8 +57,6 @@ LDLIBS += -lc -lpsvcobj -lpsvcplugin -lpicltree DYNFLAGS += -Wl,-f/usr/platform/\$$PLATFORM/lib/$(DYNLIBPSR) DYNFLAGS += -R/usr/platform/\$$PLATFORM/lib/picl/plugins:/usr/platform/sun4u/lib/picl/plugins:/usr/lib/picl/plugins:/usr/platform/sun4u/lib -LINTFLAGS += - .KEEP_STATE: SUBDIRS= @@ -74,7 +67,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: $(LIBS) $(LIBLINKS) @@ -102,7 +94,6 @@ $(USR_PSM_LIB_DIR)/%: % $(USR_PSM_LIB_DIR) $(SYMLINK) ./libpsvcpolicy.so$(VERS) $(USR_PSM_LIB_DIR)/libpsvcpolicy.so lint : - $(LINT.c) $(SRCS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/schumacher/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/schumacher/frudata/Makefile index ec90cb5ba8..7c2f6d37b5 100644 --- a/usr/src/cmd/picl/plugins/sun4u/schumacher/frudata/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/schumacher/frudata/Makefile @@ -39,8 +39,6 @@ CONF= libpiclfrudata.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -49,7 +47,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: $(CONF) @@ -59,9 +56,6 @@ install: $(ROOTLIBDIR) $(ROOTCONF) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/seattle/devtree/Makefile b/usr/src/cmd/picl/plugins/sun4u/seattle/devtree/Makefile index 9e294214f3..eb1e8208d5 100644 --- a/usr/src/cmd/picl/plugins/sun4u/seattle/devtree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/seattle/devtree/Makefile @@ -43,8 +43,6 @@ CONF= picldevtree.conf picl_asr.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -53,9 +51,8 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -all: +all: install: $(ROOTLIBDIR) $(ROOTCONF) @@ -63,9 +60,6 @@ install: $(ROOTLIBDIR) $(ROOTCONF) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/seattle/envmon/Makefile b/usr/src/cmd/picl/plugins/sun4u/seattle/envmon/Makefile index dc6765fb41..c0fedc0525 100644 --- a/usr/src/cmd/picl/plugins/sun4u/seattle/envmon/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/seattle/envmon/Makefile @@ -43,8 +43,6 @@ ROOTCONF= $(CONFS:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 MAININFO= $(CONFS:%.conf=%.info) -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -53,9 +51,8 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -all: $(CONFS) +all: $(CONFS) install: $(ROOTLIBDIR) $(ROOTCONF) @@ -73,9 +70,6 @@ $(CONFS): $(MAININFO) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/seattle/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/seattle/frudata/Makefile index b4fc38d7f9..d761eaa06d 100644 --- a/usr/src/cmd/picl/plugins/sun4u/seattle/frudata/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/seattle/frudata/Makefile @@ -43,8 +43,6 @@ CONF= libpiclfrudata.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -53,7 +51,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: $(CONF) @@ -63,9 +60,6 @@ install: $(ROOTLIBDIR) $(ROOTCONF) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/seattle/frudr/Makefile b/usr/src/cmd/picl/plugins/sun4u/seattle/frudr/Makefile index 85e2ca34bc..a47b93b2d3 100644 --- a/usr/src/cmd/picl/plugins/sun4u/seattle/frudr/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/seattle/frudr/Makefile @@ -64,8 +64,6 @@ OTHERINFOS += fru_FT0_data.info fru_FT1_data.info fru_FT2_data.info OTHERINFOS += fru_FT3_data.info fru_FT4_data.info fru_FT5_data.info OTHERINFOS += fru_FT6_data.info -CLEANFILES = $(LINTOUT) $(LINTLIB) - .KEEP_STATE: all: $(CONFS) @@ -89,11 +87,7 @@ $(LIBLINKS): FRC include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: - @echo "nothing to lint" FRC: diff --git a/usr/src/cmd/picl/plugins/sun4u/seattle/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/seattle/frutree/Makefile index 0f5ebf300d..efb9375959 100644 --- a/usr/src/cmd/picl/plugins/sun4u/seattle/frutree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/seattle/frutree/Makefile @@ -64,8 +64,6 @@ OTHERINFOS += $(INCDIR2)/fru_FT4_data.info OTHERINFOS += $(INCDIR2)/fru_FT5_data.info OTHERINFOS += $(INCDIR2)/fru_FT6_data.info -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -74,9 +72,8 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -all: $(CONFS) +all: $(CONFS) install: $(ROOTLIBDIR) $(ROOTCONF) @@ -94,9 +91,6 @@ $(CONFS): $(MAININFO) $(OTHERINFOS) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/sebring/conf/Makefile b/usr/src/cmd/picl/plugins/sun4u/sebring/conf/Makefile index ae962edb0f..8c985f06b8 100644 --- a/usr/src/cmd/picl/plugins/sun4u/sebring/conf/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/sebring/conf/Makefile @@ -38,8 +38,6 @@ CONF= platsvcd.conf psvcobj.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0444 -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -48,7 +46,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: $(CONF) diff --git a/usr/src/cmd/picl/plugins/sun4u/sebring/devtree/Makefile b/usr/src/cmd/picl/plugins/sun4u/sebring/devtree/Makefile index 2e010a0c3f..bdd1beaf57 100644 --- a/usr/src/cmd/picl/plugins/sun4u/sebring/devtree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/sebring/devtree/Makefile @@ -39,8 +39,6 @@ install := FILEMODE = 0444 CONF= picldevtree.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -49,9 +47,8 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -all: +all: install: $(ROOTLIBDIR) $(ROOTCONF) @@ -59,9 +56,6 @@ install: $(ROOTLIBDIR) $(ROOTCONF) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/sebring/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/sebring/frudata/Makefile index 048cdf3ad0..b4892da578 100644 --- a/usr/src/cmd/picl/plugins/sun4u/sebring/frudata/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/sebring/frudata/Makefile @@ -38,9 +38,6 @@ CONF= libpiclfrudata.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 - -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -49,7 +46,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: $(CONF) diff --git a/usr/src/cmd/picl/plugins/sun4u/sebring/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/sebring/frutree/Makefile index abc38b7b30..1d1a624043 100644 --- a/usr/src/cmd/picl/plugins/sun4u/sebring/frutree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/sebring/frutree/Makefile @@ -43,7 +43,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: @@ -62,9 +61,6 @@ $(LIBLINKS): FRC include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/sebring/psvcplugin/Makefile b/usr/src/cmd/picl/plugins/sun4u/sebring/psvcplugin/Makefile index 2a2326f7af..d198d8608f 100644 --- a/usr/src/cmd/picl/plugins/sun4u/sebring/psvcplugin/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/sebring/psvcplugin/Makefile @@ -62,9 +62,6 @@ $(LIBLINKS): FRC include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/sebring/psvcpolicy/Makefile b/usr/src/cmd/picl/plugins/sun4u/sebring/psvcpolicy/Makefile index a06b320262..22bc75546c 100644 --- a/usr/src/cmd/picl/plugins/sun4u/sebring/psvcpolicy/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/sebring/psvcpolicy/Makefile @@ -43,7 +43,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: @@ -62,9 +61,6 @@ $(LIBLINKS): FRC include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/silverstone/conf/Makefile b/usr/src/cmd/picl/plugins/sun4u/silverstone/conf/Makefile index 44416ec824..f7907e24ab 100644 --- a/usr/src/cmd/picl/plugins/sun4u/silverstone/conf/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/silverstone/conf/Makefile @@ -38,8 +38,6 @@ CONF= platsvcd.conf psvcobj.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0444 -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -48,7 +46,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: $(CONF) diff --git a/usr/src/cmd/picl/plugins/sun4u/silverstone/devtree/Makefile b/usr/src/cmd/picl/plugins/sun4u/silverstone/devtree/Makefile index 6698e9cf65..addc33aa58 100644 --- a/usr/src/cmd/picl/plugins/sun4u/silverstone/devtree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/silverstone/devtree/Makefile @@ -39,8 +39,6 @@ install := FILEMODE = 0444 CONF= picldevtree.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -49,9 +47,8 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -all: +all: install: $(ROOTLIBDIR) $(ROOTCONF) diff --git a/usr/src/cmd/picl/plugins/sun4u/silverstone/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/silverstone/frudata/Makefile index d2d6771e79..2f508667c3 100644 --- a/usr/src/cmd/picl/plugins/sun4u/silverstone/frudata/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/silverstone/frudata/Makefile @@ -38,9 +38,6 @@ CONF= libpiclfrudata.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 - -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -49,7 +46,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: $(CONF) @@ -59,9 +55,6 @@ install: $(ROOTLIBDIR) $(ROOTCONF) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/silverstone/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/silverstone/frutree/Makefile index 68e6811ce5..c1a262563d 100644 --- a/usr/src/cmd/picl/plugins/sun4u/silverstone/frutree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/silverstone/frutree/Makefile @@ -43,7 +43,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: @@ -62,9 +61,6 @@ $(LIBLINKS): FRC include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/silverstone/psvcplugin/Makefile b/usr/src/cmd/picl/plugins/sun4u/silverstone/psvcplugin/Makefile index 51d467dff5..47bff2fdfe 100644 --- a/usr/src/cmd/picl/plugins/sun4u/silverstone/psvcplugin/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/silverstone/psvcplugin/Makefile @@ -43,7 +43,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: @@ -62,9 +61,6 @@ $(LIBLINKS): FRC include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/silverstone/psvcpolicy/Makefile b/usr/src/cmd/picl/plugins/sun4u/silverstone/psvcpolicy/Makefile index c33d9c3490..224ad751e4 100644 --- a/usr/src/cmd/picl/plugins/sun4u/silverstone/psvcpolicy/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/silverstone/psvcpolicy/Makefile @@ -43,7 +43,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: @@ -62,9 +61,6 @@ $(LIBLINKS): FRC include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/taco/envd/Makefile b/usr/src/cmd/picl/plugins/sun4u/taco/envd/Makefile index 1918094ff2..ce349939a9 100644 --- a/usr/src/cmd/picl/plugins/sun4u/taco/envd/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/taco/envd/Makefile @@ -29,7 +29,7 @@ include $(SRC)/Makefile.psm LIBRARY= libpiclenvd.a VERS= .1 -OBJECTS= piclenvd.o piclenvsetup.o +OBJECTS= piclenvd.o piclenvsetup.o # include library definitions include $(SRC)/lib/Makefile.lib @@ -54,11 +54,7 @@ ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 INFOS= envmodel.info -LINTSRC = $(LINTLIB:%.ln=%) -ROOTLINTDIR = $(ROOTLIBDIR) -ROOTLINT = $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES= $(LINTOUT) $(LINTLIB) +CLEANFILES= $(LINTOUT) CFLAGS += $(CCVERBOSE) DYNFLAGS += -R/usr/platform/\$$PLATFORM/lib/picl/plugins:/usr/platform/sun4u/lib/picl/plugins:/usr/lib/picl/plugins @@ -80,7 +76,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: $(LIBS) $(LIBLINKS) $(CONF) @@ -110,11 +105,7 @@ $(LIBLINKS): FRC include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: - $(LINT.c) $(SRCS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/taco/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/taco/frudata/Makefile index f4c3b3b419..ffa5de9635 100644 --- a/usr/src/cmd/picl/plugins/sun4u/taco/frudata/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/taco/frudata/Makefile @@ -38,8 +38,6 @@ CONF= libpiclfrudata.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -48,7 +46,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: $(CONF) @@ -58,9 +55,6 @@ install: $(ROOTLIBDIR) $(ROOTCONF) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/taco/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/taco/frutree/Makefile index e011f2af22..ddb83336e2 100644 --- a/usr/src/cmd/picl/plugins/sun4u/taco/frutree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/taco/frutree/Makefile @@ -39,8 +39,6 @@ ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 INFOS= piclfrutree.info system-board.info -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -49,9 +47,8 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -all: $(CONF) +all: $(CONF) install: $(ROOTLIBDIR) $(ROOTCONF) @@ -63,9 +60,6 @@ $(CONF): $(INFOS) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4v/lib/snmp/Makefile b/usr/src/cmd/picl/plugins/sun4v/lib/snmp/Makefile index 8b8703a66a..8c180b0473 100644 --- a/usr/src/cmd/picl/plugins/sun4v/lib/snmp/Makefile +++ b/usr/src/cmd/picl/plugins/sun4v/lib/snmp/Makefile @@ -26,10 +26,6 @@ # Copyright 2019 Peter Tribble. # -# -# cmd/picl/plugins/sun4v/lib/snmp/Makefile -# - LIBRARY= libpiclsnmp.a VERS= .1 OBJECTS= snmplib.o pdu.o asn1.o @@ -48,7 +44,6 @@ LIBS= $(DYNLIB) ROOTLIBDIR = $(ROOT_PLATFORM)/lib -CLEANFILES= $(LINTOUT) $(LINTLIB) CLOBBERFILES += $(LIBLINKS) CPPFLAGS += -I. -I../../include -I$(SRC)/uts/sun4v @@ -73,7 +68,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: $(DYNLIB) $(LIBLINKS) @@ -87,7 +81,6 @@ include $(SRC)/cmd/picl/plugins/Makefile.targ include $(SRC)/lib/Makefile.targ lint : - $(LINT.c) -m $(SRCS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4v/mdesc/Makefile b/usr/src/cmd/picl/plugins/sun4v/mdesc/Makefile index e2adc58af5..fd05cab88f 100644 --- a/usr/src/cmd/picl/plugins/sun4v/mdesc/Makefile +++ b/usr/src/cmd/picl/plugins/sun4v/mdesc/Makefile @@ -23,10 +23,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# cmd/picl/plugins/sun4v/mdesc/Makefile -# + LIBRARY= libmdescplugin.a VERS= .1 @@ -48,19 +45,6 @@ include $(SRC)/cmd/picl/plugins/Makefile.com SRCS= $(OBJECTS:%.o=%.c) -LINT_SRC= ./mdescplugin.c ./init.c ./dr.c \ - ./cpu_prop_update.c ./disk_discovery.c \ - $(SRC)/common/mdesc/mdesc_findname.c \ - $(SRC)/common/mdesc/mdesc_findnodeprop.c \ - $(SRC)/common/mdesc/mdesc_fini.c \ - $(SRC)/common/mdesc/mdesc_getpropdata.c \ - $(SRC)/common/mdesc/mdesc_getpropstr.c \ - $(SRC)/common/mdesc/mdesc_getpropval.c \ - $(SRC)/common/mdesc/mdesc_init_intern.c \ - $(SRC)/common/mdesc/mdesc_nodecount.c \ - $(SRC)/common/mdesc/mdesc_rootnode.c \ - $(SRC)/common/mdesc/mdesc_scandag.c - $(OBJS_DIR)/%.o: $(SRC)/common/mdesc/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) @@ -74,8 +58,6 @@ DYNFLAGS_COM = /usr/lib/picl/plugins ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR) -CLEANFILES= $(LINTOUT) $(LINTLIB) - CPPFLAGS += -I$(SRC)/common/mdesc CPPFLAGS += -I$(SRC)/uts/common/sys CPPFLAGS += -D_REENTRANT @@ -87,8 +69,6 @@ DYNFLAGS += -R$(DYNFLAGS_COM) LDLIBS += -lc -lpicltree -ldevinfo -lpicldevtree -lcfgadm -lnvpair -LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN -v - .KEEP_STATE: all: $(LIBS) $(LIBLINKS) @@ -103,6 +83,5 @@ include $(SRC)/cmd/picl/plugins/Makefile.targ include $(SRC)/lib/Makefile.targ lint : - $(LINT.c) $(LINT_SRC) FRC: diff --git a/usr/src/cmd/picl/plugins/sun4v/piclsbl/Makefile b/usr/src/cmd/picl/plugins/sun4v/piclsbl/Makefile index 92077496f7..e6b0cf842f 100644 --- a/usr/src/cmd/picl/plugins/sun4v/piclsbl/Makefile +++ b/usr/src/cmd/picl/plugins/sun4v/piclsbl/Makefile @@ -22,9 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# cmd/picl/plugins/sun4v/piclsbl/Makefile LIBRARY= libpiclsbl.a VERS= .1 @@ -39,16 +36,10 @@ include $(SRC)/cmd/picl/plugins/Makefile.com SRCS= $(OBJECTS:%.o=%.c) -LINT_SRC= $(LINTLIB:%.ln=%) - $(OBJS_DIR)/%.o: $(SRC)/sun4v/piclsbl/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) -$(LINTS_DIR)/%.ln: $(SRC)/sun4v/piclsbl/%.c - @($(LHEAD) $(LINT.c) $< $(LTAIL)) - - LIBS = $(DYNLIB) ROOT_PLATFORM = $(USR_PLAT_DIR)/sun4v @@ -57,8 +48,6 @@ DYNFLAGS_SUN4V = /usr/platform/sun4v/lib/picl/plugins DYNFLAGS_COM = /usr/lib/picl/plugins ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR) -CLEANFILES= $(LINTOUT) $(LINTLIB) - CPPFLAGS += -I$(SRC)/sun4v/piclsbl CPPFLAGS += -I$(SRC)/uts/common/sys CPPFLAGS += -I$(SRC)/lib/libpcp/common @@ -71,8 +60,6 @@ DYNFLAGS += -R$(DYNFLAGS_COM) LDLIBS += -lc -lpicltree -lumem -lnvpair -LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN -v - .KEEP_STATE: all: $(LIBS) $(LIBLINKS) @@ -90,6 +77,5 @@ include $(SRC)/cmd/picl/plugins/Makefile.targ include $(SRC)/lib/Makefile.targ lint : - $(LINT.c) $(SRCS) FRC: diff --git a/usr/src/cmd/picl/plugins/sun4v/pri/Makefile b/usr/src/cmd/picl/plugins/sun4v/pri/Makefile index afec140c72..6b67dec843 100644 --- a/usr/src/cmd/picl/plugins/sun4v/pri/Makefile +++ b/usr/src/cmd/picl/plugins/sun4v/pri/Makefile @@ -23,10 +23,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# cmd/picl/plugins/sun4v/pri/Makefile -# + LIBRARY= libpriplugin.a VERS= .1 @@ -48,19 +45,6 @@ include $(SRC)/cmd/picl/plugins/Makefile.com SRCS= $(OBJECTS:%.o=%.c) -LINT_SRC= ./priplugin.c ./init.c \ - ./mem_prop_update.c io_dev_label.c \ - $(SRC)/common/mdesc/mdesc_findname.c \ - $(SRC)/common/mdesc/mdesc_findnodeprop.c \ - $(SRC)/common/mdesc/mdesc_fini.c \ - $(SRC)/common/mdesc/mdesc_getpropdata.c \ - $(SRC)/common/mdesc/mdesc_getpropstr.c \ - $(SRC)/common/mdesc/mdesc_getpropval.c \ - $(SRC)/common/mdesc/mdesc_init_intern.c \ - $(SRC)/common/mdesc/mdesc_nodecount.c \ - $(SRC)/common/mdesc/mdesc_rootnode.c \ - $(SRC)/common/mdesc/mdesc_scandag.c - $(OBJS_DIR)/%.o: $(SRC)/common/mdesc/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) @@ -74,8 +58,6 @@ DYNFLAGS_COM = /usr/lib/picl/plugins ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR) -CLEANFILES = $(LINTOUT) $(LINTLIB) - CPPFLAGS += -I$(SRC)/common/mdesc CPPFLAGS += -I$(SRC)/uts/common/sys CPPFLAGS += -I$(SRC)/lib/libpri/common @@ -99,8 +81,6 @@ $(SPARC_BLD)LDLIBS += -R$(DYNFLAGS_PLAT) \ -R$(DYNFLAGS_SUN4V) LDLIBS += -R$(DYNFLAGS_COM) -LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN -v - .KEEP_STATE: all: $(LIBS) $(LIBLINKS) @@ -115,6 +95,5 @@ include $(SRC)/cmd/picl/plugins/Makefile.targ include $(SRC)/lib/Makefile.targ lint : - $(LINT.c) $(LINT_SRC) FRC: diff --git a/usr/src/cmd/picl/plugins/sun4v/snmp/Makefile b/usr/src/cmd/picl/plugins/sun4v/snmp/Makefile index 66f24fd4a8..83a0c8728e 100644 --- a/usr/src/cmd/picl/plugins/sun4v/snmp/Makefile +++ b/usr/src/cmd/picl/plugins/sun4v/snmp/Makefile @@ -23,10 +23,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# cmd/picl/plugins/sun4v/snmp/Makefile -# LIBRARY= libsnmpplugin.a VERS= .1 @@ -45,8 +41,6 @@ LIBS = $(DYNLIB) ROOT_PLATFORM = $(USR_PLAT_DIR)/sun4v ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR) -CLEANFILES= $(LINTOUT) $(LINTLIB) - CPPFLAGS += -I. -I../include -I$(SRC)/uts/common/sys CPPFLAGS += -D_REENTRANT @@ -92,6 +86,5 @@ include $(SRC)/cmd/picl/plugins/Makefile.targ include $(SRC)/lib/Makefile.targ lint : - $(LINT.c) $(SRCS) FRC: diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile b/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile index 6fb2c832a5..67be7d0b27 100644 --- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile +++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile @@ -92,7 +92,7 @@ SMATCH=off LDLIBS += -lprint -lnsl -lsocket -lc -CLEANFILES= *.class $(LINTLIB) $(LINTOUT) +CLEANFILES= *.class CLOBBERFILES= $(JNIHDR_FILES) $(LIBLINKS) all: $(CLASSFILES) $(JNIHDR_FILES) $(DYNLIB) @@ -114,7 +114,7 @@ NS: NS.c $(CC) NS.c $(CCGDEBUG) $(ILDOFF) -o NS -DMAIN=1 $(ENVLDLIBS1) $(ENVLIBS2) \ -lprint -lnsl -lsocket -lint: $(JNIHDR_FILES) lintcheck +lint: $(JNIHDR_FILES) cstyle: cstyle $(SRCS) diff --git a/usr/src/cmd/sendmail/libmilter/Makefile.com b/usr/src/cmd/sendmail/libmilter/Makefile.com index d59a896251..8cb4bc2a62 100644 --- a/usr/src/cmd/sendmail/libmilter/Makefile.com +++ b/usr/src/cmd/sendmail/libmilter/Makefile.com @@ -50,17 +50,16 @@ CPPFLAGS= $(INCPATH) $(ENVDEF) $(CPPFLAGS.sm) CERRWARN += -_gcc=-Wno-type-limits -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) LDLIBS += -lc -lsocket -lnsl -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) .KEEP_STATE: all: $(LIBS) -install: all .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all .WAIT $(ROOTLIBS) $(ROOTLINKS) -lint: lintcheck +lint: include $(SRC)/lib/Makefile.targ diff --git a/usr/src/cmd/sendmail/libmilter/i386/Makefile b/usr/src/cmd/sendmail/libmilter/i386/Makefile index e86ae6a9f7..7144fbdd64 100644 --- a/usr/src/cmd/sendmail/libmilter/i386/Makefile +++ b/usr/src/cmd/sendmail/libmilter/i386/Makefile @@ -22,8 +22,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/cmd/sendmail/libmilter/sparc/Makefile b/usr/src/cmd/sendmail/libmilter/sparc/Makefile index e86ae6a9f7..7144fbdd64 100644 --- a/usr/src/cmd/sendmail/libmilter/sparc/Makefile +++ b/usr/src/cmd/sendmail/libmilter/sparc/Makefile @@ -22,8 +22,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/cmd/sgs/Makefile.targ b/usr/src/cmd/sgs/Makefile.targ index b8d85bef18..37064baa75 100644 --- a/usr/src/cmd/sgs/Makefile.targ +++ b/usr/src/cmd/sgs/Makefile.targ @@ -39,16 +39,4 @@ $(VAR_SGSBIN)/%: % $(VAR_SGSBIN64)/%: % $(INS.file) -$(ROOTFS_LIBDIR)/$(LIBLINKS): $(ROOTFS_LIBDIR)/$(LIBLINKS)$(VERS) - $(INS.liblink) - -$(ROOTFS_LIBDIR64)/$(LIBLINKS): $(ROOTFS_LIBDIR64)/$(LIBLINKS)$(VERS) - $(INS.liblink64) - -$(ROOTFS_LIBDIR)/$(LIBLINKSCCC): $(ROOTFS_LIBDIR)/$(LIBLINKSCCC)$(VERS) - $(INS.liblinkccc) - -$(ROOTFS_LIBDIR64)/$(LIBLINKSCCC): $(ROOTFS_LIBDIR64)/$(LIBLINKSCCC)$(VERS) - $(INS.liblinkccc64) - FRC: diff --git a/usr/src/cmd/sgs/Makefile.var b/usr/src/cmd/sgs/Makefile.var index c2984dc553..fa8f897c10 100644 --- a/usr/src/cmd/sgs/Makefile.var +++ b/usr/src/cmd/sgs/Makefile.var @@ -132,11 +132,6 @@ VAR_LIBLD_64_ROOTFS_LIBDIR= $(ROOT)/lib/$(MACH64) VAR_TOOLS_CPPFLAGS= $(VAR_AVLINCDIR) # -# liblddbg -# -VAR_LIBLDDBG_64_ROOTFS_LIBDIR= $(ROOT)/lib/$(MACH64) - -# # rtld # VAR_RTLD_CPICLIB= -L ../../../../lib/libc/$(MACH) diff --git a/usr/src/cmd/sgs/lex/Makefile.com b/usr/src/cmd/sgs/lex/Makefile.com index 9a24765ceb..c8100b1e3f 100644 --- a/usr/src/cmd/sgs/lex/Makefile.com +++ b/usr/src/cmd/sgs/lex/Makefile.com @@ -44,6 +44,13 @@ FORMS= nceucform ncform nrform include ../../../../lib/Makefile.lib +COMPATLINKS= usr/ccs/lib/libl.so +COMPATLINKS64= usr/ccs/lib/$(MACH64)/libl.so + +$(ROOT)/usr/ccs/lib/libl.so := COMPATLINKTARGET=../../lib/libl.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libl.so:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/libl.so.1 + SRCDIR = ../common CSTD= $(CSTD_GNU99) diff --git a/usr/src/cmd/sgs/lex/Makefile.targ b/usr/src/cmd/sgs/lex/Makefile.targ index 7755dd804b..de50a8ae21 100644 --- a/usr/src/cmd/sgs/lex/Makefile.targ +++ b/usr/src/cmd/sgs/lex/Makefile.targ @@ -79,5 +79,8 @@ objs/%.o pics/%.o: ../common/%.c $(DYNLINKLIBDIR)/%: %$(VERS) $(INS.liblink) +$(ROOTCOMPATLINKS) $(ROOTCOMPATLINKS64): + $(RM) $@; $(SYMLINK) $(COMPATLINKTARGET) $@ + clean: $(RM) $(POBJS) $(OBJS) $(PICS) $(CLEANFILES) diff --git a/usr/src/cmd/sgs/lex/amd64/Makefile b/usr/src/cmd/sgs/lex/amd64/Makefile index 88c06842ea..a70552a0ba 100644 --- a/usr/src/cmd/sgs/lex/amd64/Makefile +++ b/usr/src/cmd/sgs/lex/amd64/Makefile @@ -23,8 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # This Makefile is only to produce 64-bit lex shared library libl.so.1 # and not for building 64-bit lex itself. @@ -36,7 +34,7 @@ include ../../../../lib/Makefile.lib.64 all_lib: $(LIBS) -install_lib: all_lib $(ROOTLIBS64) $(ROOTLINKS64) +install_lib: all_lib $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/lex/i386/Makefile b/usr/src/cmd/sgs/lex/i386/Makefile index 7c4ed059ec..a4627ee882 100644 --- a/usr/src/cmd/sgs/lex/i386/Makefile +++ b/usr/src/cmd/sgs/lex/i386/Makefile @@ -38,7 +38,7 @@ all_lib: $(LIBS) install: all $(ROOTPROG) $(ROOTFORMS) $(ROOTCCSBINLINK) -install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) +install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTCOMPATLINKS) include ../Makefile.targ include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/lex/sparc/Makefile b/usr/src/cmd/sgs/lex/sparc/Makefile index ca3f074cc4..e5a9194df2 100644 --- a/usr/src/cmd/sgs/lex/sparc/Makefile +++ b/usr/src/cmd/sgs/lex/sparc/Makefile @@ -38,7 +38,7 @@ all_lib: $(LIBS) install: all $(ROOTPROG) $(ROOTFORMS) $(ROOTCCSBINLINK) -install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) +install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTCOMPATLINKS) include ../Makefile.targ include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/lex/sparcv9/Makefile b/usr/src/cmd/sgs/lex/sparcv9/Makefile index 5edc1ac22b..c6279e175c 100644 --- a/usr/src/cmd/sgs/lex/sparcv9/Makefile +++ b/usr/src/cmd/sgs/lex/sparcv9/Makefile @@ -20,13 +20,9 @@ # CDDL HEADER END # # -# ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1997 by Sun Microsystems, Inc. # All rights reserved. # -# cmd/sgs/lex/sparcv9/Makefile -# # This Makefile is only to produce 64-bit lex shared library libl.so.1 # and not for building 64-bit lex itself. @@ -38,7 +34,7 @@ include ../../../../lib/Makefile.lib.64 all_lib: $(LIBS) -install_lib: all_lib $(ROOTLIBS64) $(ROOTLINKS64) +install_lib: all_lib $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/libdl/Makefile.com b/usr/src/cmd/sgs/libdl/Makefile.com index edc149f8ec..507cb277c0 100644 --- a/usr/src/cmd/sgs/libdl/Makefile.com +++ b/usr/src/cmd/sgs/libdl/Makefile.com @@ -27,3 +27,6 @@ LIBRARY = libdl.a VERS = .1 include $(SRC)/lib/Makefile.rootfs + +COMPATLINKS += etc/lib/libdl.so.1 +$(ROOT)/etc/lib/libdl.so.1 := COMPATLINKTARGET=../../lib/libdl.so.1 diff --git a/usr/src/cmd/sgs/libdl/amd64/Makefile b/usr/src/cmd/sgs/libdl/amd64/Makefile index 90e6d5bf3a..7aa63ffa3c 100644 --- a/usr/src/cmd/sgs/libdl/amd64/Makefile +++ b/usr/src/cmd/sgs/libdl/amd64/Makefile @@ -29,6 +29,7 @@ include $(SRC)/lib/Makefile.lib.64 DYNFLAGS += -F /usr/lib/$(MACH64)/ld.so.1 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/cmd/sgs/libdl/i386/Makefile b/usr/src/cmd/sgs/libdl/i386/Makefile index ea152db4b2..3ca48e64ff 100644 --- a/usr/src/cmd/sgs/libdl/i386/Makefile +++ b/usr/src/cmd/sgs/libdl/i386/Makefile @@ -30,6 +30,6 @@ include ../Makefile.com DYNFLAGS += -F /usr/lib/ld.so.1 -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/cmd/sgs/libdl/sparc/Makefile b/usr/src/cmd/sgs/libdl/sparc/Makefile index ea152db4b2..3ca48e64ff 100644 --- a/usr/src/cmd/sgs/libdl/sparc/Makefile +++ b/usr/src/cmd/sgs/libdl/sparc/Makefile @@ -30,6 +30,6 @@ include ../Makefile.com DYNFLAGS += -F /usr/lib/ld.so.1 -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/cmd/sgs/libdl/sparcv9/Makefile b/usr/src/cmd/sgs/libdl/sparcv9/Makefile index 90e6d5bf3a..7aa63ffa3c 100644 --- a/usr/src/cmd/sgs/libdl/sparcv9/Makefile +++ b/usr/src/cmd/sgs/libdl/sparcv9/Makefile @@ -29,6 +29,7 @@ include $(SRC)/lib/Makefile.lib.64 DYNFLAGS += -F /usr/lib/$(MACH64)/ld.so.1 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/cmd/sgs/libelf/Makefile.com b/usr/src/cmd/sgs/libelf/Makefile.com index 7791333dc6..2ff06a2508 100644 --- a/usr/src/cmd/sgs/libelf/Makefile.com +++ b/usr/src/cmd/sgs/libelf/Makefile.com @@ -51,6 +51,7 @@ MISCOBJS64= nlist.o OBJECTS= $(BLTOBJS) $(MACHOBJS) $(COMOBJS) $(CLASSOBJS) $(MISCOBJS) include $(SRC)/lib/Makefile.lib +include $(SRC)/lib/Makefile.rootfs SRCDIR= $(SRC)/cmd/sgs/libelf @@ -92,13 +93,6 @@ BLTSRCS= $(BLTOBJS:%.o=%.c) LIBSRCS= $(COMOBJS:%.o=$(SRCDIR)/common/%.c) $(MISCOBJS:%.o=$(SRCDIR)/misc/%.c) \ $(MACHOBJS:%.o=%.c) $(BLTSRCS) -ROOTFS_DYNLIB= $(DYNLIB:%=$(ROOTFS_LIBDIR)/%) - -ROOTFS_DYNLIB64= $(DYNLIB:%=$(ROOTFS_LIBDIR64)/%) - -$(ROOTFS_DYNLIB) := FILEMODE= 755 -$(ROOTFS_DYNLIB64) := FILEMODE= 755 - LIBS = $(DYNLIB) CLEANFILES += $(BLTSRCS) $(BLTFILES) diff --git a/usr/src/cmd/sgs/libelf/amd64/Makefile b/usr/src/cmd/sgs/libelf/amd64/Makefile index 94251398d8..c27090b00c 100644 --- a/usr/src/cmd/sgs/libelf/amd64/Makefile +++ b/usr/src/cmd/sgs/libelf/amd64/Makefile @@ -34,6 +34,6 @@ MISCOBJS= $(MISCOBJS64) .KEEP_STATE: -install: all .WAIT $(ROOTFS_LIBS64) $(ROOTFS_LINKS64) +install: all .WAIT $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ.64 diff --git a/usr/src/cmd/sgs/libelf/i386/Makefile b/usr/src/cmd/sgs/libelf/i386/Makefile index a14fcadcdb..53cb83ad4d 100644 --- a/usr/src/cmd/sgs/libelf/i386/Makefile +++ b/usr/src/cmd/sgs/libelf/i386/Makefile @@ -29,7 +29,7 @@ SGSMSGTARG += $(SGSMSG32) .KEEP_STATE: -install: all .WAIT $(ROOTFS_LIBS) $(ROOTFS_LINKS) \ - .WAIT $(ROOTDEMODIRS) .WAIT $(ROOTDEMOFILES) +install: all .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + .WAIT $(ROOTDEMODIRS) .WAIT $(ROOTDEMOFILES) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/libelf/sparc/Makefile b/usr/src/cmd/sgs/libelf/sparc/Makefile index f5e39a6940..9779e5fb83 100644 --- a/usr/src/cmd/sgs/libelf/sparc/Makefile +++ b/usr/src/cmd/sgs/libelf/sparc/Makefile @@ -29,7 +29,7 @@ SGSMSGTARG += $(SGSMSG32) .KEEP_STATE: -install: all .WAIT $(ROOTFS_LIBS) $(ROOTFS_LINKS) \ - .WAIT $(ROOTDEMODIRS) .WAIT $(ROOTDEMOFILES) +install: all .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + .WAIT $(ROOTDEMODIRS) .WAIT $(ROOTDEMOFILES) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/libelf/sparcv9/Makefile b/usr/src/cmd/sgs/libelf/sparcv9/Makefile index 94251398d8..c27090b00c 100644 --- a/usr/src/cmd/sgs/libelf/sparcv9/Makefile +++ b/usr/src/cmd/sgs/libelf/sparcv9/Makefile @@ -34,6 +34,6 @@ MISCOBJS= $(MISCOBJS64) .KEEP_STATE: -install: all .WAIT $(ROOTFS_LIBS64) $(ROOTFS_LINKS64) +install: all .WAIT $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ.64 diff --git a/usr/src/cmd/sgs/liblddbg/Makefile.com b/usr/src/cmd/sgs/liblddbg/Makefile.com index c4b9f9d6db..16e864f0ec 100644 --- a/usr/src/cmd/sgs/liblddbg/Makefile.com +++ b/usr/src/cmd/sgs/liblddbg/Makefile.com @@ -53,8 +53,14 @@ OBJECTS = $(BLTOBJ) $(COMOBJS) $(COMOBJS32) $(COMOBJS64) $(SGSCOMMONOBJ) include $(SRC)/lib/Makefile.lib +include $(SRC)/lib/Makefile.rootfs include $(SRC)/cmd/sgs/Makefile.com +LIBS = $(DYNLIB) + +COMPATLINKS = usr/lib/$(DYNLIB) +COMPATLINKS64 = usr/lib/$(MACH64)/$(DYNLIB) + SRCDIR = $(SGSHOME)/liblddbg MAPFILEDIR = $(SRCDIR)/common @@ -85,4 +91,3 @@ LIBSRCS = $(COMOBJS:%.o=$(SRCDIR)/common/%.c) \ CLEANFILES += $(BLTFILES) CLOBBERFILES += $(DYNLIB) $(LIBLINKS) -ROOTFS_DYNLIB = $(DYNLIB:%=$(ROOTFS_LIBDIR)/%) diff --git a/usr/src/cmd/sgs/liblddbg/amd64/Makefile b/usr/src/cmd/sgs/liblddbg/amd64/Makefile index 1d0ab295e0..9783a0d400 100644 --- a/usr/src/cmd/sgs/liblddbg/amd64/Makefile +++ b/usr/src/cmd/sgs/liblddbg/amd64/Makefile @@ -26,11 +26,6 @@ include ../Makefile.com -ROOTFS_LIBDIR64 = \ - $(VAR_LIBLDDBG_64_ROOTFS_LIBDIR) -ROOTFS_DYNLIB64 = \ - $(DYNLIB:%=$(ROOTFS_LIBDIR64)/%) - CONVLIBDIR = $(CONVLIBDIR64) .KEEP_STATE: @@ -40,7 +35,7 @@ $(ROOTFS_DYNLIB64) := FILEMODE= 755 all: $(DYNLIB) $(LIBLINKS) install \ -package: all $(ROOTFS_DYNLIB64) +package: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ include ../../Makefile.sub.64 diff --git a/usr/src/cmd/sgs/liblddbg/i386/Makefile b/usr/src/cmd/sgs/liblddbg/i386/Makefile index d27ae308e3..4345c2ca64 100644 --- a/usr/src/cmd/sgs/liblddbg/i386/Makefile +++ b/usr/src/cmd/sgs/liblddbg/i386/Makefile @@ -23,8 +23,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -33,6 +31,6 @@ include ../Makefile.com all: $(DYNLIB) $(LIBLINKS) install \ -package: all $(ROOTFS_DYNLIB) +package: all $(ROOTLIBS) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/liblddbg/sparc/Makefile b/usr/src/cmd/sgs/liblddbg/sparc/Makefile index d27ae308e3..d11c3f43fb 100644 --- a/usr/src/cmd/sgs/liblddbg/sparc/Makefile +++ b/usr/src/cmd/sgs/liblddbg/sparc/Makefile @@ -23,8 +23,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -33,6 +31,6 @@ include ../Makefile.com all: $(DYNLIB) $(LIBLINKS) install \ -package: all $(ROOTFS_DYNLIB) +package: all $(ROOTLIBS) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/liblddbg/sparcv9/Makefile b/usr/src/cmd/sgs/liblddbg/sparcv9/Makefile index b57167b378..8bc19f5ce4 100644 --- a/usr/src/cmd/sgs/liblddbg/sparcv9/Makefile +++ b/usr/src/cmd/sgs/liblddbg/sparcv9/Makefile @@ -26,21 +26,14 @@ include ../Makefile.com -ROOTFS_LIBDIR64 = \ - $(VAR_LIBLDDBG_64_ROOTFS_LIBDIR) -ROOTFS_DYNLIB64 = \ - $(DYNLIB:%=$(ROOTFS_LIBDIR64)/%) - CONVLIBDIR = $(CONVLIBDIR64) .KEEP_STATE: -$(ROOTFS_DYNLIB64) := FILEMODE= 755 - all: $(DYNLIB) $(LIBLINKS) install \ -package: all $(ROOTFS_DYNLIB64) +package: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ include ../../Makefile.sub.64 diff --git a/usr/src/cmd/sgs/librtld/Makefile.com b/usr/src/cmd/sgs/librtld/Makefile.com index e15980f956..54ed7d31c3 100644 --- a/usr/src/cmd/sgs/librtld/Makefile.com +++ b/usr/src/cmd/sgs/librtld/Makefile.com @@ -38,8 +38,14 @@ OBJECTS= $(BLTOBJ) $(MACHOBJS) $(COMOBJS) include $(SRC)/lib/Makefile.lib +include $(SRC)/lib/Makefile.rootfs include $(SRC)/cmd/sgs/Makefile.com +LIBS = $(DYNLIB) + +COMPATLINKS = usr/lib/$(DYNLIB) +COMPATLINKS64 = usr/lib/$(MACH64)/$(DYNLIB) + SRCDIR = ../common CPPFLAGS += -I../../rtld/common -I$(SRC)/lib/libc/inc \ -I$(SRC)/uts/common/krtld -I$(SRC)/common/sgsrtcid \ @@ -68,5 +74,3 @@ MSGSRCS= $(MACHOBJS:%.o=%.c) $(COMOBJS:%.o=../common/%.c) \ CLEANFILES += $(BLTFILES) CLOBBERFILES += $(DYNLIB) $(LIBLINKS) - -ROOTFS_DYNLIB= $(DYNLIB:%=$(ROOTFS_LIBDIR)/%) diff --git a/usr/src/cmd/sgs/librtld/amd64/Makefile b/usr/src/cmd/sgs/librtld/amd64/Makefile index ad8c67f0db..481b1c0a22 100644 --- a/usr/src/cmd/sgs/librtld/amd64/Makefile +++ b/usr/src/cmd/sgs/librtld/amd64/Makefile @@ -30,12 +30,9 @@ CPPFLAGS += -I../../../../uts/intel/amd64/krtld .KEEP_STATE: -ROOTFS_DYNLIB64 = $(DYNLIB:%=$(ROOTFS_LIBDIR64)/%) -$(ROOTFS_DYNLIB64) := FILEMODE=755 - all: $(DYNLIB) $(LIBLINKS) -install: all $(ROOTFS_DYNLIB64) +install: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64) CPPFLAGS += -D_ELF64 diff --git a/usr/src/cmd/sgs/librtld/i386/Makefile b/usr/src/cmd/sgs/librtld/i386/Makefile index 54e5e30586..5d9e11a226 100644 --- a/usr/src/cmd/sgs/librtld/i386/Makefile +++ b/usr/src/cmd/sgs/librtld/i386/Makefile @@ -32,6 +32,6 @@ CPPFLAGS += -I../../../../uts/intel/ia32/krtld all: $(DYNLIB) $(LIBLINKS) -install: all $(ROOTFS_DYNLIB) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) include $(SRC)/cmd/sgs/librtld/Makefile.targ diff --git a/usr/src/cmd/sgs/librtld/sparc/Makefile b/usr/src/cmd/sgs/librtld/sparc/Makefile index ac07f8b8c0..eb5a2547e4 100644 --- a/usr/src/cmd/sgs/librtld/sparc/Makefile +++ b/usr/src/cmd/sgs/librtld/sparc/Makefile @@ -32,6 +32,6 @@ CPPFLAGS += -I../../../../uts/sparc/krtld all: $(DYNLIB) $(LIBLINKS) -install: all $(ROOTFS_DYNLIB) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) include $(SRC)/cmd/sgs/librtld/Makefile.targ diff --git a/usr/src/cmd/sgs/librtld/sparcv9/Makefile b/usr/src/cmd/sgs/librtld/sparcv9/Makefile index 00a9c3ca48..fd02c33926 100644 --- a/usr/src/cmd/sgs/librtld/sparcv9/Makefile +++ b/usr/src/cmd/sgs/librtld/sparcv9/Makefile @@ -30,12 +30,9 @@ CPPFLAGS += -I../../../../uts/sparc/krtld .KEEP_STATE: -ROOTFS_DYNLIB64 = $(DYNLIB:%=$(ROOTFS_LIBDIR64)/%) -$(ROOTFS_DYNLIB64) := FILEMODE=755 - all: $(DYNLIB) $(LIBLINKS) -install: all $(ROOTFS_DYNLIB64) +install: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64) CPPFLAGS += -D_ELF64 diff --git a/usr/src/cmd/sgs/librtld_db/Makefile.com b/usr/src/cmd/sgs/librtld_db/Makefile.com index 2d7b9093c3..ad00e866a3 100644 --- a/usr/src/cmd/sgs/librtld_db/Makefile.com +++ b/usr/src/cmd/sgs/librtld_db/Makefile.com @@ -32,6 +32,7 @@ BLTOBJ= msg.o OBJECTS = $(BLTOBJ) $(COMOBJS) $(COMOBJS64) $(PLTOBJS) include $(SRC)/lib/Makefile.lib +include $(SRC)/lib/Makefile.rootfs include $(SRC)/cmd/sgs/Makefile.com SRCDIR = ../common diff --git a/usr/src/cmd/sgs/librtld_db/amd64/Makefile b/usr/src/cmd/sgs/librtld_db/amd64/Makefile index 705c6ef07a..e4454c5ef2 100644 --- a/usr/src/cmd/sgs/librtld_db/amd64/Makefile +++ b/usr/src/cmd/sgs/librtld_db/amd64/Makefile @@ -39,7 +39,7 @@ CONVLIBDIR = $(CONVLIBDIR64) all: $(DYNLIB) -install: all $(ROOTFS_DYNLIB64) $(ROOTFS_LINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) pics/plt32_resolution.o: ../i386/plt32_resolution.c $(COMPILE.c) -D_ELF32 $(PICFLAGS) -o $@ \ diff --git a/usr/src/cmd/sgs/librtld_db/i386/Makefile b/usr/src/cmd/sgs/librtld_db/i386/Makefile index ff610a1129..331d8aa3bb 100644 --- a/usr/src/cmd/sgs/librtld_db/i386/Makefile +++ b/usr/src/cmd/sgs/librtld_db/i386/Makefile @@ -37,6 +37,6 @@ SGSMSGTARG += $(SGSMSGINTEL) all: $(DYNLIB) -install: all $(ROOTFS_DYNLIB) $(ROOTFS_LINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/librtld_db/sparc/Makefile b/usr/src/cmd/sgs/librtld_db/sparc/Makefile index 36c1b54df5..8a82b99e92 100644 --- a/usr/src/cmd/sgs/librtld_db/sparc/Makefile +++ b/usr/src/cmd/sgs/librtld_db/sparc/Makefile @@ -35,6 +35,6 @@ include ../Makefile.com all: $(DYNLIB) -install: all $(ROOTFS_DYNLIB) $(ROOTFS_LINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/librtld_db/sparcv9/Makefile b/usr/src/cmd/sgs/librtld_db/sparcv9/Makefile index 29be0d82b3..c150914bc7 100644 --- a/usr/src/cmd/sgs/librtld_db/sparcv9/Makefile +++ b/usr/src/cmd/sgs/librtld_db/sparcv9/Makefile @@ -39,7 +39,7 @@ CONVLIBDIR = $(CONVLIBDIR64) all: $(DYNLIB) -install: all $(ROOTFS_DYNLIB64) $(ROOTFS_LINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) pics/plt32_resolution.o: ../sparc/plt32_resolution.c $(COMPILE.c) -D_ELF32 $(PICFLAGS) -o $@ \ diff --git a/usr/src/cmd/sgs/rtld/Makefile.com b/usr/src/cmd/sgs/rtld/Makefile.com index 6a767de04b..853fd5066b 100644 --- a/usr/src/cmd/sgs/rtld/Makefile.com +++ b/usr/src/cmd/sgs/rtld/Makefile.com @@ -72,6 +72,14 @@ ETCDYNLIB= $(RTLD:%=$(ETCLIBDIR)/%) ROOTDYNLIB= $(RTLD:%=$(ROOTFS_LIBDIR)/%) ROOTDYNLIB64= $(RTLD:%=$(ROOTFS_LIBDIR64)/%) +COMPATLINKS= etc/lib/ld.so.1 \ + usr/lib/ld.so.1 +COMPATLINKS64= usr/lib/$(MACH64)/ld.so.1 + +$(ROOT)/etc/lib/ld.so.1 := COMPATLINKTARGET= ../../lib/ld.so.1 +$(ROOT)/usr/lib/ld.so.1 := COMPATLINKTARGET= ../../lib/ld.so.1 +$(ROOT)/usr/lib/$(MACH64)/ld.so.1 := \ + COMPATLINKTARGET= ../../../lib/$(MACH64)/ld.so.1 FILEMODE = 755 diff --git a/usr/src/cmd/sgs/rtld/amd64/Makefile b/usr/src/cmd/sgs/rtld/amd64/Makefile index f01898ec08..d73dbaaa6b 100644 --- a/usr/src/cmd/sgs/rtld/amd64/Makefile +++ b/usr/src/cmd/sgs/rtld/amd64/Makefile @@ -84,7 +84,7 @@ CONVLIBDIR = $(CONVLIBDIR64) all: $(RTLD) -install: all $(ROOTDYNLIB64) +install: all $(ROOTDYNLIB64) $(ROOTCOMPATLINKS64) adbmacros: adb .WAIT $(ADBSCRIPTS) diff --git a/usr/src/cmd/sgs/rtld/i386/Makefile b/usr/src/cmd/sgs/rtld/i386/Makefile index 224faac481..0d7ff2cc8e 100644 --- a/usr/src/cmd/sgs/rtld/i386/Makefile +++ b/usr/src/cmd/sgs/rtld/i386/Makefile @@ -75,7 +75,7 @@ SGSMSGTARG += $(SGSMSGINTEL) $(SGSMSGINTEL32) $(SGSMSG32) all: $(RTLD) -install: all $(ROOTDYNLIB) +install: all $(ROOTDYNLIB) $(ROOTCOMPATLINKS) adbmacros: adb .WAIT $(ADBSCRIPTS) diff --git a/usr/src/cmd/sgs/rtld/sparc/Makefile b/usr/src/cmd/sgs/rtld/sparc/Makefile index d63f57b13a..2785c30fcf 100644 --- a/usr/src/cmd/sgs/rtld/sparc/Makefile +++ b/usr/src/cmd/sgs/rtld/sparc/Makefile @@ -81,7 +81,7 @@ SGSMSGTARG += $(SGSMSGSPARC) $(SGSMSGSPARC32) $(SGSMSG32) all: $(RTLD) -install: all $(ROOTDYNLIB) +install: all $(ROOTDYNLIB) $(ROOTCOMPATLINKS) adbmacros: adb .WAIT $(ADBSCRIPTS) diff --git a/usr/src/cmd/sgs/rtld/sparcv9/Makefile b/usr/src/cmd/sgs/rtld/sparcv9/Makefile index 87593bc6d2..fb1c3da820 100644 --- a/usr/src/cmd/sgs/rtld/sparcv9/Makefile +++ b/usr/src/cmd/sgs/rtld/sparcv9/Makefile @@ -90,7 +90,7 @@ CONVLIBDIR = $(CONVLIBDIR64) all: $(RTLD) -install: all $(ROOTDYNLIB64) +install: all $(ROOTDYNLIB64) $(ROOTCOMPATLINKS64) adbmacros: adb .WAIT $(ADBSCRIPTS) diff --git a/usr/src/cmd/sgs/yacc/Makefile.com b/usr/src/cmd/sgs/yacc/Makefile.com index 2172234f49..9f9b3dc0e8 100644 --- a/usr/src/cmd/sgs/yacc/Makefile.com +++ b/usr/src/cmd/sgs/yacc/Makefile.com @@ -41,6 +41,13 @@ YACCPAR= yaccpar include ../../../../lib/Makefile.lib +COMPATLINKS= usr/ccs/lib/liby.so +COMPATLINKS64= usr/ccs/lib/$(MACH64)/liby.so + +$(ROOT)/usr/ccs/lib/liby.so := COMPATLINKTARGET=../../lib/liby.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/liby.so:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/liby.so.1 + SRCDIR = ../common # Override default source file derivation rule (in Makefile.lib) diff --git a/usr/src/cmd/sgs/yacc/Makefile.targ b/usr/src/cmd/sgs/yacc/Makefile.targ index a7932225e0..1ff1f4e804 100644 --- a/usr/src/cmd/sgs/yacc/Makefile.targ +++ b/usr/src/cmd/sgs/yacc/Makefile.targ @@ -75,5 +75,8 @@ objs/%.o pics/%.o: ../common/%.c $(DYNLINKLIBDIR)/%: %$(VERS) $(INS.liblink) +$(ROOTCOMPATLINKS) $(ROOTCOMPATLINKS64): + $(RM) $@; $(SYMLINK) $(COMPATLINKTARGET) $@ + clean: $(RM) $(POBJS) $(OBJS) $(PICS) $(CLEANFILES) diff --git a/usr/src/cmd/sgs/yacc/amd64/Makefile b/usr/src/cmd/sgs/yacc/amd64/Makefile index 3b987420ec..46c508df3d 100644 --- a/usr/src/cmd/sgs/yacc/amd64/Makefile +++ b/usr/src/cmd/sgs/yacc/amd64/Makefile @@ -23,8 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # This Makefile is only to produce 64-bit yacc shared library liby.so.1 # and not for building 64-bit yacc itself. @@ -39,7 +37,7 @@ POFILE= all_lib: $(LIBS) -install_lib: all_lib $(ROOTLIBS64) $(ROOTLINKS64) +install_lib: all_lib $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/yacc/i386/Makefile b/usr/src/cmd/sgs/yacc/i386/Makefile index 5ca3d8bd7d..20885a7713 100644 --- a/usr/src/cmd/sgs/yacc/i386/Makefile +++ b/usr/src/cmd/sgs/yacc/i386/Makefile @@ -40,7 +40,7 @@ install: all $(ROOTPROG) $(ROOTYACCPAR) $(ROOTCCSBINLINK) $(RM) $(ROOTCCSBIN)/yaccpar $(SYMLINK) ../../share/lib/ccs/yaccpar $(ROOTCCSBIN)/yaccpar -install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) +install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTCOMPATLINKS) include ../Makefile.targ include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/yacc/sparc/Makefile b/usr/src/cmd/sgs/yacc/sparc/Makefile index 65d76b6f21..909fb6e7e2 100644 --- a/usr/src/cmd/sgs/yacc/sparc/Makefile +++ b/usr/src/cmd/sgs/yacc/sparc/Makefile @@ -38,7 +38,7 @@ all_lib: $(LIBS) install: all $(ROOTPROG) $(ROOTYACCPAR) $(ROOTCCSBINLINK) -install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) +install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTCOMPATLINKS) $(RM) $(ROOTCCSBIN)/yaccpar $(SYMLINK) ../../share/lib/ccs/yaccpar $(ROOTCCSBIN)/yaccpar diff --git a/usr/src/cmd/sgs/yacc/sparcv9/Makefile b/usr/src/cmd/sgs/yacc/sparcv9/Makefile index 1c65ac76b5..f94db938f3 100644 --- a/usr/src/cmd/sgs/yacc/sparcv9/Makefile +++ b/usr/src/cmd/sgs/yacc/sparcv9/Makefile @@ -20,13 +20,9 @@ # CDDL HEADER END # # -# ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1997 by Sun Microsystems, Inc. # All rights reserved. # -# cmd/sgs/yacc/sparcv9/Makefile -# # This Makefile is only to produce 64-bit yacc shared library liby.so.1 # and not for building 64-bit yacc itself. @@ -41,7 +37,7 @@ POFILE= all_lib: $(LIBS) -install_lib: all_lib $(ROOTLIBS64) $(ROOTLINKS64) +install_lib: all_lib $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ include ../../../Makefile.targ diff --git a/usr/src/data/locale/data/common.UTF-8.src b/usr/src/data/locale/data/common.UTF-8.src index cd8806caf6..798e6832fb 100644 --- a/usr/src/data/locale/data/common.UTF-8.src +++ b/usr/src/data/locale/data/common.UTF-8.src @@ -15438,7 +15438,6 @@ cntrl <NULL>;/ <ACTIVATE_ARABIC_FORM_SHAPING>;/ <NATIONAL_DIGIT_SHAPES>;/ <NOMINAL_DIGIT_SHAPES>;/ - <PRIVATE_USE_AREA-E000>;...;<PRIVATE_USE_AREA-F8FF>;/ <ZERO_WIDTH_NO-BREAK_SPACE>;/ <INTERLINEAR_ANNOTATION_ANCHOR>;/ <INTERLINEAR_ANNOTATION_SEPARATOR>;/ @@ -15552,9 +15551,7 @@ cntrl <NULL>;/ <TAG_VERTICAL_LINE>;/ <TAG_RIGHT_CURLY_BRACKET>;/ <TAG_TILDE>;/ - <CANCEL_TAG>;/ - <PRIVATE_USE_AREA-F0000>;...;<PRIVATE_USE_AREA-FFFFD>;/ - <PRIVATE_USE_AREA-100000>;...;<PRIVATE_USE_AREA-10FFFD> + <CANCEL_TAG> digit <zero>;/ <one>;/ <two>;/ @@ -21461,6 +21458,7 @@ graph <DOLLAR_SIGN>;/ <MEETEI_MAYEK_VOWEL_SIGN_NUNG>;/ <MEETEI_MAYEK_LUM_IYEK>;/ <MEETEI_MAYEK_APUN_IYEK>;/ + <PRIVATE_USE_AREA-E000>;...;<PRIVATE_USE_AREA-F8FF>;/ <HEBREW_POINT_JUDEO-SPANISH_VARIKA>;/ <HEBREW_LETTER_ALTERNATIVE_PLUS_SIGN>;/ <ARABIC_SYMBOL_DOT_ABOVE>;/ @@ -26042,7 +26040,9 @@ graph <DOLLAR_SIGN>;/ <VARIATION_SELECTOR-253>;/ <VARIATION_SELECTOR-254>;/ <VARIATION_SELECTOR-255>;/ - <VARIATION_SELECTOR-256> + <VARIATION_SELECTOR-256>;/ + <PRIVATE_USE_AREA-F0000>;...;<PRIVATE_USE_AREA-FFFFD>;/ + <PRIVATE_USE_AREA-100000>;...;<PRIVATE_USE_AREA-10FFFD> lower <a>;/ <b>;/ <c>;/ diff --git a/usr/src/data/locale/tools/utf8-rollup.pl b/usr/src/data/locale/tools/utf8-rollup.pl index 829c9a3490..ed1d2edaf3 100755 --- a/usr/src/data/locale/tools/utf8-rollup.pl +++ b/usr/src/data/locale/tools/utf8-rollup.pl @@ -149,7 +149,8 @@ sub parse_unidata { $cat = "alpha"; } elsif ($d[2] =~ /^P/) { $cat = "punct"; - } elsif ($d[2] =~ /^M/ || $d[2] =~ /^N/ || $d[2] =~ /^S/) { + } elsif ($d[2] =~ /^Co/ || $d[2] =~ /^M/ || $d[2] =~ /^N/ || + $d[2] =~ /^S/) { $cat = "graph"; } elsif ($d[2] =~ /^C/) { $cat = "cntrl"; diff --git a/usr/src/lib/Makefile b/usr/src/lib/Makefile index 5a89beb017..c928fc8118 100644 --- a/usr/src/lib/Makefile +++ b/usr/src/lib/Makefile @@ -563,7 +563,6 @@ install_extra: clean clobber: $(NOWAIT_SUBDIRS:%=%-nodepend) -lint: install_h check: $(HDRSUBDIRS:%=%-nodepend) @@ -571,6 +570,8 @@ _msg: $(MSGSUBDIRS:%=%-nodepend) .WAIT _dc _dc: $(DCSUBDIRS:%=%-nodepend) +lint: + # Library interdependencies are called out explicitly here. ../cmd/sgs/libconv: crt ../cmd/sgs/libdl: crt diff --git a/usr/src/lib/Makefile.filter.com b/usr/src/lib/Makefile.filter.com index ea1c708955..73344e638e 100644 --- a/usr/src/lib/Makefile.filter.com +++ b/usr/src/lib/Makefile.filter.com @@ -44,14 +44,12 @@ # # include $(SRC)/lib/Makefile.rootfs (1) # -# LIBS += $(LINTLIB) (2) -# DYNFLAGS += -F filtee (3) -# MAPFILEDIR = . (4) +# DYNFLAGS += -F filtee (2) +# MAPFILEDIR = . (3) # # 1. Use Makefile.rootfs when destination is /lib (rather than /usr/lib). -# 2. Add LINTLIB when a lint library is produced. -# 3. Customize DYNFLAGS to indicate filtee name. -# 4. Change MAPFILEDIR if mapfiles are not under ../common. +# 2. Customize DYNFLAGS to indicate filtee name. +# 3. Change MAPFILEDIR if mapfiles are not under ../common. # # The typical use of Makefile.filter.com and Makefile.filter.targ is through # inclusion from a standard filters machine specific Makefiles: @@ -69,10 +67,10 @@ # include $(SRC)/lib/Makefile.filter.targ # # 1. Use Makefile.lib.64 for 64-bit builds. -# 2. Customize DYNFLAGS for $MACH if necessary. +# 2. Customize DYNFLAGS for $MACH if necessary. # -include $(SRC)/lib/Makefile.lib +include $(SRC)/lib/Makefile.lib # Define common flags, that override or append to Makefile.lib rules. diff --git a/usr/src/lib/Makefile.filter.targ b/usr/src/lib/Makefile.filter.targ index c13cab4565..76e23fcb62 100644 --- a/usr/src/lib/Makefile.filter.targ +++ b/usr/src/lib/Makefile.filter.targ @@ -25,11 +25,6 @@ # Makefile.filter.com and Makefile.filter.targ provide centralized Makefiles # for driving the creation of filters. See Makefile.filter.com for usage. - -# Override lint sources from Makefile.lib. - -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) - # Override shared object build rule from Makefile.lib. This rule uses $(LD) # directly to avoid .init and .fini sections being added. @@ -43,6 +38,5 @@ CTFMERGE_LIB = : all: $$(LIBS) -lint: include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/Makefile.lib b/usr/src/lib/Makefile.lib index a1e16e6fba..83df083ce3 100644 --- a/usr/src/lib/Makefile.lib +++ b/usr/src/lib/Makefile.lib @@ -119,6 +119,7 @@ $(ROOTDEMODIRS) := DIRMODE = 755 ARFLAGS= r SONAME= $(DYNLIB) + # For most libraries, we should be able to resolve all symbols at link time, # either within the library or as dependencies, all text should be pure, and # combining relocations into one relocation table reduces startup costs. @@ -262,5 +263,16 @@ CLOBBERTARGFILES= $(LIBS) $(DYNLIB) $(CLOBBERFILES) TYPECHECK_LIB32 = $(TYPECHECK_LIB:%=$(MACH)/%) TYPECHECK_LIB64 = $(TYPECHECK_LIB:%=$(MACH64)/%) TYPECHECK_LIST= $(TYPELIST:%=-T %) -$(BUILD64)TYPECHECK.lib = $(CTFDIFF) -t -I $(TYPECHECK_LIST) $(TYPECHECK_LIB32) $(TYPECHECK_LIB64) +$(BUILD64)TYPECHECK.lib = $(CTFDIFF) -t -I $(TYPECHECK_LIST) \ + $(TYPECHECK_LIB32) $(TYPECHECK_LIB64) TYPECHECK = $(TYPECHECK_LIB:%=%.typecheck) + +# Links we need to create for compatibility +COMPATLINKS= +COMPATLINKS64= +ROOTCOMPATLINKS= $(COMPATLINKS:%=$(ROOT)/%) +ROOTCOMPATLINKS64= $(COMPATLINKS64:%=$(ROOT)/%) + +# So if someone doesn't set the target-specific variable they get a clue what +# went wrong. +COMPATLINKTARGET= /__you_didnt_use_COMPATLINKS_properly__ diff --git a/usr/src/lib/Makefile.mach b/usr/src/lib/Makefile.mach index cc200693ac..1e862d46ac 100644 --- a/usr/src/lib/Makefile.mach +++ b/usr/src/lib/Makefile.mach @@ -23,10 +23,8 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/Makefile.mach # + # included to define targets built with machine-dependent source # @@ -56,4 +54,10 @@ $(MACHLIBS): FRC $(MACHLIBS64): FRC @cd $(@D); pwd; VERSION='$(VERSION)' $(MAKE) $(@F) +$(ROOTCOMPATLINKS): + $(RM) $@; $(SYMLINK) $(COMPATLINKTARGET) $@ + +$(ROOTCOMPATLINKS64): + $(RM) $@; $(SYMLINK) $(COMPATLINKTARGET) $@ + FRC: diff --git a/usr/src/lib/Makefile.rootfs b/usr/src/lib/Makefile.rootfs index c78894a551..b0aa7eec4d 100644 --- a/usr/src/lib/Makefile.rootfs +++ b/usr/src/lib/Makefile.rootfs @@ -22,11 +22,25 @@ # # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# + # To install libraries in the root filesystem (/lib), # include this Makefile right after Makefile.lib ROOTLIBDIR= $(ROOTFS_LIBDIR) ROOTLIBDIR64= $(ROOTFS_LIBDIR64) + + +# By default, libraries installed in /lib get a symbolic link added in +# /usr/lib for both the shared object and the compilation link. +COMPATLINKS= usr/lib/$(DYNLIB) \ + usr/lib/$(LIBLINKS) + +COMPATLINKS64= usr/lib/$(MACH64)/$(DYNLIB) \ + usr/lib/$(MACH64)/$(LIBLINKS) + +$(ROOT)/usr/lib/$(DYNLIB) := COMPATLINKTARGET=../../lib/$(DYNLIB) +$(ROOT)/usr/lib/$(LIBLINKS) := COMPATLINKTARGET=../../lib/$(DYNLIB) +$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB):= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB) +$(ROOT)/usr/lib/$(MACH64)/$(LIBLINKS) := \ + COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB) diff --git a/usr/src/lib/Makefile.targ b/usr/src/lib/Makefile.targ index 36f91189b4..851f29b395 100644 --- a/usr/src/lib/Makefile.targ +++ b/usr/src/lib/Makefile.targ @@ -64,11 +64,6 @@ $(ROOTLIBDIR)/$(LIBLINKSCCC): $(ROOTLIBDIR)/$(LIBLINKSCCC)$(VERS) $(ROOTLIBDIR64)/$(LIBLINKSCCC): $(ROOTLIBDIR64)/$(LIBLINKSCCC)$(VERS) $(INS.liblinkccc64) -$(ROOTLINTDIR)/%: $(SRCDIR)/% - $(INS.file) -$(ROOTFS_LINTDIR)/%: $(SRCDIR)/% - $(INS.file) - $(ROOTDEMODIRS): $(INS.dir) $(ROOTDEMODIRBASE)/%: $(DEMOFILESRCDIR)/% @@ -99,12 +94,6 @@ $(DYNLIBCCC): pics .WAIT $$(PICS) $$(ALTPICS) $$(EXTPICS) $(BUILDCCC.SO) $(POST_PROCESS_SO) -$(LINTLIB): $$(SRCS) - $(LINT.c) -o $(LIBNAME) $(SRCS) > $(LINTOUT) 2>&1 - -lintcheck: $$(SRCS) - $(LINT.c) $(LINTCHECKFLAGS) $(SRCS) $(LDLIBS) - $(TYPECHECK): $(TYPECHECK_LIB32) $(TYPECHECK_LIB64) $(TYPECHECK.lib) @@ -112,5 +101,11 @@ clobber: clean -$(RM) $(CLOBBERTARGFILES) clean: - -$(RM) $(OBJS) $(USDT_HEADERS) $(USDT_PICS) - -$(RM) $(PICS) $(DUPLICATE_SRC) $(LINTOUT) $(LINTLIB) $(CLEANFILES) + -$(RM) $(OBJS) $(PICS) $(DUPLICATE_SRC) $(CLEANFILES) + +$(ROOTCOMPATLINKS): + $(RM) $@; $(SYMLINK) $(COMPATLINKTARGET) $@ + +$(ROOTCOMPATLINKS64): + $(RM) $@; $(SYMLINK) $(COMPATLINKTARGET) $@ + diff --git a/usr/src/lib/README.Makefiles b/usr/src/lib/README.Makefiles index 4ca4c2f68a..6db4c7ef6e 100644 --- a/usr/src/lib/README.Makefiles +++ b/usr/src/lib/README.Makefiles @@ -237,13 +237,12 @@ ISA-specific Makefiles. You can do this by: clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install - lint := TARGET= lint The order doesn't matter, but alphabetical is preferable. 4. Having the aforementioned targets depend on SUBDIRS: - all clean clobber install lint: $(SUBDIRS) + all clean clobber install: $(SUBDIRS) The `all' target must be listed first so that make uses it as the default target; the others might as well be listed alphabetically. @@ -262,11 +261,10 @@ top-level library Makefile (license notice and copyright omitted): clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install - lint := TARGET = lint .KEEP_STATE: - all clean clobber install lint: $(SUBDIRS) + all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) @@ -348,10 +346,7 @@ The third section typically consists of the following macros: Set to the list of the types of libraries to build when building your library. For dynamic libraries, you should set this to - `$(DYNLIB) $(LINTLIB)' so that a dynamic library and lint library - are built. For loadable modules, you should just list DYNLIB, - since there's no point in building a lint library for libraries - that are never linked at compile-time. + `$(DYNLIB)' so that a dynamic library is built. If your library needs to be built as a static library (typically to be used in other parts of the build), you should set LIBS to @@ -387,15 +382,6 @@ The third section typically consists of the following macros: than SRCDIR are needed. Keep in mind that SRCS should be set to a list of source file *pathnames*, not just a list of filenames. - LINTLIB-specific SRCS (required if building a lint library) - - Set to a special "lint stubs" file to use when constructing your - library's lint library. The lint stubs file must be used to - guarantee that programs that link against your library will be able - to lint clean. To do this, you must conditionally set SRCS to use - your stubs file by specifying `LINTLIB := SRCS= $(SRCDIR)/$(LINTSRC)' - in your Makefile. Of course, you do not need to set this if your - library does not build a lint library. LDLIBS @@ -405,11 +391,6 @@ The third section typically consists of the following macros: search path, causing the linker to look in the wrong place for the libraries. - Since lint targets also make use of LDLIBS, LDLIBS *must* only - contain -l and -L directives; all other link-related directives - should be put in DYNFLAGS (if they apply only to shared object - construction) or LDFLAGS (if they apply in general). - MAPFILES (if necessary) Set to the list of mapfiles used to link each ISA-specific version @@ -425,11 +406,9 @@ The third section typically consists of the following macros: CPPFLAGS (if necessary) Appended with any flags that need to be passed to the C - preprocessor (typically -D and -I flags). Since lint macros use - CPPFLAGS, CPPFLAGS *must* only contain directives known to the C - preprocessor. When compiling MT-safe code, CPPFLAGS *must* - include -D_REENTRANT. When compiling large file aware code, - CPPFLAGS *must* include -D_FILE_OFFSET_BITS=64. + preprocessor (typically -D and -I flags). When compiling MT-safe + code, CPPFLAGS *must* include -D_REENTRANT. When compiling large + file aware code, CPPFLAGS *must* include -D_FILE_OFFSET_BITS=64. CFLAGS @@ -457,17 +436,18 @@ The third section typically consists of the following macros: necessary, and it should only contain optimization-related settings (or -g). - LINTFLAGS (if necessary) + COMPATLINKS (if necessary) - Appended with any flags that need to be passed to lint when - linting 32-bit code. You should only modify LINTFLAGS in - rare instances where your code cannot (or should not) be fixed. + Set to a list of symbolic links that should also be provided for + this library. Each should also have a target-specific assignment to + COMPATLINKTARGET stating what the target of each link should be - LINTFLAGS64 (if necessary) + COMPATLINKS= usr/lib/libfoo.so + $(ROOT)/usr/lib/libfoo.so := COMPATLINKTARGET= libbar.so - Appended with any flags that need to be passed to lint when - linting 64-bit code. You should only modify LINTFLAGS64 in - rare instances where your code cannot (or should not) be fixed. + COMPATLINKS64 (if necessary) + + As COMPATLINKS, above, for 64bit objects. Of course, you may use other macros as necessary. @@ -485,14 +465,6 @@ The fourth section typically consists of the following targets: though it should be listed as an empty target if LIBS is set by your ISA-specific Makefiles (see above). - lint - - Use the `lintcheck' rule provided by lib/Makefile.targ to lint the - actual library sources. Historically, this target has also been - used to build the lint library (using LINTLIB), but that usage is - now discouraged. Thus, this rule should be specified as - - lint: lintcheck Conspicuously absent from this section are the `clean' and `clobber' targets. These targets are already provided by lib/Makefile.targ and thus should not @@ -511,7 +483,7 @@ cause libinetutil.so.1 to be installed in /lib rather than /usr/lib: include ../../Makefile.lib include ../../Makefile.rootfs - LIBS = $(DYNLIB) $(LINTLIB) + LIBS = $(DYNLIB) SRCDIR = ../common COMDIR = $(SRC)/common/net/dhcp @@ -519,7 +491,6 @@ cause libinetutil.so.1 to be installed in /lib rather than /usr/lib: $(SRCDIR)/ifspec.c $(SRCDIR)/eh.c $(SRCDIR)/tq.c \ $(SRCDIR)/ifaddrlist.c - $(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) LDLIBS += -lsocket -lc CFLAGS += $(CCVERBOSE) @@ -529,8 +500,6 @@ cause libinetutil.so.1 to be installed in /lib rather than /usr/lib: all: $(LIBS) - lint: lintcheck - pics/%.o: $(COMDIR)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) @@ -561,7 +530,7 @@ Makefiles for libinetutil: include ../Makefile.com - install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) + install: all $(ROOTLIBS) $(ROOTLINKS) sparcv9/Makefile: @@ -574,7 +543,7 @@ Makefiles for libinetutil: include ../Makefile.com - install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) + install: all $(ROOTLIBS) $(ROOTLINKS) amd64/Makefile: @@ -583,6 +552,10 @@ Makefiles for libinetutil: install: all $(ROOTLIBS64) $(ROOTLINKS64) +If you included Makefile.rootfs to install your library into /lib, you should +also add $(ROOTCOMPATLINKS) and $(ROOTCOMPATLINKS64) to your install: target +to install compatibility symlinks into /usr/lib. + Observe that there is no .KEEP_STATE directive in these Makefiles, since all of these Makefiles include libinetutil/Makefile.com, and it already has a .KEEP_STATE directive. Also, note that the 64-bit Makefiles also include diff --git a/usr/src/lib/abi/Makefile b/usr/src/lib/abi/Makefile index ce037a6606..69559a43fa 100644 --- a/usr/src/lib/abi/Makefile +++ b/usr/src/lib/abi/Makefile @@ -22,25 +22,23 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/Makefile.lib SUBDIRS = apptrace -all := TARGET = all +all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint _msg := TARGET = _msg .PARALLEL: .KEEP_STATE: -all clean clobber install lint _msg: $(SUBDIRS) +all clean clobber install _msg: $(SUBDIRS) + $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/abi/apptrace/Makefile b/usr/src/lib/abi/apptrace/Makefile index c8e66508e5..b141d8b7ba 100644 --- a/usr/src/lib/abi/apptrace/Makefile +++ b/usr/src/lib/abi/apptrace/Makefile @@ -23,8 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/Makefile.lib @@ -42,15 +40,15 @@ CLEANFILES += $(MSGFILES) # CPPFLAGS= -I. $(CPPFLAGS.master) -all := TARGET = all +all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) + $(POFILE): $(MSGFILES) $(BUILDPO.msgfiles) diff --git a/usr/src/lib/abi/apptrace/Makefile.com b/usr/src/lib/abi/apptrace/Makefile.com index 8f760ac522..8fe6427f34 100644 --- a/usr/src/lib/abi/apptrace/Makefile.com +++ b/usr/src/lib/abi/apptrace/Makefile.com @@ -46,6 +46,5 @@ $(SUPPRESS_LIBS)ZDEFS = -zdefs all: $(LIBS) -lint: lintcheck include ../../../Makefile.targ diff --git a/usr/src/lib/auditd_plugins/Makefile b/usr/src/lib/auditd_plugins/Makefile index 4f80c29acf..1040a75dbc 100644 --- a/usr/src/lib/auditd_plugins/Makefile +++ b/usr/src/lib/auditd_plugins/Makefile @@ -36,7 +36,6 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint package := TARGET= package _msg := TARGET= _msg @@ -68,7 +67,6 @@ catalog: $(SUBDIRS) check: $(CHECKHDRS) -lint: $(SUBDIRS) $(ROOTDIRS): $(INS.dir) diff --git a/usr/src/lib/auditd_plugins/binfile/Makefile b/usr/src/lib/auditd_plugins/binfile/Makefile index 7a664a5a1c..a7e3a30fcc 100644 --- a/usr/src/lib/auditd_plugins/binfile/Makefile +++ b/usr/src/lib/auditd_plugins/binfile/Makefile @@ -29,18 +29,18 @@ include $(SRC)/lib/Makefile.lib SUBDIRS = $(MACH) TEXT_DOMAIN= SUNW_OST_OSCMD -POFILE= audit_binfile.po +POFILE= audit_binfile.po MSGFILES= binfile.c all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) + $(POFILE): $(MSGFILES) $(BUILDPO.msgfiles) diff --git a/usr/src/lib/auditd_plugins/binfile/Makefile.com b/usr/src/lib/auditd_plugins/binfile/Makefile.com index 24e4d5cac0..1e4b2cb9b4 100644 --- a/usr/src/lib/auditd_plugins/binfile/Makefile.com +++ b/usr/src/lib/auditd_plugins/binfile/Makefile.com @@ -50,6 +50,5 @@ ROOTLIBDIR= $(ROOT)/usr/lib/security all: $(LIBS) -lint: lintcheck include ../../../Makefile.targ diff --git a/usr/src/lib/auditd_plugins/remote/Makefile b/usr/src/lib/auditd_plugins/remote/Makefile index e57261edb0..7d0ea1e960 100644 --- a/usr/src/lib/auditd_plugins/remote/Makefile +++ b/usr/src/lib/auditd_plugins/remote/Makefile @@ -29,18 +29,18 @@ include $(SRC)/lib/Makefile.lib SUBDIRS = $(MACH) TEXT_DOMAIN= SUNW_OST_OSCMD -POFILE= audit_remote.po +POFILE= audit_remote.po MSGFILES= audit_remote.c transport.c all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) + $(POFILE): $(MSGFILES) $(BUILDPO.msgfiles) diff --git a/usr/src/lib/auditd_plugins/remote/Makefile.com b/usr/src/lib/auditd_plugins/remote/Makefile.com index 363e1518e5..e258a34c77 100644 --- a/usr/src/lib/auditd_plugins/remote/Makefile.com +++ b/usr/src/lib/auditd_plugins/remote/Makefile.com @@ -46,6 +46,5 @@ ROOTLIBDIR= $(ROOT)/usr/lib/security all: $(LIBS) -lint: lintcheck include ../../../Makefile.targ diff --git a/usr/src/lib/auditd_plugins/syslog/Makefile b/usr/src/lib/auditd_plugins/syslog/Makefile index eaecad8673..c28e71cc64 100644 --- a/usr/src/lib/auditd_plugins/syslog/Makefile +++ b/usr/src/lib/auditd_plugins/syslog/Makefile @@ -29,18 +29,18 @@ include $(SRC)/lib/Makefile.lib SUBDIRS = $(MACH) TEXT_DOMAIN= SUNW_OST_OSCMD -POFILE= audit_syslog.po +POFILE= audit_syslog.po MSGFILES= sysplugin.c all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) + $(POFILE): $(MSGFILES) $(BUILDPO.msgfiles) diff --git a/usr/src/lib/auditd_plugins/syslog/Makefile.com b/usr/src/lib/auditd_plugins/syslog/Makefile.com index 57f13b9b3c..f05f108e32 100644 --- a/usr/src/lib/auditd_plugins/syslog/Makefile.com +++ b/usr/src/lib/auditd_plugins/syslog/Makefile.com @@ -60,7 +60,6 @@ ROOTLIBDIR= $(ROOT)/usr/lib/security all: $(LIBS) -lint: lintcheck include ../../../Makefile.targ diff --git a/usr/src/lib/brand/Makefile b/usr/src/lib/brand/Makefile index 8b25716c27..a095ec4a63 100644 --- a/usr/src/lib/brand/Makefile +++ b/usr/src/lib/brand/Makefile @@ -44,6 +44,7 @@ _msg := TARGET= _msg all install clean clobber: $(SUBDIRS) + _msg: $(MSGSUBDIRS) $(SUBDIRS): FRC diff --git a/usr/src/lib/brand/ipkg/Makefile b/usr/src/lib/brand/ipkg/Makefile index 780492a648..334dcd4eae 100644 --- a/usr/src/lib/brand/ipkg/Makefile +++ b/usr/src/lib/brand/ipkg/Makefile @@ -34,9 +34,9 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) + $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/brand/ipkg/zone/Makefile b/usr/src/lib/brand/ipkg/zone/Makefile index 3f5183966b..b88e80ebe9 100644 --- a/usr/src/lib/brand/ipkg/zone/Makefile +++ b/usr/src/lib/brand/ipkg/zone/Makefile @@ -39,6 +39,5 @@ install: $(ROOTXMLDOCS) $(ROOTTEMPLATES) clean: -lint: include $(SRC)/cmd/Makefile.targ diff --git a/usr/src/lib/brand/labeled/Makefile b/usr/src/lib/brand/labeled/Makefile index 7c0382b702..085ea1cc6e 100644 --- a/usr/src/lib/brand/labeled/Makefile +++ b/usr/src/lib/brand/labeled/Makefile @@ -34,9 +34,9 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) + $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/brand/labeled/zone/Makefile b/usr/src/lib/brand/labeled/zone/Makefile index 9a3479d599..18268bcefc 100644 --- a/usr/src/lib/brand/labeled/zone/Makefile +++ b/usr/src/lib/brand/labeled/zone/Makefile @@ -36,6 +36,5 @@ install: $(ROOTXMLDOCS) clean: -lint: include $(SRC)/cmd/Makefile.targ diff --git a/usr/src/lib/brand/shared/Makefile b/usr/src/lib/brand/shared/Makefile index 9cb19dc163..2d03ab8a42 100644 --- a/usr/src/lib/brand/shared/Makefile +++ b/usr/src/lib/brand/shared/Makefile @@ -34,12 +34,12 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) + _msg: $(MSGSUBDIRS) diff --git a/usr/src/lib/brand/shared/brand/Makefile b/usr/src/lib/brand/shared/brand/Makefile index 1bb18cd84d..e8ec0d6de9 100644 --- a/usr/src/lib/brand/shared/brand/Makefile +++ b/usr/src/lib/brand/shared/brand/Makefile @@ -33,12 +33,12 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all install clean clobber lint _msg: $(SUBDIRS) +all install clean clobber _msg: $(SUBDIRS) + $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/brand/shared/librtld_db/Makefile.com b/usr/src/lib/brand/shared/librtld_db/Makefile.com index 30fef02f93..ec5d706d43 100644 --- a/usr/src/lib/brand/shared/librtld_db/Makefile.com +++ b/usr/src/lib/brand/shared/librtld_db/Makefile.com @@ -71,7 +71,6 @@ DTEXTDOM = all: $(LIBS) -lint: lintcheck pics/%64.o: $(BRAND_SHARED)/librtld_db/common/%.c $(COMPILE.c) -D_ELF64 $(PICFLAGS) -o $@ $< diff --git a/usr/src/lib/brand/shared/zone/Makefile b/usr/src/lib/brand/shared/zone/Makefile index cede2f17b5..77b9ee9bf0 100644 --- a/usr/src/lib/brand/shared/zone/Makefile +++ b/usr/src/lib/brand/shared/zone/Makefile @@ -45,6 +45,5 @@ install: $(ROOTSHARED) clean: -lint: include $(SRC)/cmd/Makefile.targ diff --git a/usr/src/lib/brand/sn1/Makefile b/usr/src/lib/brand/sn1/Makefile index e717c249a2..2ea7d34e5c 100644 --- a/usr/src/lib/brand/sn1/Makefile +++ b/usr/src/lib/brand/sn1/Makefile @@ -37,12 +37,12 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) + _msg: $(MSGSUBDIRS) diff --git a/usr/src/lib/brand/sn1/librtld_db/Makefile b/usr/src/lib/brand/sn1/librtld_db/Makefile index c6af8446a7..56397551e6 100644 --- a/usr/src/lib/brand/sn1/librtld_db/Makefile +++ b/usr/src/lib/brand/sn1/librtld_db/Makefile @@ -30,20 +30,15 @@ include $(SRC)/lib/Makefile.lib SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) -LINT_SUBDIRS= $(MACH) -$(BUILD64)LINT_SUBDIRS += $(MACH64) - all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: all install clean clobber: $(SUBDIRS) -lint: $(LINT_SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/brand/sn1/sn1_brand/Makefile b/usr/src/lib/brand/sn1/sn1_brand/Makefile index 4b667e1fa8..52ed1b855a 100644 --- a/usr/src/lib/brand/sn1/sn1_brand/Makefile +++ b/usr/src/lib/brand/sn1/sn1_brand/Makefile @@ -34,12 +34,12 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all install clean clobber lint _msg: $(SUBDIRS) +all install clean clobber _msg: $(SUBDIRS) + $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/brand/sn1/sn1_brand/Makefile.com b/usr/src/lib/brand/sn1/sn1_brand/Makefile.com index 8209995ce6..38435fc044 100644 --- a/usr/src/lib/brand/sn1/sn1_brand/Makefile.com +++ b/usr/src/lib/brand/sn1/sn1_brand/Makefile.com @@ -77,6 +77,5 @@ $(LIBS):= PICS += $(SHAREDOBJS) all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/brand/sn1/zone/Makefile b/usr/src/lib/brand/sn1/zone/Makefile index 7d8877afaa..15fc9f3111 100644 --- a/usr/src/lib/brand/sn1/zone/Makefile +++ b/usr/src/lib/brand/sn1/zone/Makefile @@ -42,7 +42,6 @@ $(POFILE): $(POFILES) $(RM) $@ $(CAT) $(POFILES) > $@ -lint: clean: -$(RM) $(PROGS) $(POFILES) $(POFILE) diff --git a/usr/src/lib/brand/solaris10/Makefile b/usr/src/lib/brand/solaris10/Makefile index 2fc25a7dab..8238b6d2b8 100644 --- a/usr/src/lib/brand/solaris10/Makefile +++ b/usr/src/lib/brand/solaris10/Makefile @@ -37,12 +37,12 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) + _msg: $(MSGSUBDIRS) diff --git a/usr/src/lib/brand/solaris10/cmd/Makefile b/usr/src/lib/brand/solaris10/cmd/Makefile index 99ac1cce10..3ef9e0412f 100644 --- a/usr/src/lib/brand/solaris10/cmd/Makefile +++ b/usr/src/lib/brand/solaris10/cmd/Makefile @@ -40,7 +40,6 @@ s10_python_wrapper.sh: s10_python_wrapper.sh.in all: $(PROGS) -lint: install: all $(ROOTPROGS) diff --git a/usr/src/lib/brand/solaris10/librtld_db/Makefile b/usr/src/lib/brand/solaris10/librtld_db/Makefile index ad185d3c32..a71dfb6ad0 100644 --- a/usr/src/lib/brand/solaris10/librtld_db/Makefile +++ b/usr/src/lib/brand/solaris10/librtld_db/Makefile @@ -30,20 +30,15 @@ include $(SRC)/lib/Makefile.lib SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) -LINT_SUBDIRS= $(MACH) -$(BUILD64)LINT_SUBDIRS += $(MACH64) - all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: all install clean clobber: $(SUBDIRS) -lint: $(LINT_SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/brand/solaris10/s10_brand/Makefile b/usr/src/lib/brand/solaris10/s10_brand/Makefile index 4b667e1fa8..52ed1b855a 100644 --- a/usr/src/lib/brand/solaris10/s10_brand/Makefile +++ b/usr/src/lib/brand/solaris10/s10_brand/Makefile @@ -34,12 +34,12 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all install clean clobber lint _msg: $(SUBDIRS) +all install clean clobber _msg: $(SUBDIRS) + $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/brand/solaris10/s10_brand/Makefile.com b/usr/src/lib/brand/solaris10/s10_brand/Makefile.com index c644b3bc0b..d4c5e5f683 100644 --- a/usr/src/lib/brand/solaris10/s10_brand/Makefile.com +++ b/usr/src/lib/brand/solaris10/s10_brand/Makefile.com @@ -80,12 +80,9 @@ CPPFLAGS += -D_REENTRANT -U_ASM \ CFLAGS += $(CCVERBOSE) # Needed to handle zfs include files CSTD= $(CSTD_GNU99) -C99LMODE= -Xc99=%all DYNFLAGS += $(DYNFLAGS_$(CLASS)) DYNFLAGS += $(BLOCAL) $(ZNOVERSION) -Wl,-e_start LDLIBS += -lmapmalloc -lc -LINTFLAGS += -erroff=E_STATIC_UNUSED -LINTFLAGS64 += -erroff=E_STATIC_UNUSED CERRWARN += $(CNOWARN_UNINIT) diff --git a/usr/src/lib/brand/solaris10/s10_npreload/Makefile b/usr/src/lib/brand/solaris10/s10_npreload/Makefile index 4b667e1fa8..52ed1b855a 100644 --- a/usr/src/lib/brand/solaris10/s10_npreload/Makefile +++ b/usr/src/lib/brand/solaris10/s10_npreload/Makefile @@ -34,12 +34,12 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all install clean clobber lint _msg: $(SUBDIRS) +all install clean clobber _msg: $(SUBDIRS) + $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/brand/solaris10/s10_npreload/Makefile.com b/usr/src/lib/brand/solaris10/s10_npreload/Makefile.com index 658b4ea411..f4c19e2278 100644 --- a/usr/src/lib/brand/solaris10/s10_npreload/Makefile.com +++ b/usr/src/lib/brand/solaris10/s10_npreload/Makefile.com @@ -51,6 +51,5 @@ CLEANFILES += $(DYNLIB) all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/brand/solaris10/s10_replacefile/Makefile b/usr/src/lib/brand/solaris10/s10_replacefile/Makefile index dd0bebe3c3..b0da43c84d 100644 --- a/usr/src/lib/brand/solaris10/s10_replacefile/Makefile +++ b/usr/src/lib/brand/solaris10/s10_replacefile/Makefile @@ -47,6 +47,5 @@ install: all $(ROOTPROGS) clean: $(RM) $(PROG) $(OBJS) -lint: lint_PROG include $(SRC)/cmd/Makefile.targ diff --git a/usr/src/lib/brand/solaris10/s10_support/Makefile b/usr/src/lib/brand/solaris10/s10_support/Makefile index 0c3015084f..6e32629e55 100644 --- a/usr/src/lib/brand/solaris10/s10_support/Makefile +++ b/usr/src/lib/brand/solaris10/s10_support/Makefile @@ -48,6 +48,5 @@ install: all $(ROOTPROGS) clean: $(RM) $(OBJS) -lint: lint_PROG include $(SRC)/cmd/Makefile.targ diff --git a/usr/src/lib/brand/solaris10/zone/Makefile b/usr/src/lib/brand/solaris10/zone/Makefile index b15fa490eb..f126039834 100644 --- a/usr/src/lib/brand/solaris10/zone/Makefile +++ b/usr/src/lib/brand/solaris10/zone/Makefile @@ -48,7 +48,6 @@ $(POFILE): $(POFILES) install: $(PROGS) $(ROOTPROGS) $(ROOTXMLDOCS) $(ROOTTEMPLATES) $(ETCUSER) -lint: clean: -$(RM) $(PROGS) $(POFILES) $(POFILE) diff --git a/usr/src/lib/cfgadm_plugins/Makefile b/usr/src/lib/cfgadm_plugins/Makefile index 8fa7f73df7..f83f15fe71 100644 --- a/usr/src/lib/cfgadm_plugins/Makefile +++ b/usr/src/lib/cfgadm_plugins/Makefile @@ -42,12 +42,12 @@ all:= TARGET= all install:= TARGET= install clean:= TARGET= clean clobber:= TARGET= clobber -lint:= TARGET= lint _msg:= TARGET= _msg .KEEP_STATE: -all clean lint: $(SUBDIRS) +all clean: $(SUBDIRS) + install: all $(SUBDIRS) diff --git a/usr/src/lib/cfgadm_plugins/ac/Makefile b/usr/src/lib/cfgadm_plugins/ac/Makefile index a12d1f6b36..374acb5243 100644 --- a/usr/src/lib/cfgadm_plugins/ac/Makefile +++ b/usr/src/lib/cfgadm_plugins/ac/Makefile @@ -35,7 +35,6 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg catalog := TARGET= catalog package := TARGET= package @@ -50,10 +49,11 @@ GREP= grep .KEEP_STATE: -all clean delete install lint catalog package: $(SUBDIRS) +all clean delete install catalog package: $(SUBDIRS) clobber: $(SUBDIRS) $(RM) $(POFILE) $(POFILES) + $(MACH) $(MACH64): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/cfgadm_plugins/ac/Makefile.com b/usr/src/lib/cfgadm_plugins/ac/Makefile.com index 68af7f6ad0..bbb9c3ce64 100644 --- a/usr/src/lib/cfgadm_plugins/ac/Makefile.com +++ b/usr/src/lib/cfgadm_plugins/ac/Makefile.com @@ -57,7 +57,6 @@ CPPFLAGS += -I$(ROOT)/usr/platform/$(PLATFORM)/include all: $(LIBS) -lint: lintcheck # Create target directories $(USR_PSM_DIR): $(LINKED_DIRS) diff --git a/usr/src/lib/cfgadm_plugins/fp/Makefile b/usr/src/lib/cfgadm_plugins/fp/Makefile index ad6dff9a56..396fd0a6b5 100644 --- a/usr/src/lib/cfgadm_plugins/fp/Makefile +++ b/usr/src/lib/cfgadm_plugins/fp/Makefile @@ -18,13 +18,12 @@ # # CDDL HEADER END # -# lib/cfgadm_plugins/fp/Makefile -# + # # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# + include ../../Makefile.lib @@ -35,10 +34,9 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg -TEXT_DOMAIN= SUNW_OST_OSLIB +TEXT_DOMAIN= SUNW_OST_OSLIB XGETFLAGS= -a -x fp.xcl POFILE= fp.po POFILES= generic.po @@ -49,10 +47,11 @@ CP= cp .KEEP_STATE: -all lint clean delete install package: $(SUBDIRS) +all clean delete install package: $(SUBDIRS) clobber: $(SUBDIRS) $(RM) $(POFILE) $(POFILES) + $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/cfgadm_plugins/fp/Makefile.com b/usr/src/lib/cfgadm_plugins/fp/Makefile.com index f2cc0b2c64..fc6fa9ba91 100644 --- a/usr/src/lib/cfgadm_plugins/fp/Makefile.com +++ b/usr/src/lib/cfgadm_plugins/fp/Makefile.com @@ -39,8 +39,6 @@ ROOTLIBDIR64= $(ROOTLIBDIR)/$(MACH64) LIBS= $(DYNLIB) -LINTFLAGS += -DDEBUG -LINTFLAGS64 += -DDEBUG CFLAGS += $(CCVERBOSE) CFLAGS64 += $(CCVERBOSE) @@ -56,12 +54,6 @@ SMATCH=off CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -LINTFLAGS += -erroff=E_SEC_SPRINTF_UNBOUNDED_COPY -LINTFLAGS += -erroff=E_FUNC_RET_MAYBE_IGNORED2 -LINTFLAGS += -erroff=E_FUNC_RET_ALWAYS_IGNOR2 -LINTFLAGS += -erroff=E_BAD_FORMAT_ARG_TYPE2 -LINTFLAGS += -erroff=E_SEC_CREAT_WITHOUT_MODE -LINTFLAGS64 += $(LINTFLAGS) LDLIBS += -lc -ldevice -ldevinfo -lrcm LDLIBS += -lHBAAPI -lgen @@ -80,7 +72,6 @@ $(ROOTSVCMETHOD):= FILEMODE= 555 all: $(LIBS) -lint: lintcheck # Install rules diff --git a/usr/src/lib/cfgadm_plugins/ib/Makefile b/usr/src/lib/cfgadm_plugins/ib/Makefile index b73c5c7610..b017c4a8ca 100644 --- a/usr/src/lib/cfgadm_plugins/ib/Makefile +++ b/usr/src/lib/cfgadm_plugins/ib/Makefile @@ -34,7 +34,6 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg package := TARGET= package @@ -48,10 +47,11 @@ GREP= grep .KEEP_STATE: -all clean delete install lint package: $(SUBDIRS) +all clean delete install package: $(SUBDIRS) clobber: $(SUBDIRS) $(RM) $(POFILE) $(POFILES) + $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/cfgadm_plugins/ib/Makefile.com b/usr/src/lib/cfgadm_plugins/ib/Makefile.com index d027235875..771e0deacc 100644 --- a/usr/src/lib/cfgadm_plugins/ib/Makefile.com +++ b/usr/src/lib/cfgadm_plugins/ib/Makefile.com @@ -38,8 +38,6 @@ ROOTLIBDIR64= $(ROOTLIBDIR)/$(MACH64) LIBS= $(DYNLIB) -LINTFLAGS += -DDEBUG -LINTFLAGS64 += -DDEBUG CFLAGS += $(CCVERBOSE) CFLAGS64 += $(CCVERBOSE) @@ -58,7 +56,6 @@ LDLIBS += -lc -ldevice -ldevinfo -lrcm -lnvpair all: $(LIBS) -lint: lintcheck # Install rules diff --git a/usr/src/lib/cfgadm_plugins/pci/Makefile b/usr/src/lib/cfgadm_plugins/pci/Makefile index fee3e0b482..9f378bd5c1 100644 --- a/usr/src/lib/cfgadm_plugins/pci/Makefile +++ b/usr/src/lib/cfgadm_plugins/pci/Makefile @@ -34,7 +34,6 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg package := TARGET= package @@ -48,10 +47,11 @@ GREP= grep .KEEP_STATE: -all clean delete install lint package: $(SUBDIRS) +all clean delete install package: $(SUBDIRS) clobber: $(SUBDIRS) $(RM) $(POFILE) $(POFILES) + $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/cfgadm_plugins/pci/Makefile.com b/usr/src/lib/cfgadm_plugins/pci/Makefile.com index 33324f565b..b1e5199514 100644 --- a/usr/src/lib/cfgadm_plugins/pci/Makefile.com +++ b/usr/src/lib/cfgadm_plugins/pci/Makefile.com @@ -59,7 +59,6 @@ SMATCH=off all: $(LIBS) -lint: lintcheck # Create target directories $(USR_LIB_DIR): diff --git a/usr/src/lib/cfgadm_plugins/sata/Makefile b/usr/src/lib/cfgadm_plugins/sata/Makefile index 8af0d35460..92211f3266 100644 --- a/usr/src/lib/cfgadm_plugins/sata/Makefile +++ b/usr/src/lib/cfgadm_plugins/sata/Makefile @@ -33,11 +33,10 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg -package := TARGET= package +package := TARGET= package -TEXT_DOMAIN= SUNW_OST_OSLIB +TEXT_DOMAIN= SUNW_OST_OSLIB XGETFLAGS= -a -x sata.xcl POFILE= sata.po POFILES= generic.po @@ -47,10 +46,11 @@ GREP= grep .KEEP_STATE: -all clean delete install lint package: $(SUBDIRS) +all clean delete install package: $(SUBDIRS) clobber: $(SUBDIRS) $(RM) $(POFILE) $(POFILES) + $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/cfgadm_plugins/sata/Makefile.com b/usr/src/lib/cfgadm_plugins/sata/Makefile.com index 6859fdde2a..ed93f17724 100644 --- a/usr/src/lib/cfgadm_plugins/sata/Makefile.com +++ b/usr/src/lib/cfgadm_plugins/sata/Makefile.com @@ -37,8 +37,6 @@ ROOTLIBDIR64= $(ROOTLIBDIR)/$(MACH64) LIBS= $(DYNLIB) -LINTFLAGS += -DDEBUG -LINTFLAGS64 += -DDEBUG CFLAGS += $(CCVERBOSE) CFLAGS64 += $(CCVERBOSE) @@ -53,7 +51,6 @@ LDLIBS += -lc -ldevice -ldevinfo -lrcm -lnvpair all: $(LIBS) -lint: lintcheck # Install rules diff --git a/usr/src/lib/cfgadm_plugins/sata/amd64/Makefile b/usr/src/lib/cfgadm_plugins/sata/amd64/Makefile index 12fe21de7f..e93b210efa 100644 --- a/usr/src/lib/cfgadm_plugins/sata/amd64/Makefile +++ b/usr/src/lib/cfgadm_plugins/sata/amd64/Makefile @@ -22,13 +22,10 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../../Makefile.lib.64 CFLAGS += -D_POSIX_PTHREAD_SEMANTICS -LINTFLAGS += -D_POSIX_PTHREAD_SEMANTICS .KEEP_STATE: diff --git a/usr/src/lib/cfgadm_plugins/sata/i386/Makefile b/usr/src/lib/cfgadm_plugins/sata/i386/Makefile index 9c9593ade6..bb93bd98cd 100644 --- a/usr/src/lib/cfgadm_plugins/sata/i386/Makefile +++ b/usr/src/lib/cfgadm_plugins/sata/i386/Makefile @@ -22,12 +22,9 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com CFLAGS += -D_POSIX_PTHREAD_SEMANTICS -LINTFLAGS += -D_POSIX_PTHREAD_SEMANTICS .KEEP_STATE: diff --git a/usr/src/lib/cfgadm_plugins/sbd/Makefile b/usr/src/lib/cfgadm_plugins/sbd/Makefile index bd7c451e96..62aff4925b 100644 --- a/usr/src/lib/cfgadm_plugins/sbd/Makefile +++ b/usr/src/lib/cfgadm_plugins/sbd/Makefile @@ -34,7 +34,6 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg package := TARGET= package @@ -49,10 +48,11 @@ GREP= grep .KEEP_STATE: -all clean delete install lint package: $(SUBDIRS) +all clean delete install package: $(SUBDIRS) clobber: $(SUBDIRS) $(RM) $(POFILE) $(POFILES) + $(MACH) $(MACH64): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/cfgadm_plugins/sbd/Makefile.com b/usr/src/lib/cfgadm_plugins/sbd/Makefile.com index 2b8f7f5272..1bd1db9b84 100644 --- a/usr/src/lib/cfgadm_plugins/sbd/Makefile.com +++ b/usr/src/lib/cfgadm_plugins/sbd/Makefile.com @@ -67,7 +67,6 @@ ERRSRC= $(ROOT)/usr/platform/$(PLATFORM)/include/sys/sbd_ioctl.h all: $(LIBS) -lint: lintcheck # Create target directories $(USR_PSM_DIR): @@ -101,6 +100,6 @@ pics/%.o: ../common/%.c $(GENERRDIR)/sbdgenerr < $(ERRSRC) > ../common/ap_err.c sbdgenerr: $(GENERRDIR)/sbdgenerr.pl - $(RM) $(GENERRDIR)/sbdgenerr + $(RM) $(GENERRDIR)/sbdgenerr cat $(GENERRDIR)/sbdgenerr.pl > $(GENERRDIR)/sbdgenerr $(CHMOD) +x $(GENERRDIR)/sbdgenerr diff --git a/usr/src/lib/cfgadm_plugins/sbd/amd64/Makefile b/usr/src/lib/cfgadm_plugins/sbd/amd64/Makefile index 9fd69cde68..568caf8aa5 100644 --- a/usr/src/lib/cfgadm_plugins/sbd/amd64/Makefile +++ b/usr/src/lib/cfgadm_plugins/sbd/amd64/Makefile @@ -32,7 +32,6 @@ include ../Makefile.com include ../../../Makefile.lib.64 CFLAGS += -D_POSIX_PTHREAD_SEMANTICS -LINTFLAGS += -D_POSIX_PTHREAD_SEMANTICS LDLIBS += -lscf .KEEP_STATE: diff --git a/usr/src/lib/cfgadm_plugins/sbd/i386/Makefile b/usr/src/lib/cfgadm_plugins/sbd/i386/Makefile index 7a382d291f..e4fe1d7fa5 100644 --- a/usr/src/lib/cfgadm_plugins/sbd/i386/Makefile +++ b/usr/src/lib/cfgadm_plugins/sbd/i386/Makefile @@ -31,7 +31,6 @@ PLATFORM = i86pc include ../Makefile.com CFLAGS += -D_POSIX_PTHREAD_SEMANTICS -LINTFLAGS += -D_POSIX_PTHREAD_SEMANTICS LDLIBS += -lscf .KEEP_STATE: diff --git a/usr/src/lib/cfgadm_plugins/scsi/Makefile b/usr/src/lib/cfgadm_plugins/scsi/Makefile index 9b832a5972..b4abc1bf76 100644 --- a/usr/src/lib/cfgadm_plugins/scsi/Makefile +++ b/usr/src/lib/cfgadm_plugins/scsi/Makefile @@ -35,7 +35,6 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg package := TARGET= package @@ -49,10 +48,11 @@ GREP= grep .KEEP_STATE: -all clean delete install lint package: $(SUBDIRS) +all clean delete install package: $(SUBDIRS) clobber: $(SUBDIRS) $(RM) $(POFILE) $(POFILES) + $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/cfgadm_plugins/scsi/Makefile.com b/usr/src/lib/cfgadm_plugins/scsi/Makefile.com index 558f0327df..c54ed950a5 100644 --- a/usr/src/lib/cfgadm_plugins/scsi/Makefile.com +++ b/usr/src/lib/cfgadm_plugins/scsi/Makefile.com @@ -53,7 +53,6 @@ LDLIBS += -lc -ldevice -ldevinfo -lrcm all: $(LIBS) -lint: lintcheck # Install rules diff --git a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile index b8bd5148d6..4e201005ca 100644 --- a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile +++ b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile @@ -32,12 +32,11 @@ SUBDIRS= sparc sparcv9 MSGSUBDIRS= $(SUBDIRS) -all := TARGET= all +all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg package := TARGET= package @@ -50,7 +49,8 @@ GREP= grep .KEEP_STATE: -all clean clobber delete install lint package: $(SUBDIRS) +all clean clobber delete install package: $(SUBDIRS) + _msg: $(MSGDOMAIN) $(POFILE) $(RM) $(MSGDOMAIN)/$(POFILE) diff --git a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile.com b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile.com index 6bd681a4a7..4563130b73 100644 --- a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile.com +++ b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile.com @@ -60,7 +60,6 @@ LDLIBS += -lc -ldevice -ldevinfo -lrcm all: $(LIBS) -lint: lintcheck # Install rules diff --git a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparc/Makefile b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparc/Makefile index c845c24bfc..72b59a12b2 100644 --- a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparc/Makefile +++ b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparc/Makefile @@ -22,14 +22,11 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com CFLAGS += -I../../common -I$(SRC)/uts/sun4u/opl -LINTFLAGS += -I../../common -I$(SRC)/uts/sun4u/opl .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparcv9/Makefile b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparcv9/Makefile index c05026a824..14f51ddbf2 100644 --- a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparcv9/Makefile +++ b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparcv9/Makefile @@ -22,15 +22,12 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../../../Makefile.lib.64 CFLAGS64 += -I../../common -I$(SRC)/uts/sun4u/opl -LINTFLAGS64 += -I../../common -I$(SRC)/uts/sun4u/opl .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/cfgadm_plugins/shp/Makefile b/usr/src/lib/cfgadm_plugins/shp/Makefile index 416ab9dfcf..c477e91361 100644 --- a/usr/src/lib/cfgadm_plugins/shp/Makefile +++ b/usr/src/lib/cfgadm_plugins/shp/Makefile @@ -34,7 +34,6 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg package := TARGET= package @@ -48,10 +47,11 @@ GREP= grep .KEEP_STATE: -all clean delete install lint package: $(SUBDIRS) +all clean delete install package: $(SUBDIRS) clobber: $(SUBDIRS) $(RM) $(POFILE) $(POFILES) + $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/cfgadm_plugins/shp/Makefile.com b/usr/src/lib/cfgadm_plugins/shp/Makefile.com index f870d9c700..c8a1a577c7 100644 --- a/usr/src/lib/cfgadm_plugins/shp/Makefile.com +++ b/usr/src/lib/cfgadm_plugins/shp/Makefile.com @@ -60,7 +60,6 @@ SMATCH=off all: $(LIBS) -lint: lintcheck # Create target directories $(USR_LIB_DIR): diff --git a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile index a71d4d781b..bd59a9e454 100644 --- a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile +++ b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile @@ -35,7 +35,6 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg package := TARGET= package @@ -49,7 +48,7 @@ GREP= grep .KEEP_STATE: -all clean delete install lint package: $(SUBDIRS) +all clean delete install package: $(SUBDIRS) clobber: $(SUBDIRS) $(RM) $(POFILE) $(POFILES) diff --git a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com index 8fc548cc33..3e0a59b098 100644 --- a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com +++ b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com @@ -64,8 +64,6 @@ SMATCH=off all: $(LIBS) -lint: lintcheck - # Create target directories $(USR_PSM_DIR): $(LINKED_DIRS) -$(INS.dir) diff --git a/usr/src/lib/cfgadm_plugins/usb/Makefile b/usr/src/lib/cfgadm_plugins/usb/Makefile index 2e0731182d..b1a9874594 100644 --- a/usr/src/lib/cfgadm_plugins/usb/Makefile +++ b/usr/src/lib/cfgadm_plugins/usb/Makefile @@ -34,7 +34,6 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg package := TARGET= package @@ -48,7 +47,7 @@ GREP= grep .KEEP_STATE: -all clean delete install lint package: $(SUBDIRS) +all clean delete install package: $(SUBDIRS) clobber: $(SUBDIRS) $(RM) $(POFILE) $(POFILES) diff --git a/usr/src/lib/cfgadm_plugins/usb/Makefile.com b/usr/src/lib/cfgadm_plugins/usb/Makefile.com index d1bb4af578..77df090945 100644 --- a/usr/src/lib/cfgadm_plugins/usb/Makefile.com +++ b/usr/src/lib/cfgadm_plugins/usb/Makefile.com @@ -38,8 +38,6 @@ ROOTLIBDIR64= $(ROOTLIBDIR)/$(MACH64) LIBS= $(DYNLIB) -LINTFLAGS += -DDEBUG -LINTFLAGS64 += -DDEBUG CFLAGS += $(CCVERBOSE) CFLAGS64 += $(CCVERBOSE) @@ -58,8 +56,6 @@ LDLIBS += -lc -ldevice -ldevinfo -lrcm -lnvpair all: $(LIBS) -lint: lintcheck - # Install rules $(ROOTLIBDIR)/%: % $(ROOTLIBDIR) diff --git a/usr/src/lib/crt/Makefile b/usr/src/lib/crt/Makefile index 57ce536003..0a159e19d9 100644 --- a/usr/src/lib/crt/Makefile +++ b/usr/src/lib/crt/Makefile @@ -33,11 +33,10 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/crt/Makefile.com b/usr/src/lib/crt/Makefile.com index 8415cf0cbe..70e5794cd0 100644 --- a/usr/src/lib/crt/Makefile.com +++ b/usr/src/lib/crt/Makefile.com @@ -59,6 +59,39 @@ $(COMMON_CRT) $(VALUES) := CFLAGS64 += $(C_PICFLAGS64) # intentional double exit SMOFF += unreachable +COMPATLINKS= usr/ccs/lib/values-Xa.o \ + usr/ccs/lib/values-Xc.o \ + usr/ccs/lib/values-Xs.o \ + usr/ccs/lib/values-Xt.o \ + usr/ccs/lib/values-xpg4.o \ + usr/ccs/lib/values-xpg6.o + +COMPATLINKS64= usr/ccs/lib/$(MACH64)/values-Xa.o \ + usr/ccs/lib/$(MACH64)/values-Xc.o \ + usr/ccs/lib/$(MACH64)/values-Xs.o \ + usr/ccs/lib/$(MACH64)/values-Xt.o \ + usr/ccs/lib/$(MACH64)/values-xpg4.o \ + usr/ccs/lib/$(MACH64)/values-xpg6.o + +$(ROOT)/usr/ccs/lib/values-Xa.o:= COMPATLINKTARGET=../../lib/values-Xa.o +$(ROOT)/usr/ccs/lib/values-Xc.o:= COMPATLINKTARGET=../../lib/values-Xc.o +$(ROOT)/usr/ccs/lib/values-Xs.o:= COMPATLINKTARGET=../../lib/values-Xs.o +$(ROOT)/usr/ccs/lib/values-Xt.o:= COMPATLINKTARGET=../../lib/values-Xt.o +$(ROOT)/usr/ccs/lib/values-xpg4.o:= COMPATLINKTARGET=../../lib/values-xpg4.o +$(ROOT)/usr/ccs/lib/values-xpg6.o:= COMPATLINKTARGET=../../lib/values-xpg6.o +$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xa.o:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/values-Xa.o +$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xc.o:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/values-Xc.o +$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xs.o:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/values-Xs.o +$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xt.o:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/values-Xt.o +$(ROOT)/usr/ccs/lib/$(MACH64)/values-xpg4.o:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/values-xpg4.o +$(ROOT)/usr/ccs/lib/$(MACH64)/values-xpg6.o:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/values-xpg6.o + .KEEP_STATE: all: $(OBJECTS) @@ -95,4 +128,5 @@ $(ROOTLIB64)/%.o: %.o $(ROOTLIB64)/gcrt1.o: $(RM) $(ROOTLIB64)/gcrt1.o; $(SYMLINK) crt1.o $(ROOTLIB64)/gcrt1.o -FRC: +$(ROOTCOMPATLINKS) $(ROOTCOMPATLINKS64): + $(RM) $@; $(SYMLINK) $(COMPATLINKTARGET) $@ diff --git a/usr/src/lib/crt/amd64/Makefile b/usr/src/lib/crt/amd64/Makefile index 16967b67ff..1b252c9d3a 100644 --- a/usr/src/lib/crt/amd64/Makefile +++ b/usr/src/lib/crt/amd64/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: $(ROOTOBJECTS64) +install: $(ROOTOBJECTS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/crt/i386/Makefile b/usr/src/lib/crt/i386/Makefile index 5affa893b7..ddd4fa11af 100644 --- a/usr/src/lib/crt/i386/Makefile +++ b/usr/src/lib/crt/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: $(ROOTOBJECTS) +install: $(ROOTOBJECTS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/crt/sparc/Makefile b/usr/src/lib/crt/sparc/Makefile index 5affa893b7..ddd4fa11af 100644 --- a/usr/src/lib/crt/sparc/Makefile +++ b/usr/src/lib/crt/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: $(ROOTOBJECTS) +install: $(ROOTOBJECTS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/crt/sparcv9/Makefile b/usr/src/lib/crt/sparcv9/Makefile index 16967b67ff..1b252c9d3a 100644 --- a/usr/src/lib/crt/sparcv9/Makefile +++ b/usr/src/lib/crt/sparcv9/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: $(ROOTOBJECTS64) +install: $(ROOTOBJECTS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/crypt_modules/Makefile b/usr/src/lib/crypt_modules/Makefile index 15b5a5292e..c1f2b37aeb 100644 --- a/usr/src/lib/crypt_modules/Makefile +++ b/usr/src/lib/crypt_modules/Makefile @@ -22,7 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" SUBDIRS = \ bsdmd5 \ @@ -36,14 +35,13 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint catalog := TARGET= catalog package := TARGET= package _msg := TARGET= _msg .KEEP_STATE: -all lint clean clobber catalog package install _msg: $(SUBDIRS) +all clean clobber catalog package install _msg: $(SUBDIRS) install: all diff --git a/usr/src/lib/crypt_modules/bsdbf/Makefile b/usr/src/lib/crypt_modules/bsdbf/Makefile index f5ecab1c6c..0b9ce88154 100644 --- a/usr/src/lib/crypt_modules/bsdbf/Makefile +++ b/usr/src/lib/crypt_modules/bsdbf/Makefile @@ -33,12 +33,11 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint package := TARGET= package .KEEP_STATE: -all clean clobber delete install lint package: $(SUBDIRS) +all clean clobber delete install package: $(SUBDIRS) _msg: diff --git a/usr/src/lib/crypt_modules/bsdbf/Makefile.com b/usr/src/lib/crypt_modules/bsdbf/Makefile.com index aa2e8f234d..242c2b47e4 100644 --- a/usr/src/lib/crypt_modules/bsdbf/Makefile.com +++ b/usr/src/lib/crypt_modules/bsdbf/Makefile.com @@ -23,10 +23,8 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# LIBRARY= crypt_bsdbf.a -VERS= .1 +VERS= .1 OBJECTS= bsdbf.o \ bcrypt.o \ @@ -35,11 +33,9 @@ OBJECTS= bsdbf.o \ include ../../Makefile.crypt_modules -LDLIBS += -lc +LDLIBS += -lc CPPFLAGS += -I.. all: $(LIBS) -lint: lintcheck - include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/crypt_modules/bsdmd5/Makefile b/usr/src/lib/crypt_modules/bsdmd5/Makefile index 56ab3b9de1..0b9ce88154 100644 --- a/usr/src/lib/crypt_modules/bsdmd5/Makefile +++ b/usr/src/lib/crypt_modules/bsdmd5/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/Makefile.lib @@ -35,12 +33,11 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint package := TARGET= package .KEEP_STATE: -all clean clobber delete install lint package: $(SUBDIRS) +all clean clobber delete install package: $(SUBDIRS) _msg: diff --git a/usr/src/lib/crypt_modules/bsdmd5/Makefile.com b/usr/src/lib/crypt_modules/bsdmd5/Makefile.com index c9e7fa3ad6..df81ffeda1 100644 --- a/usr/src/lib/crypt_modules/bsdmd5/Makefile.com +++ b/usr/src/lib/crypt_modules/bsdmd5/Makefile.com @@ -22,18 +22,15 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" LIBRARY= crypt_bsdmd5.a -VERS= .1 +VERS= .1 OBJECTS= bsdmd5.o include ../../Makefile.crypt_modules -LDLIBS += -lc -lmd +LDLIBS += -lc -lmd all: $(LIBS) -lint: lintcheck - include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/crypt_modules/sha256/Makefile b/usr/src/lib/crypt_modules/sha256/Makefile index 65265904be..53f7bd9e77 100644 --- a/usr/src/lib/crypt_modules/sha256/Makefile +++ b/usr/src/lib/crypt_modules/sha256/Makefile @@ -21,8 +21,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/Makefile.lib @@ -34,12 +32,11 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint test := TARGET= test .KEEP_STATE: -all clean clobber delete install lint test: $(SUBDIRS) +all clean clobber delete install test: $(SUBDIRS) _msg: diff --git a/usr/src/lib/crypt_modules/sha256/Makefile.com b/usr/src/lib/crypt_modules/sha256/Makefile.com index b773a2b6e1..6a6f160399 100644 --- a/usr/src/lib/crypt_modules/sha256/Makefile.com +++ b/usr/src/lib/crypt_modules/sha256/Makefile.com @@ -21,21 +21,18 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" LIBRARY= crypt_sha256.a -VERS= .1 +VERS= .1 OBJECTS= crypt_sha.o include ../../Makefile.crypt_modules CPPFLAGS += -DCRYPT_SHA256 -LDLIBS += -lc -lmd +LDLIBS += -lc -lmd all: $(LIBS) -lint: lintcheck - include $(SRC)/lib/Makefile.targ CLOBBERFILES += test test.o diff --git a/usr/src/lib/crypt_modules/sha512/Makefile b/usr/src/lib/crypt_modules/sha512/Makefile index 842e20fb39..3ca46a323e 100644 --- a/usr/src/lib/crypt_modules/sha512/Makefile +++ b/usr/src/lib/crypt_modules/sha512/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" -# include $(SRC)/lib/Makefile.lib @@ -35,12 +33,11 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint test := TARGET= test .KEEP_STATE: -all clean clobber delete install lint test: $(SUBDIRS) +all clean clobber delete install test: $(SUBDIRS) _msg: diff --git a/usr/src/lib/crypt_modules/sha512/Makefile.com b/usr/src/lib/crypt_modules/sha512/Makefile.com index cf3f561b72..7abf53c548 100644 --- a/usr/src/lib/crypt_modules/sha512/Makefile.com +++ b/usr/src/lib/crypt_modules/sha512/Makefile.com @@ -22,23 +22,20 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" LIBRARY= crypt_sha512.a -VERS= .1 +VERS= .1 OBJECTS= crypt_sha.o include ../../Makefile.crypt_modules CPPFLAGS += -DCRYPT_SHA512 -LDLIBS += -lc -lmd +LDLIBS += -lc -lmd SRCDIR = ../../sha256/ all: $(LIBS) -lint: lintcheck - include $(SRC)/lib/Makefile.targ CLOBBERFILES += test test.o diff --git a/usr/src/lib/crypt_modules/sunmd5/Makefile b/usr/src/lib/crypt_modules/sunmd5/Makefile index 56ab3b9de1..0b9ce88154 100644 --- a/usr/src/lib/crypt_modules/sunmd5/Makefile +++ b/usr/src/lib/crypt_modules/sunmd5/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/Makefile.lib @@ -35,12 +33,11 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint package := TARGET= package .KEEP_STATE: -all clean clobber delete install lint package: $(SUBDIRS) +all clean clobber delete install package: $(SUBDIRS) _msg: diff --git a/usr/src/lib/crypt_modules/sunmd5/Makefile.com b/usr/src/lib/crypt_modules/sunmd5/Makefile.com index 6982c0ce63..ba9466e2df 100644 --- a/usr/src/lib/crypt_modules/sunmd5/Makefile.com +++ b/usr/src/lib/crypt_modules/sunmd5/Makefile.com @@ -22,18 +22,14 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" - LIBRARY= crypt_sunmd5.a -VERS= .1 +VERS= .1 OBJECTS= sunmd5.o include ../../Makefile.crypt_modules -LDLIBS += -lc -lmd +LDLIBS += -lc -lmd all: $(LIBS) -lint: lintcheck - include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/efcode/Makefile b/usr/src/lib/efcode/Makefile index 405989c826..1e0a27d3a9 100644 --- a/usr/src/lib/efcode/Makefile +++ b/usr/src/lib/efcode/Makefile @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -33,16 +31,15 @@ TESTDIRS = fcode_test EFCODEDIRS= $(ROOTLIBDIR)/efcode $(ROOTLIBDIR)/efcode/$(MACH64) -all:= TARGET= all +all:= TARGET= all install:= TARGET= install clean:= TARGET= clean clobber:= TARGET= clobber -lint:= TARGET= lint .PARALLEL: $(SUBDIRS) .KEEP_STATE: -all clean clobber lint: $(SUBDIRS) +all clean clobber: $(SUBDIRS) $(EFCODEDIRS): $(INS.dir) diff --git a/usr/src/lib/efcode/Makefile.efcode b/usr/src/lib/efcode/Makefile.efcode index 5bf50c353f..531a22719c 100644 --- a/usr/src/lib/efcode/Makefile.efcode +++ b/usr/src/lib/efcode/Makefile.efcode @@ -70,8 +70,6 @@ FCPACKAGE64 = $(ROOTLIBDIR64)/fcpackage.so all: $(LIBS) -lint: lintcheck - $(ROOTSYMLINKS64): $(ROOTLIBDIR64)/$(DYNLIB) -$(RM) $@; $(SYMLINK) $(DYNLIB) $@ diff --git a/usr/src/lib/efcode/Makefile.subdirs b/usr/src/lib/efcode/Makefile.subdirs index 3dd1a71017..52acebb78e 100644 --- a/usr/src/lib/efcode/Makefile.subdirs +++ b/usr/src/lib/efcode/Makefile.subdirs @@ -23,8 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/Makefile.lib @@ -37,12 +35,11 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint msg := TARGET= _msg .KEEP_STATE: -all clean clobber install lint _msg: $(SUBDIRS) +all clean clobber install _msg: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/efcode/efdaemon/Makefile b/usr/src/lib/efcode/efdaemon/Makefile index c6343f8413..bb2daec7ee 100644 --- a/usr/src/lib/efcode/efdaemon/Makefile +++ b/usr/src/lib/efcode/efdaemon/Makefile @@ -72,8 +72,6 @@ $(MFSTDIR_SUN4V)/%: % install: all .WAIT $(EFTARGETS) -$(MV) $(MFSTDIR_SUN4V)/$(MANIFEST_SUN4V) $(MFSTDIR_SUN4V)/$(MANIFEST) -lint: lint_PROG - .KEEP_STATE: include $(SRC)/cmd/Makefile.targ diff --git a/usr/src/lib/efcode/etc/Makefile b/usr/src/lib/efcode/etc/Makefile index f7aa6e71ea..e96a65e6b7 100644 --- a/usr/src/lib/efcode/etc/Makefile +++ b/usr/src/lib/efcode/etc/Makefile @@ -37,7 +37,6 @@ all:= TARGET= all install:= TARGET= install clean:= TARGET= clean clobber:= TARGET= clobber -lint:= TARGET= lint ROOTETC= $(ROOT)/etc ETCFLASHD= $(ROOTETC)/flash diff --git a/usr/src/lib/efcode/interpreter/Makefile b/usr/src/lib/efcode/interpreter/Makefile index 24dd12ef3c..b8ee762d46 100644 --- a/usr/src/lib/efcode/interpreter/Makefile +++ b/usr/src/lib/efcode/interpreter/Makefile @@ -49,8 +49,6 @@ clean: install: all .WAIT $(ROOTCMD) -lint: lint_PROG - .KEEP_STATE: include $(SRC)/cmd/Makefile.targ diff --git a/usr/src/lib/extendedFILE/Makefile b/usr/src/lib/extendedFILE/Makefile index 927f5c41c8..78d5bbf061 100644 --- a/usr/src/lib/extendedFILE/Makefile +++ b/usr/src/lib/extendedFILE/Makefile @@ -22,9 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/extendedFILE/Makefile include ../Makefile.lib @@ -36,11 +33,10 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/extendedFILE/Makefile.com b/usr/src/lib/extendedFILE/Makefile.com index cbe5370c10..988e28680d 100644 --- a/usr/src/lib/extendedFILE/Makefile.com +++ b/usr/src/lib/extendedFILE/Makefile.com @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY = extendedFILE.a VERS = .1 @@ -46,9 +44,6 @@ DYNFLAGS += $(ZINTERPOSE) all: $(LIBS) -lint: - $(LINT.c) $(SRCS) $(LDLIBS) - $(DYNLIB): # include library targets diff --git a/usr/src/lib/fm/Makefile.subdirs b/usr/src/lib/fm/Makefile.subdirs index 3c8153f622..54c60a8d66 100644 --- a/usr/src/lib/fm/Makefile.subdirs +++ b/usr/src/lib/fm/Makefile.subdirs @@ -23,8 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" - .KEEP_STATE: all := TARGET += all @@ -33,9 +31,8 @@ clean := TARGET += clean clobber := TARGET += clobber install := TARGET += install install_h := TARGET += install_h -lint := TARGET += lint -all check clean clobber install install_h lint: $(SUBDIRS) +all check clean clobber install install_h: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; VERSION='$(VERSION)' $(MAKE) $(TARGET) diff --git a/usr/src/lib/fm/libdiagcode/Makefile b/usr/src/lib/fm/libdiagcode/Makefile index c6a223942a..dddb7758dc 100644 --- a/usr/src/lib/fm/libdiagcode/Makefile +++ b/usr/src/lib/fm/libdiagcode/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib include ../Makefile.lib @@ -38,12 +36,11 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint test := TARGET= test .KEEP_STATE: -all clean clobber install lint test: $(SUBDIRS) +all clean clobber install test: $(SUBDIRS) install_h: $(ROOTFMHDRS) diff --git a/usr/src/lib/fm/libdiagcode/Makefile.com b/usr/src/lib/fm/libdiagcode/Makefile.com index 6825f867ae..c534cee1bd 100644 --- a/usr/src/lib/fm/libdiagcode/Makefile.com +++ b/usr/src/lib/fm/libdiagcode/Makefile.com @@ -31,7 +31,7 @@ TSTOBJECTS = diagcode_test.o include ../../../Makefile.lib include ../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc CLOBBERFILES += test $(TSTOBJECTS) @@ -40,18 +40,12 @@ SRCDIR = ../common CFLAGS += $(CCVERBOSE) -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -$(LINTLIB) := LINTFLAGS = -nsvx -$(LINTLIB) := LINTFLAGS64 = -nsvx -m64 - .KEEP_STATE: all: install: -lint: lintcheck - test: $(TSTOBJECTS) $(PICS) $(LINK.c) -o $@ $(TSTOBJECTS) $(PICS) $(LDLIBS) ./test $(SRCDIR)/tests diff --git a/usr/src/lib/fm/libdiagcode/amd64/Makefile b/usr/src/lib/fm/libdiagcode/amd64/Makefile index d82d52e3a2..857d6be59c 100644 --- a/usr/src/lib/fm/libdiagcode/amd64/Makefile +++ b/usr/src/lib/fm/libdiagcode/amd64/Makefile @@ -23,11 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" include ../Makefile.com include ../../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libdiagcode/i386/Makefile b/usr/src/lib/fm/libdiagcode/i386/Makefile index 746a72389e..5da8e64ac5 100644 --- a/usr/src/lib/fm/libdiagcode/i386/Makefile +++ b/usr/src/lib/fm/libdiagcode/i386/Makefile @@ -23,10 +23,9 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libdiagcode/sparc/Makefile b/usr/src/lib/fm/libdiagcode/sparc/Makefile index 746a72389e..5da8e64ac5 100644 --- a/usr/src/lib/fm/libdiagcode/sparc/Makefile +++ b/usr/src/lib/fm/libdiagcode/sparc/Makefile @@ -23,10 +23,9 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libdiagcode/sparcv9/Makefile b/usr/src/lib/fm/libdiagcode/sparcv9/Makefile index d82d52e3a2..857d6be59c 100644 --- a/usr/src/lib/fm/libdiagcode/sparcv9/Makefile +++ b/usr/src/lib/fm/libdiagcode/sparcv9/Makefile @@ -23,11 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" include ../Makefile.com include ../../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libdiskstatus/Makefile b/usr/src/lib/fm/libdiskstatus/Makefile index b051273f20..c0b2da68de 100644 --- a/usr/src/lib/fm/libdiskstatus/Makefile +++ b/usr/src/lib/fm/libdiskstatus/Makefile @@ -22,7 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" include ../../Makefile.lib include ../Makefile.lib @@ -37,11 +36,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTFMHDRS) diff --git a/usr/src/lib/fm/libdiskstatus/Makefile.com b/usr/src/lib/fm/libdiskstatus/Makefile.com index c22e5808eb..1b1821a314 100644 --- a/usr/src/lib/fm/libdiskstatus/Makefile.com +++ b/usr/src/lib/fm/libdiskstatus/Makefile.com @@ -36,7 +36,7 @@ OBJECTS= libdiskstatus.o \ include ../../../Makefile.lib include ../../Makefile.lib -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) SRCDIR= ../common @@ -47,13 +47,9 @@ CPPFLAGS += $(INCS) # not linted SMATCH=off -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) - .KEEP_STATE: all: $(LIBS) -lint: lintcheck - include ../../../Makefile.targ include ../../Makefile.targ diff --git a/usr/src/lib/fm/libdiskstatus/i386/Makefile b/usr/src/lib/fm/libdiskstatus/i386/Makefile index 741cbcaecd..2845cd3c2d 100644 --- a/usr/src/lib/fm/libdiskstatus/i386/Makefile +++ b/usr/src/lib/fm/libdiskstatus/i386/Makefile @@ -22,8 +22,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libdiskstatus/sparc/Makefile b/usr/src/lib/fm/libdiskstatus/sparc/Makefile index 741cbcaecd..2845cd3c2d 100644 --- a/usr/src/lib/fm/libdiskstatus/sparc/Makefile +++ b/usr/src/lib/fm/libdiskstatus/sparc/Makefile @@ -22,8 +22,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libfmd_adm/Makefile b/usr/src/lib/fm/libfmd_adm/Makefile index a05449c6c5..7e1630fa8a 100644 --- a/usr/src/lib/fm/libfmd_adm/Makefile +++ b/usr/src/lib/fm/libfmd_adm/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib include ../Makefile.lib @@ -31,18 +29,17 @@ include ../Makefile.lib FMHDRS = fmd_adm.h HDRDIR = common -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber lint: $(SUBDIRS) +all clean clobber: $(SUBDIRS) install: install_h .WAIT $(SUBDIRS) diff --git a/usr/src/lib/fm/libfmd_adm/Makefile.com b/usr/src/lib/fm/libfmd_adm/Makefile.com index 6344075d73..6492244775 100644 --- a/usr/src/lib/fm/libfmd_adm/Makefile.com +++ b/usr/src/lib/fm/libfmd_adm/Makefile.com @@ -33,7 +33,7 @@ include ../../../Makefile.lib include ../../Makefile.lib SRCS = $(LIBSRCS:%.c=../common/%.c) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) CLEANFILES += fmd_rpc.c fmd_xdr.c fmd_rpc_adm.h fmd_rpc_adm.x SRCDIR = ../common @@ -44,19 +44,11 @@ CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS) CERRWARN += -_gcc=-Wno-unused-variable LDLIBS += -lnvpair -lnsl -lc -LINTFLAGS = -msux -LINTFLAGS64 = -msux -m64 - -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -$(LINTLIB) := LINTFLAGS = -nsvx -$(LINTLIB) := LINTFLAGS64 = -nsvx -m64 .KEEP_STATE: all: $(LIBS) -lint: $(LINTLIB) lintcheck - fmd_rpc_adm.x: $(SRC)/cmd/fm/fmd/common/fmd_rpc_adm.x $(RM) $@; $(CP) $? $@ diff --git a/usr/src/lib/fm/libfmd_adm/amd64/Makefile b/usr/src/lib/fm/libfmd_adm/amd64/Makefile index d7bfc90e79..9ebd5174c4 100644 --- a/usr/src/lib/fm/libfmd_adm/amd64/Makefile +++ b/usr/src/lib/fm/libfmd_adm/amd64/Makefile @@ -22,10 +22,8 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libfmd_adm/i386/Makefile b/usr/src/lib/fm/libfmd_adm/i386/Makefile index a333224278..282da97a76 100644 --- a/usr/src/lib/fm/libfmd_adm/i386/Makefile +++ b/usr/src/lib/fm/libfmd_adm/i386/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libfmd_adm/sparc/Makefile b/usr/src/lib/fm/libfmd_adm/sparc/Makefile index a333224278..282da97a76 100644 --- a/usr/src/lib/fm/libfmd_adm/sparc/Makefile +++ b/usr/src/lib/fm/libfmd_adm/sparc/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libfmd_adm/sparcv9/Makefile b/usr/src/lib/fm/libfmd_adm/sparcv9/Makefile index d7bfc90e79..9ebd5174c4 100644 --- a/usr/src/lib/fm/libfmd_adm/sparcv9/Makefile +++ b/usr/src/lib/fm/libfmd_adm/sparcv9/Makefile @@ -22,10 +22,8 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libfmd_agent/Makefile b/usr/src/lib/fm/libfmd_agent/Makefile index d5b1c4d4c5..2f557e9f2b 100644 --- a/usr/src/lib/fm/libfmd_agent/Makefile +++ b/usr/src/lib/fm/libfmd_agent/Makefile @@ -29,18 +29,17 @@ include ../Makefile.lib FMHDRS = fmd_agent.h HDRDIR = common -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber lint: $(SUBDIRS) +all clean clobber: $(SUBDIRS) install: install_h .WAIT $(SUBDIRS) diff --git a/usr/src/lib/fm/libfmd_agent/Makefile.com b/usr/src/lib/fm/libfmd_agent/Makefile.com index e9f8f8bc84..8592738889 100644 --- a/usr/src/lib/fm/libfmd_agent/Makefile.com +++ b/usr/src/lib/fm/libfmd_agent/Makefile.com @@ -33,7 +33,7 @@ include ../../../Makefile.lib include ../../Makefile.lib SRCS = ../common/fmd_agent.c ../$(MACH)/fmd_agent_$(MACH).c -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common @@ -42,12 +42,6 @@ CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS) CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS) LDLIBS += -lnvpair -lumem -lc -LINTFLAGS = -msux -LINTFLAGS64 = -msux -m64 - -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -$(LINTLIB) := LINTFLAGS = -nsvx -$(LINTLIB) := LINTFLAGS64 = -nsvx -m64 .KEEP_STATE: @@ -55,12 +49,7 @@ pics/%.o: ../$(MACH)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) -%.ln: ../$(MACH)/%.c - $(LINT.c) -o $@ $< - all: $(LIBS) -lint: $(LINTLIB) lintcheck - include ../../../Makefile.targ include ../../Makefile.targ diff --git a/usr/src/lib/fm/libfmd_agent/amd64/Makefile b/usr/src/lib/fm/libfmd_agent/amd64/Makefile index 92de54697e..c3c9b36567 100644 --- a/usr/src/lib/fm/libfmd_agent/amd64/Makefile +++ b/usr/src/lib/fm/libfmd_agent/amd64/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com include ../../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libfmd_agent/i386/Makefile b/usr/src/lib/fm/libfmd_agent/i386/Makefile index 7c23244ca8..09efe516c2 100644 --- a/usr/src/lib/fm/libfmd_agent/i386/Makefile +++ b/usr/src/lib/fm/libfmd_agent/i386/Makefile @@ -24,4 +24,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libfmd_agent/sparc/Makefile b/usr/src/lib/fm/libfmd_agent/sparc/Makefile index 7c23244ca8..09efe516c2 100644 --- a/usr/src/lib/fm/libfmd_agent/sparc/Makefile +++ b/usr/src/lib/fm/libfmd_agent/sparc/Makefile @@ -24,4 +24,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libfmd_agent/sparcv9/Makefile b/usr/src/lib/fm/libfmd_agent/sparcv9/Makefile index 92de54697e..c3c9b36567 100644 --- a/usr/src/lib/fm/libfmd_agent/sparcv9/Makefile +++ b/usr/src/lib/fm/libfmd_agent/sparcv9/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com include ../../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libfmd_log/Makefile b/usr/src/lib/fm/libfmd_log/Makefile index 03101f021b..a215b81f0a 100644 --- a/usr/src/lib/fm/libfmd_log/Makefile +++ b/usr/src/lib/fm/libfmd_log/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib include ../Makefile.lib @@ -31,18 +29,17 @@ include ../Makefile.lib FMHDRS = fmd_log.h HDRDIR = common -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber lint: $(SUBDIRS) +all clean clobber: $(SUBDIRS) install: install_h .WAIT $(SUBDIRS) diff --git a/usr/src/lib/fm/libfmd_log/Makefile.com b/usr/src/lib/fm/libfmd_log/Makefile.com index 6bdfd3bbe0..0b37647952 100644 --- a/usr/src/lib/fm/libfmd_log/Makefile.com +++ b/usr/src/lib/fm/libfmd_log/Makefile.com @@ -33,7 +33,7 @@ include ../../../Makefile.lib include ../../Makefile.lib SRCS = $(LIBSRCS:%.c=../common/%.c) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common @@ -43,19 +43,11 @@ CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS) CERRWARN += $(CNOWARN_UNINIT) LDLIBS += -lexacct -lnvpair -lgen -lc -LINTFLAGS = -msux -LINTFLAGS64 = -msux -m64 - -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -$(LINTLIB) := LINTFLAGS = -nsvx -$(LINTLIB) := LINTFLAGS64 = -nsvx -m64 .KEEP_STATE: all: $(LIBS) -lint: $(LINTLIB) lintcheck - pics/%.o: ../$(MACH)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) diff --git a/usr/src/lib/fm/libfmd_log/amd64/Makefile b/usr/src/lib/fm/libfmd_log/amd64/Makefile index d7bfc90e79..9ebd5174c4 100644 --- a/usr/src/lib/fm/libfmd_log/amd64/Makefile +++ b/usr/src/lib/fm/libfmd_log/amd64/Makefile @@ -22,10 +22,8 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libfmd_log/i386/Makefile b/usr/src/lib/fm/libfmd_log/i386/Makefile index a333224278..282da97a76 100644 --- a/usr/src/lib/fm/libfmd_log/i386/Makefile +++ b/usr/src/lib/fm/libfmd_log/i386/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libfmd_log/sparc/Makefile b/usr/src/lib/fm/libfmd_log/sparc/Makefile index a333224278..282da97a76 100644 --- a/usr/src/lib/fm/libfmd_log/sparc/Makefile +++ b/usr/src/lib/fm/libfmd_log/sparc/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libfmd_log/sparcv9/Makefile b/usr/src/lib/fm/libfmd_log/sparcv9/Makefile index d7bfc90e79..9ebd5174c4 100644 --- a/usr/src/lib/fm/libfmd_log/sparcv9/Makefile +++ b/usr/src/lib/fm/libfmd_log/sparcv9/Makefile @@ -22,10 +22,8 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libfmd_msg/Makefile b/usr/src/lib/fm/libfmd_msg/Makefile index d1a4ea590e..7f0ee6f127 100644 --- a/usr/src/lib/fm/libfmd_msg/Makefile +++ b/usr/src/lib/fm/libfmd_msg/Makefile @@ -29,19 +29,18 @@ include ../Makefile.lib FMHDRS = fmd_msg.h HDRDIR = common -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint test := TARGET = test .KEEP_STATE: -all clean clobber lint test: $(SUBDIRS) +all clean clobber test: $(SUBDIRS) install: install_h .WAIT $(SUBDIRS) diff --git a/usr/src/lib/fm/libfmd_msg/Makefile.com b/usr/src/lib/fm/libfmd_msg/Makefile.com index 471a550216..8b91946af2 100644 --- a/usr/src/lib/fm/libfmd_msg/Makefile.com +++ b/usr/src/lib/fm/libfmd_msg/Makefile.com @@ -34,7 +34,7 @@ include ../../../Makefile.lib include ../../Makefile.lib SRCS = $(LIBSRCS:%.c=../common/%.c) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common @@ -48,21 +48,13 @@ SMOFF += all_func_returns LDLIBS += -lnvpair -lc -LINTFLAGS = -msux -LINTFLAGS64 = -msux -m64 CLOBBERFILES += fmd_msg_test fmd_msg_test.core fmd_msg_test.out -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -$(LINTLIB) := LINTFLAGS = -nsvx -$(LINTLIB) := LINTFLAGS64 = -nsvx -m64 - .KEEP_STATE: all: $(LIBS) -lint: $(LINTLIB) lintcheck - include ../../../Makefile.targ include ../../Makefile.targ @@ -97,6 +89,5 @@ test: install fmd_msg_test @echo fmd_msg_test: $(SRCDIR)/fmd_msg_test.c - $(LINT.c) $(SRCDIR)/fmd_msg_test.c $(LINK.c) -o fmd_msg_test $(SRCDIR)/fmd_msg_test.c \ $(LDLIBS_$(TARGETMACH)) -lfmd_msg -lnvpair -lumem diff --git a/usr/src/lib/fm/libfmd_msg/amd64/Makefile b/usr/src/lib/fm/libfmd_msg/amd64/Makefile index a2f97019c8..5cf65c4171 100644 --- a/usr/src/lib/fm/libfmd_msg/amd64/Makefile +++ b/usr/src/lib/fm/libfmd_msg/amd64/Makefile @@ -22,10 +22,8 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libfmd_msg/i386/Makefile b/usr/src/lib/fm/libfmd_msg/i386/Makefile index f91f0270e9..2845cd3c2d 100644 --- a/usr/src/lib/fm/libfmd_msg/i386/Makefile +++ b/usr/src/lib/fm/libfmd_msg/i386/Makefile @@ -22,9 +22,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libfmd_msg/sparc/Makefile b/usr/src/lib/fm/libfmd_msg/sparc/Makefile index f91f0270e9..2845cd3c2d 100644 --- a/usr/src/lib/fm/libfmd_msg/sparc/Makefile +++ b/usr/src/lib/fm/libfmd_msg/sparc/Makefile @@ -22,9 +22,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libfmd_msg/sparcv9/Makefile b/usr/src/lib/fm/libfmd_msg/sparcv9/Makefile index a2f97019c8..5cf65c4171 100644 --- a/usr/src/lib/fm/libfmd_msg/sparcv9/Makefile +++ b/usr/src/lib/fm/libfmd_msg/sparcv9/Makefile @@ -22,10 +22,8 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libfmd_snmp/Makefile b/usr/src/lib/fm/libfmd_snmp/Makefile index c73060ee5f..9589936bda 100644 --- a/usr/src/lib/fm/libfmd_snmp/Makefile +++ b/usr/src/lib/fm/libfmd_snmp/Makefile @@ -29,7 +29,7 @@ include ../Makefile.lib FMHDRS = fmd_snmp.h HDRDIR = common -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) MIBFILES = SUN-FM-MIB.mib SUN-IREPORT-MIB.mib @@ -44,11 +44,10 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all lint clean clobber: $(SUBDIRS) +all clean clobber: $(SUBDIRS) install: install_h install_mibs .WAIT $(SUBDIRS) diff --git a/usr/src/lib/fm/libfmd_snmp/amd64/Makefile b/usr/src/lib/fm/libfmd_snmp/amd64/Makefile index 90f182e191..9cdb9ed123 100644 --- a/usr/src/lib/fm/libfmd_snmp/amd64/Makefile +++ b/usr/src/lib/fm/libfmd_snmp/amd64/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# MACH_LDLIBS = -L$(ROOT)/usr/lib/fm/$(MACH64) @@ -32,4 +30,4 @@ include ../../../Makefile.lib.64 DYNFLAGS += -R/usr/lib/fm/$(MACH64) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libfmd_snmp/i386/Makefile b/usr/src/lib/fm/libfmd_snmp/i386/Makefile index 2a905ab007..bcf3356f62 100644 --- a/usr/src/lib/fm/libfmd_snmp/i386/Makefile +++ b/usr/src/lib/fm/libfmd_snmp/i386/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# MACH_LDLIBS = -L$(ROOT)/usr/lib/fm @@ -31,4 +29,4 @@ include ../Makefile.com DYNFLAGS += -R/usr/lib/fm -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libfmd_snmp/sparc/Makefile b/usr/src/lib/fm/libfmd_snmp/sparc/Makefile index 2a905ab007..bcf3356f62 100644 --- a/usr/src/lib/fm/libfmd_snmp/sparc/Makefile +++ b/usr/src/lib/fm/libfmd_snmp/sparc/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# MACH_LDLIBS = -L$(ROOT)/usr/lib/fm @@ -31,4 +29,4 @@ include ../Makefile.com DYNFLAGS += -R/usr/lib/fm -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libfmd_snmp/sparcv9/Makefile b/usr/src/lib/fm/libfmd_snmp/sparcv9/Makefile index 90f182e191..9cdb9ed123 100644 --- a/usr/src/lib/fm/libfmd_snmp/sparcv9/Makefile +++ b/usr/src/lib/fm/libfmd_snmp/sparcv9/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# MACH_LDLIBS = -L$(ROOT)/usr/lib/fm/$(MACH64) @@ -32,4 +30,4 @@ include ../../../Makefile.lib.64 DYNFLAGS += -R/usr/lib/fm/$(MACH64) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libfmevent/Makefile b/usr/src/lib/fm/libfmevent/Makefile index 909ee5b01e..263d54e9f6 100644 --- a/usr/src/lib/fm/libfmevent/Makefile +++ b/usr/src/lib/fm/libfmevent/Makefile @@ -38,18 +38,17 @@ ROOTLIBDIR64= $(ROOTFS_LIBDIR)/fm/$(MACH64) FMHDRS = libfmevent.h libfmevent_ruleset.h HDRDIR = common -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber lint: $(SUBDIRS) +all clean clobber: $(SUBDIRS) install: install_h .WAIT $(SUBDIRS) diff --git a/usr/src/lib/fm/libfmevent/Makefile.com b/usr/src/lib/fm/libfmevent/Makefile.com index 81352b3076..8ea99e219d 100644 --- a/usr/src/lib/fm/libfmevent/Makefile.com +++ b/usr/src/lib/fm/libfmevent/Makefile.com @@ -47,7 +47,7 @@ ROOTLIBDIR= $(ROOTFS_LIBDIR)/fm ROOTLIBDIR64= $(ROOTFS_LIBDIR)/fm/$(MACH64) SRCS = $(LIBSRCS:%.c=../common/%.c) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common @@ -72,21 +72,28 @@ $(DYNLIB) := LDLIBS += -lumem -lnvpair -luutil -lsysevent \ $(BUILD64)$(DYNLIB) := LDLIBS64 += -lumem -lnvpair -luutil -lsysevent \ -L$(ROOT)/$(FMLIBDIR64) -ltopo -lc -LINTFLAGS = -msux -LINTFLAGS64 = -msux -m64 - -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -$(LINTLIB) := LINTFLAGS = -nsvx -$(LINTLIB) := LINTFLAGS64 = -nsvx -m64 CLEANFILES += ../common/fmev_errstring.c +COMPATLINKS = usr/lib/fm/$(DYNLIB) \ + usr/lib/fm/$(LIBLINKS) + +COMPATLINKS64 = usr/lib/fm/$(MACH64)/$(DYNLIB) \ + usr/lib/fm/$(MACH64)/$(LIBLINKS) + +$(ROOT)/usr/lib/fm/libfmevent.so.1 := \ + COMPATLINKTARGET=../../../lib/fm/libfmevent.so.1 +$(ROOT)/usr/lib/fm/libfmevent.so := \ + COMPATLINKTARGET=../../../lib/fm/libfmevent.so.1 +$(ROOT)/usr/lib/fm/$(MACH64)/libfmevent.so.1:= \ + COMPATLINKTARGET=../../../../lib/fm/$(MACH64)/libfmevent.so.1 +$(ROOT)/usr/lib/fm/$(MACH64)/libfmevent.so:= \ + COMPATLINKTARGET=../../../../lib/fm/$(MACH64)/libfmevent.so.1 + .KEEP_STATE: all: $(LIBS) -lint: $(LINTLIB) lintcheck - pics/%.o: ../$(MACH)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) diff --git a/usr/src/lib/fm/libfmevent/amd64/Makefile b/usr/src/lib/fm/libfmevent/amd64/Makefile index 0efa16d7ae..e3196f9733 100644 --- a/usr/src/lib/fm/libfmevent/amd64/Makefile +++ b/usr/src/lib/fm/libfmevent/amd64/Makefile @@ -27,4 +27,4 @@ include ../../../Makefile.lib.64 DYNFLAGS += -R/usr/lib/fm/$(MACH64) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/fm/libfmevent/i386/Makefile b/usr/src/lib/fm/libfmevent/i386/Makefile index 1b8b367f7c..36ac38389b 100644 --- a/usr/src/lib/fm/libfmevent/i386/Makefile +++ b/usr/src/lib/fm/libfmevent/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com DYNFLAGS += -R/usr/lib/fm -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/fm/libfmevent/sparc/Makefile b/usr/src/lib/fm/libfmevent/sparc/Makefile index 1b8b367f7c..36ac38389b 100644 --- a/usr/src/lib/fm/libfmevent/sparc/Makefile +++ b/usr/src/lib/fm/libfmevent/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com DYNFLAGS += -R/usr/lib/fm -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/fm/libfmevent/sparcv9/Makefile b/usr/src/lib/fm/libfmevent/sparcv9/Makefile index 0efa16d7ae..e3196f9733 100644 --- a/usr/src/lib/fm/libfmevent/sparcv9/Makefile +++ b/usr/src/lib/fm/libfmevent/sparcv9/Makefile @@ -27,4 +27,4 @@ include ../../../Makefile.lib.64 DYNFLAGS += -R/usr/lib/fm/$(MACH64) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/fm/libfmnotify/Makefile b/usr/src/lib/fm/libfmnotify/Makefile index 645e65ace4..c9c0d8bbdf 100644 --- a/usr/src/lib/fm/libfmnotify/Makefile +++ b/usr/src/lib/fm/libfmnotify/Makefile @@ -26,19 +26,18 @@ include ../../Makefile.lib include ../Makefile.lib -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint test := TARGET = test .KEEP_STATE: -all clean clobber lint test: $(SUBDIRS) +all clean clobber test: $(SUBDIRS) install: $(SUBDIRS) diff --git a/usr/src/lib/fm/libfmnotify/Makefile.com b/usr/src/lib/fm/libfmnotify/Makefile.com index d6a60e6fb1..61de9ecef1 100644 --- a/usr/src/lib/fm/libfmnotify/Makefile.com +++ b/usr/src/lib/fm/libfmnotify/Makefile.com @@ -33,7 +33,7 @@ include ../../../Makefile.lib include ../../Makefile.lib SRCS = $(LIBSRCS:%.c=../common/%.c) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common @@ -46,18 +46,10 @@ CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS) $(DYNLIB) := LDLIBS += $(MACH_LDLIBS) $(DYNLIB) := LDLIBS += -lnvpair -lc -lfmd_msg -lfmevent -lscf -ldiagcode -LINTFLAGS = -msux -LINTFLAGS64 = -msux -m64 - -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -$(LINTLIB) := LINTFLAGS = -nsvx -$(LINTLIB) := LINTFLAGS64 = -nsvx -m64 .KEEP_STATE: all: $(LIBS) -lint: $(LINTLIB) lintcheck - include ../../../Makefile.targ include ../../Makefile.targ diff --git a/usr/src/lib/fm/libfmnotify/amd64/Makefile b/usr/src/lib/fm/libfmnotify/amd64/Makefile index f0d686dced..e070d1346b 100644 --- a/usr/src/lib/fm/libfmnotify/amd64/Makefile +++ b/usr/src/lib/fm/libfmnotify/amd64/Makefile @@ -28,4 +28,4 @@ include ../../../Makefile.lib.64 DYNFLAGS += -R/usr/lib/fm/$(MACH64) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libfmnotify/i386/Makefile b/usr/src/lib/fm/libfmnotify/i386/Makefile index 4e86c1ee6b..1b80409fdf 100644 --- a/usr/src/lib/fm/libfmnotify/i386/Makefile +++ b/usr/src/lib/fm/libfmnotify/i386/Makefile @@ -24,7 +24,7 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) MACH_LDLIBS = -L$(ROOT)/usr/lib/fm diff --git a/usr/src/lib/fm/libfmnotify/sparc/Makefile b/usr/src/lib/fm/libfmnotify/sparc/Makefile index 686815ee32..e2c5373839 100644 --- a/usr/src/lib/fm/libfmnotify/sparc/Makefile +++ b/usr/src/lib/fm/libfmnotify/sparc/Makefile @@ -24,7 +24,7 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) MACH_LDLIBS = -L$(ROOT)/usr/lib/fm diff --git a/usr/src/lib/fm/libfmnotify/sparcv9/Makefile b/usr/src/lib/fm/libfmnotify/sparcv9/Makefile index c8c3d93095..b2435f5f59 100644 --- a/usr/src/lib/fm/libfmnotify/sparcv9/Makefile +++ b/usr/src/lib/fm/libfmnotify/sparcv9/Makefile @@ -29,4 +29,4 @@ include ../../../Makefile.lib.64 DYNFLAGS += -R/usr/lib/fm/$(MACH64) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libldom/sparc/Makefile b/usr/src/lib/fm/libldom/sparc/Makefile index 1f0c37cf36..1f81c94cba 100644 --- a/usr/src/lib/fm/libldom/sparc/Makefile +++ b/usr/src/lib/fm/libldom/sparc/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com DYNFLAGS += -R/usr/lib/fm -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libldom/sparcv9/Makefile b/usr/src/lib/fm/libldom/sparcv9/Makefile index 1c53dcd407..c641c73a5c 100644 --- a/usr/src/lib/fm/libldom/sparcv9/Makefile +++ b/usr/src/lib/fm/libldom/sparcv9/Makefile @@ -30,4 +30,4 @@ include ../../../Makefile.lib.64 DYNFLAGS += -R/usr/lib/fm/$(MACH64) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libmdesc/Makefile b/usr/src/lib/fm/libmdesc/Makefile index 8d529ad6b7..a3c7959a98 100644 --- a/usr/src/lib/fm/libmdesc/Makefile +++ b/usr/src/lib/fm/libmdesc/Makefile @@ -22,27 +22,24 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib include ../Makefile.lib -FMHDRS = +FMHDRS = HDRDIR = common -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber lint: $(SUBDIRS) +all clean clobber: $(SUBDIRS) install: install_h .WAIT $(SUBDIRS) diff --git a/usr/src/lib/fm/libmdesc/Makefile.com b/usr/src/lib/fm/libmdesc/Makefile.com index c09447e182..bdc979605c 100644 --- a/usr/src/lib/fm/libmdesc/Makefile.com +++ b/usr/src/lib/fm/libmdesc/Makefile.com @@ -45,7 +45,7 @@ include ../../Makefile.lib SRCS = $(LIBSRCS:%.c=$(SRC)/common/mdesc/%.c) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common @@ -54,24 +54,14 @@ CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS) CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS64) LDLIBS += -lc -LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN -v -LINTFLAGS64 += -erroff=E_BAD_PTR_CAST_ALIGN -v -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -$(LINTLIB) := LINTFLAGS = -nsvx -$(LINTLIB) := LINTFLAGS64 = -nsvx -m64 .KEEP_STATE: all: $(LIBS) -lint: $(LINTLIB) lintcheck - pics/%.o: $(SRC)/common/mdesc/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) -%.ln: $(SRC)/common/mdesc/%.c - $(LINT.c) -o $@ $< - include ../../../Makefile.targ include ../../Makefile.targ diff --git a/usr/src/lib/fm/libmdesc/sparc/Makefile b/usr/src/lib/fm/libmdesc/sparc/Makefile index a333224278..282da97a76 100644 --- a/usr/src/lib/fm/libmdesc/sparc/Makefile +++ b/usr/src/lib/fm/libmdesc/sparc/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libmdesc/sparcv9/Makefile b/usr/src/lib/fm/libmdesc/sparcv9/Makefile index d7bfc90e79..9ebd5174c4 100644 --- a/usr/src/lib/fm/libmdesc/sparcv9/Makefile +++ b/usr/src/lib/fm/libmdesc/sparcv9/Makefile @@ -22,10 +22,8 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libseslog/Makefile b/usr/src/lib/fm/libseslog/Makefile index ee92d39246..dc6dda12c2 100644 --- a/usr/src/lib/fm/libseslog/Makefile +++ b/usr/src/lib/fm/libseslog/Makefile @@ -35,11 +35,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTFMHDRS) diff --git a/usr/src/lib/fm/libseslog/Makefile.com b/usr/src/lib/fm/libseslog/Makefile.com index 81beeab149..f5d0cffd0a 100644 --- a/usr/src/lib/fm/libseslog/Makefile.com +++ b/usr/src/lib/fm/libseslog/Makefile.com @@ -32,7 +32,7 @@ OBJECTS= libseslog.o include ../../../Makefile.lib include ../../Makefile.lib -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) SRCDIR= ../common @@ -43,13 +43,9 @@ CPPFLAGS += $(INCS) # not linted SMATCH=off -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) - .KEEP_STATE: all: $(LIBS) -lint: lintcheck - include ../../../Makefile.targ include ../../Makefile.targ diff --git a/usr/src/lib/fm/libseslog/i386/Makefile b/usr/src/lib/fm/libseslog/i386/Makefile index d52ed62515..aca2105e57 100644 --- a/usr/src/lib/fm/libseslog/i386/Makefile +++ b/usr/src/lib/fm/libseslog/i386/Makefile @@ -24,4 +24,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libseslog/sparc/Makefile b/usr/src/lib/fm/libseslog/sparc/Makefile index d0e9303902..68ca1b3183 100644 --- a/usr/src/lib/fm/libseslog/sparc/Makefile +++ b/usr/src/lib/fm/libseslog/sparc/Makefile @@ -22,4 +22,4 @@ # include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/topo/libtopo/amd64/Makefile b/usr/src/lib/fm/topo/libtopo/amd64/Makefile index 2506edb291..8e6904022e 100644 --- a/usr/src/lib/fm/topo/libtopo/amd64/Makefile +++ b/usr/src/lib/fm/topo/libtopo/amd64/Makefile @@ -22,12 +22,10 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../../../Makefile.lib.64 LDLIBS += -lzfs -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/topo/libtopo/i386/Makefile b/usr/src/lib/fm/topo/libtopo/i386/Makefile index cd8a4643d9..f510e2a2f4 100644 --- a/usr/src/lib/fm/topo/libtopo/i386/Makefile +++ b/usr/src/lib/fm/topo/libtopo/i386/Makefile @@ -22,11 +22,9 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com LDLIBS += -lzfs -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/topo/libtopo/sparc/Makefile b/usr/src/lib/fm/topo/libtopo/sparc/Makefile index 976e50cd5f..1ed4f42d3b 100644 --- a/usr/src/lib/fm/topo/libtopo/sparc/Makefile +++ b/usr/src/lib/fm/topo/libtopo/sparc/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" -# include ../Makefile.com @@ -32,4 +30,4 @@ LDLIBS += -L$(ROOTLIBDIR) LDLIBS += -lzfs -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/topo/libtopo/sparcv9/Makefile b/usr/src/lib/fm/topo/libtopo/sparcv9/Makefile index 9a45e99e29..7987e15fa0 100644 --- a/usr/src/lib/fm/topo/libtopo/sparcv9/Makefile +++ b/usr/src/lib/fm/topo/libtopo/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" -# include ../Makefile.com include ../../../../Makefile.lib.64 @@ -33,4 +31,4 @@ LDLIBS += -L$(ROOTLIBDIR64) LDLIBS += -lzfs -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/topo/maps/Makefile.map b/usr/src/lib/fm/topo/maps/Makefile.map index 0ed01490ec..643595b88c 100644 --- a/usr/src/lib/fm/topo/maps/Makefile.map +++ b/usr/src/lib/fm/topo/maps/Makefile.map @@ -81,17 +81,17 @@ clean: clobber: clean $(RM) $(CLOBBERFILES) -check: $(CHECKHDRS) +check: $(CHECKHDRS) $(TOPOFILE:%=%.chk) install_h _msg: -lint: $(TOPOFILE:%=%.chk) - %.xml.chk: %.xml @echo xmllint $< @xmllint --dropdtd $< | \ xmllint --noout --dtdvalid $(DTDSRC) - +%.usbtopo.chk: %.usbtopo + $($(CLASS)_ROOTTOPOROOT)/%: % $(INS.file) diff --git a/usr/src/lib/fm/topo/modules/Makefile.plugin b/usr/src/lib/fm/topo/modules/Makefile.plugin index bbd7cb76e7..a1827911a5 100644 --- a/usr/src/lib/fm/topo/modules/Makefile.plugin +++ b/usr/src/lib/fm/topo/modules/Makefile.plugin @@ -55,9 +55,6 @@ arch_ROOTCONF = $(ROOT)/usr/platform/$(ARCH)/lib/fm/topo/plugins/$(CONF) plat_ROOTCONF = $(PLATFORMS:%=$(ROOT)/usr/platform/%/lib/fm/topo/plugins/$(CONF)) ROOTCONF = $($(CLASS)_ROOTCONF) -LINTFLAGS = -msux -LINTFILES = $(MODULESRCS:%.c=%.ln) $(SHAREDSRCS:%.c=%.ln) - CERRWARN += $(CNOWARN_UNINIT) CERRWARN += -_gcc=-Wno-parentheses @@ -77,7 +74,7 @@ DYNFLAGS += -R/usr/lib/fm all: $(PROG) .NO_PARALLEL: -.PARALLEL: $(OBJS) $(LINTFILES) +.PARALLEL: $(OBJS) $(PROG): $(OBJS) $(APIMAP) $(LINK.c) $(DYNFLAGS) $(OBJS) -o $@ $(LDLIBS) @@ -97,23 +94,11 @@ $(PROG): $(OBJS) $(APIMAP) $(CTFCONVERT_O) clean: - $(RM) $(OBJS) $(LINTFILES) $(CLEANFILES) + $(RM) $(OBJS) $(CLEANFILES) clobber: clean $(RM) $(PROG) $(CLOBBERFILES) -%.ln: ../../common/$(MODULE)/%.c - $(LINT.c) -c $< - -%.ln: ../../common/$(SHAREDMODULE)/%.c - $(LINT.c) -c $< - -%.ln: %.c - $(LINT.c) -c $< - -lint: $(LINTFILES) - $(LINT) $(LINTFLAGS) $(LINTFILES) $(LDLIBS) - check: $(CHECKHDRS) install_h: diff --git a/usr/src/lib/fm/topo/modules/i86pc/hostbridge/Makefile b/usr/src/lib/fm/topo/modules/i86pc/hostbridge/Makefile index bc9e4471fb..2512835499 100644 --- a/usr/src/lib/fm/topo/modules/i86pc/hostbridge/Makefile +++ b/usr/src/lib/fm/topo/modules/i86pc/hostbridge/Makefile @@ -45,10 +45,3 @@ CPPFLAGS += -I$(UTILDIR) -I$(HBDIR) %.o: $(HBDIR)/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) - -%.ln: $(UTILDIR)/%.c - $(LINT.c) -c $< - -%.ln: $(HBDIR)/%.c - $(LINT.c) -c $< - diff --git a/usr/src/lib/fm/topo/modules/i86pc/x86pi/Makefile b/usr/src/lib/fm/topo/modules/i86pc/x86pi/Makefile index 15cfd1a5ad..fcf55fb960 100644 --- a/usr/src/lib/fm/topo/modules/i86pc/x86pi/Makefile +++ b/usr/src/lib/fm/topo/modules/i86pc/x86pi/Makefile @@ -50,6 +50,3 @@ CPPFLAGS += -I$(UTILDIR) -I$(BRDIR) -I$(USBDIR) %.o: $(UTILDIR)/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) - -%.ln: $(UTILDIR)/%.c - $(LINT.c) -c $< diff --git a/usr/src/lib/fm/topo/modules/sun4/chip/Makefile.chip b/usr/src/lib/fm/topo/modules/sun4/chip/Makefile.chip index b8bf7c87d9..473518739f 100644 --- a/usr/src/lib/fm/topo/modules/sun4/chip/Makefile.chip +++ b/usr/src/lib/fm/topo/modules/sun4/chip/Makefile.chip @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" - MODULE = chip CLASS = arch SUN4DIR = ../../sun4/$(MODULE) @@ -38,6 +36,3 @@ CPPFLAGS += $(INCDIRS:%=-I%) %.o: $(SUN4DIR)/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) - -%.ln: $(SUN4DIR)/%.c - $(LINT.c) -c $< diff --git a/usr/src/lib/fm/topo/modules/sun4/hostbridge/Makefile.hb b/usr/src/lib/fm/topo/modules/sun4/hostbridge/Makefile.hb index 342b44cb6d..287c845354 100644 --- a/usr/src/lib/fm/topo/modules/sun4/hostbridge/Makefile.hb +++ b/usr/src/lib/fm/topo/modules/sun4/hostbridge/Makefile.hb @@ -44,9 +44,3 @@ CPPFLAGS += -I$(SUN4DIR) -I$(UTILDIR) -I$(HBDIR) %.o: $(UTILDIR)/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) - -%.ln: $(SUN4DIR)/%.c - $(LINT.c) -c $< - -%.ln: $(UTILDIR)/%.c - $(LINT.c) -c $< diff --git a/usr/src/lib/fm/topo/modules/sun4/ioboard/Makefile.iob b/usr/src/lib/fm/topo/modules/sun4/ioboard/Makefile.iob index 63d42105d3..b86ee55548 100644 --- a/usr/src/lib/fm/topo/modules/sun4/ioboard/Makefile.iob +++ b/usr/src/lib/fm/topo/modules/sun4/ioboard/Makefile.iob @@ -44,9 +44,3 @@ CPPFLAGS += -I$(UTILDIR) -I$(HBDIR) -I$(SUN4DIR) %.o: $(SUN4DIR)/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) - -%.ln: $(UTILDIR)/%.c - $(LINT.c) -c $< - -%.ln: $(SUN4DIR)/%.c - $(LINT.c) -c $< diff --git a/usr/src/lib/fm/topo/modules/sun4/pcibus/Makefile.pci b/usr/src/lib/fm/topo/modules/sun4/pcibus/Makefile.pci index 0600e71993..0a80dbf19a 100644 --- a/usr/src/lib/fm/topo/modules/sun4/pcibus/Makefile.pci +++ b/usr/src/lib/fm/topo/modules/sun4/pcibus/Makefile.pci @@ -48,9 +48,3 @@ CPPFLAGS += -I$(SUN4DIR) -I$(UTILDIR) -I$(HBDIR) -I$(NICDIR) -I$(USBDIR) %.o: $(UTILDIR)/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) - -%.ln: $(SUN4DIR)/%.c - $(LINT.c) -c $< - -%.ln: $(UTILDIR)/%.c - $(LINT.c) -c $< diff --git a/usr/src/lib/fm/topo/modules/sun4v/chip/Makefile b/usr/src/lib/fm/topo/modules/sun4v/chip/Makefile index 4593a1e970..c2d3d85d4a 100644 --- a/usr/src/lib/fm/topo/modules/sun4v/chip/Makefile +++ b/usr/src/lib/fm/topo/modules/sun4v/chip/Makefile @@ -40,12 +40,6 @@ LDLIBS += -lumem -lmdesc -lldom $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) -%.ln: $(PRIDIR)/%.c - $(LINT.c) -c $< - %.o: $(PIDIR)/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) - -%.ln: $(PIDIR)/%.c - $(LINT.c) -c $< diff --git a/usr/src/lib/fm/topo/modules/sun4v/dimm/Makefile b/usr/src/lib/fm/topo/modules/sun4v/dimm/Makefile index 26add89806..20c0db5cbe 100644 --- a/usr/src/lib/fm/topo/modules/sun4v/dimm/Makefile +++ b/usr/src/lib/fm/topo/modules/sun4v/dimm/Makefile @@ -49,9 +49,6 @@ CPPFLAGS += $(INCDIRS:%=-I%) $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) -%.ln: $(SUN4DIR)/%.c - $(LINT.c) -c $< - # end of what would be body of ../../sun4/mem/Makefile.mem LDLIBS += -lumem -lmdesc -lldom @@ -59,12 +56,6 @@ LDLIBS += -lumem -lmdesc -lldom $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) -%.ln: $(PRIDIR)/%.c - $(LINT.c) -c $< - %.o: $(PIDIR)/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) - -%.ln: $(PIDIR)/%.c - $(LINT.c) -c $< diff --git a/usr/src/lib/getloginx/Makefile b/usr/src/lib/getloginx/Makefile index eb6ceec526..624062c01f 100644 --- a/usr/src/lib/getloginx/Makefile +++ b/usr/src/lib/getloginx/Makefile @@ -34,11 +34,10 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/getloginx/Makefile.com b/usr/src/lib/getloginx/Makefile.com index c72a450862..f780bc2857 100644 --- a/usr/src/lib/getloginx/Makefile.com +++ b/usr/src/lib/getloginx/Makefile.com @@ -46,9 +46,6 @@ DYNFLAGS += $(ZINTERPOSE) all: $(LIBS) -lint: - $(LINT.c) $(SRCS) $(LDLIBS) - # include library targets include ../../Makefile.targ diff --git a/usr/src/lib/gss_mechs/mech_dh/Makefile b/usr/src/lib/gss_mechs/mech_dh/Makefile index 7a992970ab..c25e99a230 100644 --- a/usr/src/lib/gss_mechs/mech_dh/Makefile +++ b/usr/src/lib/gss_mechs/mech_dh/Makefile @@ -20,27 +20,22 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1997, by Sun Microsystems, Inc. # All rights reserved. # -# lib/gss_mechs/mech_dh/Makefile -# -SUBDIRS= backend .WAIT dh192 dh640 dh1024 +SUBDIRS= backend .WAIT dh192 dh640 dh1024 MSGSUBDIRS = backend all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all clean clobber lint: $(SUBDIRS) +all clean clobber: $(SUBDIRS) install: $(SUBDIRS) diff --git a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile index 8640e0d68c..5854be0a30 100644 --- a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile +++ b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile @@ -47,7 +47,6 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint catalog := TARGET= catalog package := TARGET= package _msg := TARGET= _msg @@ -57,7 +56,7 @@ all: $(DERIVED_FILES) .WAIT $(SUBDIRS) install: $(DERIVED_FILES) .WAIT $(SUBDIRS) -clean clobber delete lint catalog package: $(SUBDIRS) +clean clobber delete catalog package: $(SUBDIRS) # # Rules for building the derived files diff --git a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com index 5c527bd27d..7943530d91 100644 --- a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com +++ b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com @@ -27,7 +27,7 @@ # # This make file will build mech_dh.so.1. This shared object # contains all the functionality needed to support Diffie-Hellman GSS-API -# mechanism. +# mechanism. # LIBRARY= mech_dh.a @@ -54,8 +54,8 @@ CERRWARN += $(CNOWARN_UNINIT) # needs work SMATCH=off -$(PICS) := CFLAGS += $(XFFLAG) -$(PICS) := CCFLAGS += $(XFFLAG) +$(PICS) := CFLAGS += $(XFFLAG) +$(PICS) := CCFLAGS += $(XFFLAG) $(PICS) := CFLAGS64 += $(XFFLAG) $(PICS) := CCFLAGS64 += $(XFFLAG) @@ -66,7 +66,7 @@ LIBNAME = $(LIBRARY:%.a=%) MAPFILES = ../mapfile-vers -LDLIBS += -lgss -lnsl -lc +LDLIBS += -lgss -lnsl -lc RPCGEN += -C SED = sed @@ -79,17 +79,6 @@ SRCS= $(CSRCS) ROOTLIBDIR = $(ROOT)/usr/lib/gss ROOTLIBDIR64 = $(ROOT)/usr/lib/$(MACH64)/gss -#LINTFLAGS += -dirout=lint -errfmt=simple -#LINTFLAGS64 += -dirout=lint -errfmt=simple -errchk all -LINTOUT = lint.out -LINTSRC = $(LINTLIB:%.ln=%) -ROOTLINTDIR = $(ROOTLIBDIR) -#ROOTLINT = $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES += $(LINTOUT) $(LINTLIB) - -lint: lintcheck - $(ROOTLIBDIR): $(INS.dir) diff --git a/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile b/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile index 15006b3deb..c4fbf0cca8 100644 --- a/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile +++ b/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile @@ -39,16 +39,11 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint catalog := TARGET= catalog package := TARGET= package .KEEP_STATE: -all: $(SUBDIRS) - -install: $(SUBDIRS) - -clean clobber delete lint catalog package: $(SUBDIRS) +all install clean clobber delete catalog package: $(SUBDIRS) # include library targets include ../../../Makefile.targ diff --git a/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile.com b/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile.com index ddb5828231..d041e6067d 100644 --- a/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile.com +++ b/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile.com @@ -26,7 +26,7 @@ # # This make file will build dh1024.so.1. This shared object # contains the functionality needed to initialize the Diffie-Hellman GSS-API -# mechanism with 1024 bit key length. This library, in turn, loads the +# mechanism with 1024 bit key length. This library, in turn, loads the # generic Diffie-Hellman GSS-API backend, dhmech.so # @@ -35,7 +35,7 @@ VERS = .1 DH1024= dh1024.o dh_common.o generic_key.o -OBJECTS= $(DH1024) +OBJECTS= $(DH1024) # include library definitions include ../../../../Makefile.lib @@ -44,8 +44,8 @@ CPPFLAGS += -I../../backend/mech -I../../backend/crypto CPPFLAGS += -I$(SRC)/lib/libnsl/include CPPFLAGS += -I$(SRC)/uts/common/gssapi/include -$(PICS) := CFLAGS += $(XFFLAG) -$(PICS) := CCFLAGS += $(XFFLAG) +$(PICS) := CFLAGS += $(XFFLAG) +$(PICS) := CCFLAGS += $(XFFLAG) $(PICS) := CFLAGS64 += $(XFFLAG) $(PICS) := CCFLAGS64 += $(XFFLAG) @@ -65,17 +65,6 @@ SRCS= ../dh1024.c ../../dh_common/dh_common.c ../../dh_common/generic_key.c ROOTLIBDIR = $(ROOT)/usr/lib/gss ROOTLIBDIR64 = $(ROOT)/usr/lib/$(MACH64)/gss -#LINTFLAGS += -errfmt=simple -#LINTFLAGS64 += -errfmt=simple -LINTOUT = lint.out -LINTSRC = $(LINTLIB:%.ln=%) -ROOTLINTDIR = $(ROOTLIBDIR) -#ROOTLINT = $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES += $(LINTOUT) $(LINTLIB) - -lint: lintcheck - $(ROOTLIBDIR): $(INS.dir) diff --git a/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile b/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile index adef19508b..a65ee24611 100644 --- a/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile +++ b/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile @@ -39,7 +39,6 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint catalog := TARGET= catalog package := TARGET= package @@ -48,7 +47,7 @@ all: $(SUBDIRS) install: $(SUBDIRS) -clean clobber delete lint catalog package: $(SUBDIRS) +clean clobber delete catalog package: $(SUBDIRS) # include library targets include ../../../Makefile.targ diff --git a/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile.com b/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile.com index 2019a1a955..5b38cae4e3 100644 --- a/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile.com +++ b/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile.com @@ -26,7 +26,7 @@ # # This make file will build dh192.so.1. This shared object # contains the functionality needed to initialize the Diffie-Hellman GSS-API -# mechanism with 192 bit key length. This library, in turn, loads the +# mechanism with 192 bit key length. This library, in turn, loads the # generic Diffie-Hellman GSS-API backend, dhmech.so # @@ -44,8 +44,8 @@ CPPFLAGS += -I../../backend/mech -I../../backend/crypto CPPFLAGS += -I$(SRC)/lib/libnsl/include CPPFLAGS += -I$(SRC)/uts/common/gssapi/include -$(PICS) := CFLAGS += $(XFFLAG) -$(PICS) := CCFLAGS += $(XFFLAG) +$(PICS) := CFLAGS += $(XFFLAG) +$(PICS) := CCFLAGS += $(XFFLAG) $(PICS) := CFLAGS64 += $(XFFLAG) $(PICS) := CCFLAGS64 += $(XFFLAG) @@ -65,17 +65,6 @@ SRCS= ../dh192.c ../../dh_common/dh_common.c ../../dh_common/generic_key.c ROOTLIBDIR = $(ROOT)/usr/lib/gss ROOTLIBDIR64 = $(ROOT)/usr/lib/$(MACH64)/gss -#LINTFLAGS += -errfmt=simple -#LINTFLAGS64 += -errfmt=simple -LINTOUT = lint.out -LINTSRC = $(LINTLIB:%.ln=%) -ROOTLINTDIR = $(ROOTLIBDIR) -#ROOTLINT = $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES += $(LINTOUT) $(LINTLIB) - -lint: lintcheck - $(ROOTLIBDIR): $(INS.dir) diff --git a/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile b/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile index 95bad6b558..69d6430ece 100644 --- a/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile +++ b/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile @@ -39,7 +39,6 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint catalog := TARGET= catalog package := TARGET= package @@ -48,7 +47,7 @@ all: $(SUBDIRS) install: $(SUBDIRS) -clean clobber delete lint catalog package: $(SUBDIRS) +clean clobber delete catalog package: $(SUBDIRS) # include library targets include ../../../Makefile.targ diff --git a/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile.com b/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile.com index 97c6e9d4e9..a6c4339047 100644 --- a/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile.com +++ b/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile.com @@ -26,7 +26,7 @@ # # This make file will build dh640.so.1. This shared object # contains the functionality needed to initialize the Diffie-Hellman GSS-API -# mechanism with 640 bit key length. This library, in turn, loads the +# mechanism with 640 bit key length. This library, in turn, loads the # generic Diffie-Hellman GSS-API backend, dhmech.so # @@ -35,7 +35,7 @@ VERS = .1 DH640= dh640.o dh_common.o generic_key.o -OBJECTS= $(DH640) +OBJECTS= $(DH640) # include library definitions include ../../../../Makefile.lib @@ -44,8 +44,8 @@ CPPFLAGS += -I../../backend/mech -I../../backend/crypto CPPFLAGS += -I$(SRC)/lib/libnsl/include CPPFLAGS += -I$(SRC)/uts/common/gssapi/include -$(PICS) := CFLAGS += $(XFFLAG) -$(PICS) := CCFLAGS += $(XFFLAG) +$(PICS) := CFLAGS += $(XFFLAG) +$(PICS) := CCFLAGS += $(XFFLAG) $(PICS) := CFLAGS64 += $(XFFLAG) $(PICS) := CCFLAGS64 += $(XFFLAG) @@ -65,17 +65,6 @@ SRCS= ../dh640.c ../../dh_common/dh_common.c ../../dh_common/generic_key.c ROOTLIBDIR = $(ROOT)/usr/lib/gss ROOTLIBDIR64 = $(ROOT)/usr/lib/$(MACH64)/gss -#LINTFLAGS += -errfmt=simple -#LINTFLAGS64 += -errfmt=simple -LINTOUT = lint.out -LINTSRC = $(LINTLIB:%.ln=%) -ROOTLINTDIR = $(ROOTLIBDIR) -#ROOTLINT = $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES += $(LINTOUT) $(LINTLIB) - -lint: lintcheck - $(ROOTLIBDIR): $(INS.dir) diff --git a/usr/src/lib/gss_mechs/mech_dummy/Makefile b/usr/src/lib/gss_mechs/mech_dummy/Makefile index a79f39443f..e2c1b55c6a 100644 --- a/usr/src/lib/gss_mechs/mech_dummy/Makefile +++ b/usr/src/lib/gss_mechs/mech_dummy/Makefile @@ -30,7 +30,7 @@ # # This make file will build mech_dummy.so.1. This shared object # contains all the functionality needed to support the Dummy GSS-API -# mechanism. +# mechanism. # include ../../../Makefile.master @@ -51,14 +51,11 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: all: .WAIT $(SUBDIRS) -lint: .WAIT $(SUBDIRS) - install: all install_h: diff --git a/usr/src/lib/gss_mechs/mech_dummy/Makefile.com b/usr/src/lib/gss_mechs/mech_dummy/Makefile.com index d8f784220a..f227fcd0b5 100644 --- a/usr/src/lib/gss_mechs/mech_dummy/Makefile.com +++ b/usr/src/lib/gss_mechs/mech_dummy/Makefile.com @@ -39,7 +39,7 @@ include $(SRC)/lib/Makefile.lib MAPFILES = CPPFLAGS += -I../../libgss -I$(SRC)/uts/common/gssapi/include \ - -I$(ROOT)/usr/include/gssapi + -I$(ROOT)/usr/include/gssapi CERRWARN += -_gcc=-Wno-parentheses CERRWARN += $(CNOWARN_UNINIT) @@ -55,6 +55,4 @@ LDLIBS += -lgss -lc all: $(LIBS) -lint: lintcheck - include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/gss_mechs/mech_krb5/Makefile b/usr/src/lib/gss_mechs/mech_krb5/Makefile index c725934855..eb74dd593d 100644 --- a/usr/src/lib/gss_mechs/mech_krb5/Makefile +++ b/usr/src/lib/gss_mechs/mech_krb5/Makefile @@ -55,11 +55,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean lint: $(SUBDIRS) +all clean: $(SUBDIRS) install: install_dir all .WAIT $(SUBDIRS) diff --git a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com index f60e973d26..5c09e472fc 100644 --- a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com +++ b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com @@ -55,10 +55,10 @@ CRYPTO_UTS= cksumtypes.o decrypt.o encrypt.o encrypt_length.o \ CRYPTO_RAW= raw_decrypt.o raw_encrypt.o # crypto/des user space only -CRYPTO_DES= afsstring2key.o string2key.o +CRYPTO_DES= afsstring2key.o string2key.o # crypto/des common to user and kernel space -CRYPTO_DES_UTS= f_cbc.o f_cksum.o f_parity.o weak_key.o d3_cbc.o +CRYPTO_DES_UTS= f_cbc.o f_cksum.o f_parity.o weak_key.o d3_cbc.o # crypto/arcfour user space only CRYPTO_ARCFOUR= arcfour_str2key.o @@ -95,7 +95,7 @@ CRYPTO_KEYHASH= k5_md5des.o hmac_md5.o CRYPTO_KEYHASH_UTS= descbc.o # crypto/old -CRYPTO_OLD= des_stringtokey.o +CRYPTO_OLD= des_stringtokey.o # crypto/old CRYPTO_OLD_UTS= old_encrypt.o old_decrypt.o @@ -159,7 +159,7 @@ K5_POSIX= setenv.o K5_RCACHE=rc_base.o rc_file.o rc_mem.o rc_common.o rc_io.o rcdef.o rc_conv.o \ ser_rc.o rcfns.o rc_none.o -MECH= accept_sec_context.o store_cred.o \ +MECH= accept_sec_context.o store_cred.o \ add_cred.o disp_com_err_status.o disp_major_status.o \ compare_name.o context_time.o copy_ccache.o \ disp_name.o disp_status.o export_sec_context.o \ @@ -269,7 +269,7 @@ SMATCH=off MAPFILES = ../mapfile-vers -#CPPFLAGS += -D_REENTRANT +#CPPFLAGS += -D_REENTRANT $(PICS) := CFLAGS += $(XFFLAG) $(PICS) := CFLAGS64 += $(XFFLAG) $(PICS) := CCFLAGS += $(XFFLAG) @@ -572,10 +572,3 @@ kwarnd_handle.c: $(SRC)/cmd/krb5/kwarn/kwarnd_handle.c CLOBBERFILES += kwarnd.h \ kwarnd_clnt.c kwarnd_clnt_stubs.c kwarnd_handle.c kwarnd_xdr.c - -# So lint.out won't be needlessly recreated -lint: $(LINTOUT) - -$(LINTOUT): $(SOURCES) - $(LINT.c) -o $(LIBNAME) $(SOURCES) > $(LINTOUT) 2>&1 - diff --git a/usr/src/lib/gss_mechs/mech_spnego/Makefile b/usr/src/lib/gss_mechs/mech_spnego/Makefile index 027c489ed5..2a7b009bc6 100644 --- a/usr/src/lib/gss_mechs/mech_spnego/Makefile +++ b/usr/src/lib/gss_mechs/mech_spnego/Makefile @@ -24,9 +24,8 @@ # # -# This make file will build mech_spnego.so.1. This shared object -# contains all the functionality needed to support the -# SPNEGO GSS-API mechanism. +# This make file will build mech_spnego.so.1. This shared object contains all +# the functionality needed to support the SPNEGO GSS-API mechanism. # include ../../Makefile.lib @@ -41,11 +40,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/gss_mechs/mech_spnego/Makefile.com b/usr/src/lib/gss_mechs/mech_spnego/Makefile.com index a3bfcc615a..31b942a0f4 100644 --- a/usr/src/lib/gss_mechs/mech_spnego/Makefile.com +++ b/usr/src/lib/gss_mechs/mech_spnego/Makefile.com @@ -26,19 +26,19 @@ # # This make file will build mech_spnego.so.1. This shared object # contains all the functionality needed to support the SPNEGO GSS-API -# mechanism. +# mechanism. # -LIBRARY = mech_spnego.a -VERS = .1 -OBJECTS = spnego_mech.o spnego_disp_status.o spnego_kerrs.o +LIBRARY = mech_spnego.a +VERS = .1 +OBJECTS = spnego_mech.o spnego_disp_status.o spnego_kerrs.o # include library definitions include ../../../Makefile.lib -LIBS = $(DYNLIB) +LIBS = $(DYNLIB) ROOTLIBDIR = $(ROOT)/usr/lib/gss -ROOTLIBDIR64 = $(ROOT)/usr/lib/$(MACH64)/gss +ROOTLIBDIR64 = $(ROOT)/usr/lib/$(MACH64)/gss SRCDIR = ../mech MAPFILES = ../mapfile-vers @@ -55,8 +55,6 @@ SMATCH=off all: $(LIBS) -lint: lintcheck - # include library targets include ../../../Makefile.targ diff --git a/usr/src/lib/hal/libhal-storage/amd64/Makefile b/usr/src/lib/hal/libhal-storage/amd64/Makefile index 3c92c1bb3b..ea1171f596 100644 --- a/usr/src/lib/hal/libhal-storage/amd64/Makefile +++ b/usr/src/lib/hal/libhal-storage/amd64/Makefile @@ -29,4 +29,4 @@ include ../../../Makefile.lib.64 LIBDIR = $(LIBDIR64) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) $(ROOTLIBPC64) $(ROOTMAJLINK64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLIBPC64) $(ROOTMAJLINK64) diff --git a/usr/src/lib/hal/libhal-storage/i386/Makefile b/usr/src/lib/hal/libhal-storage/i386/Makefile index 8643a8305f..98589d6d31 100644 --- a/usr/src/lib/hal/libhal-storage/i386/Makefile +++ b/usr/src/lib/hal/libhal-storage/i386/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTLIBPC) $(ROOTMAJLINK) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLIBPC) $(ROOTMAJLINK) diff --git a/usr/src/lib/hal/libhal-storage/sparc/Makefile b/usr/src/lib/hal/libhal-storage/sparc/Makefile index 8643a8305f..98589d6d31 100644 --- a/usr/src/lib/hal/libhal-storage/sparc/Makefile +++ b/usr/src/lib/hal/libhal-storage/sparc/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTLIBPC) $(ROOTMAJLINK) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLIBPC) $(ROOTMAJLINK) diff --git a/usr/src/lib/hal/libhal-storage/sparcv9/Makefile b/usr/src/lib/hal/libhal-storage/sparcv9/Makefile index c21aebfc09..9e38ab3478 100644 --- a/usr/src/lib/hal/libhal-storage/sparcv9/Makefile +++ b/usr/src/lib/hal/libhal-storage/sparcv9/Makefile @@ -29,4 +29,4 @@ include ../../../Makefile.lib.64 LIBDIR=$(LIBDIR64) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) $(ROOTLIBPC64) $(ROOTMAJLINK64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLIBPC64) $(ROOTMAJLINK64) diff --git a/usr/src/lib/hal/libhal/amd64/Makefile b/usr/src/lib/hal/libhal/amd64/Makefile index b9cd3e54ba..f822fb9b34 100644 --- a/usr/src/lib/hal/libhal/amd64/Makefile +++ b/usr/src/lib/hal/libhal/amd64/Makefile @@ -28,4 +28,4 @@ include ../../../Makefile.lib.64 LIBDIR = $(LIBDIR64) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) $(ROOTLIBPC64) $(ROOTMAJLINK64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLIBPC64) $(ROOTMAJLINK64) diff --git a/usr/src/lib/hal/libhal/i386/Makefile b/usr/src/lib/hal/libhal/i386/Makefile index 8643a8305f..98589d6d31 100644 --- a/usr/src/lib/hal/libhal/i386/Makefile +++ b/usr/src/lib/hal/libhal/i386/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTLIBPC) $(ROOTMAJLINK) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLIBPC) $(ROOTMAJLINK) diff --git a/usr/src/lib/hal/libhal/sparc/Makefile b/usr/src/lib/hal/libhal/sparc/Makefile index 8643a8305f..98589d6d31 100644 --- a/usr/src/lib/hal/libhal/sparc/Makefile +++ b/usr/src/lib/hal/libhal/sparc/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTLIBPC) $(ROOTMAJLINK) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLIBPC) $(ROOTMAJLINK) diff --git a/usr/src/lib/hal/libhal/sparcv9/Makefile b/usr/src/lib/hal/libhal/sparcv9/Makefile index c21aebfc09..9e38ab3478 100644 --- a/usr/src/lib/hal/libhal/sparcv9/Makefile +++ b/usr/src/lib/hal/libhal/sparcv9/Makefile @@ -29,4 +29,4 @@ include ../../../Makefile.lib.64 LIBDIR=$(LIBDIR64) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) $(ROOTLIBPC64) $(ROOTMAJLINK64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLIBPC64) $(ROOTMAJLINK64) diff --git a/usr/src/lib/hbaapi/Makefile b/usr/src/lib/hbaapi/Makefile index 5d4bcff0b8..f68246e167 100644 --- a/usr/src/lib/hbaapi/Makefile +++ b/usr/src/lib/hbaapi/Makefile @@ -34,7 +34,6 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint # definitions for install_h target HDRS= hbaapi.h @@ -42,7 +41,7 @@ HDRDIR= common .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) # install rule for install_h target diff --git a/usr/src/lib/hbaapi/Makefile.com b/usr/src/lib/hbaapi/Makefile.com index 936d204b85..5f5cfafcef 100644 --- a/usr/src/lib/hbaapi/Makefile.com +++ b/usr/src/lib/hbaapi/Makefile.com @@ -35,7 +35,7 @@ include ../../Makefile.lib HETCFILES= $(CONFIGFILE:%=$(ROOTETC)/%) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR= ../common INCS += -I$(SRCDIR) @@ -51,8 +51,6 @@ SMATCH=off LDLIBS += -lc -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) - $(ROOTETC)/%: ../common/% $(INS.file) @@ -60,8 +58,4 @@ $(ROOTETC)/%: ../common/% all: $(LIBS) $(HETCFILES) -lint: - @echo "This section is not required to be lint clean" - @echo "C++ code" - include ../../Makefile.targ diff --git a/usr/src/lib/hbaapi/amd64/Makefile b/usr/src/lib/hbaapi/amd64/Makefile index 75e36fe530..d7cc93a92d 100644 --- a/usr/src/lib/hbaapi/amd64/Makefile +++ b/usr/src/lib/hbaapi/amd64/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/hbaapi/i386/Makefile b/usr/src/lib/hbaapi/i386/Makefile index d3b61ed5b1..00848ac225 100644 --- a/usr/src/lib/hbaapi/i386/Makefile +++ b/usr/src/lib/hbaapi/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/hbaapi/sparc/Makefile b/usr/src/lib/hbaapi/sparc/Makefile index d3b61ed5b1..00848ac225 100644 --- a/usr/src/lib/hbaapi/sparc/Makefile +++ b/usr/src/lib/hbaapi/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/hbaapi/sparcv9/Makefile b/usr/src/lib/hbaapi/sparcv9/Makefile index 75e36fe530..d7cc93a92d 100644 --- a/usr/src/lib/hbaapi/sparcv9/Makefile +++ b/usr/src/lib/hbaapi/sparcv9/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/iconv_modules/Makefile b/usr/src/lib/iconv_modules/Makefile index e8ec6dc252..d3ac0bda0d 100644 --- a/usr/src/lib/iconv_modules/Makefile +++ b/usr/src/lib/iconv_modules/Makefile @@ -29,11 +29,10 @@ SUBDIRS = common euro hi_IN ja ko th_TH zh utf-8 vi install := TARGET = install all := TARGET = all -lint := TARGET = lint clean := TARGET = clean clobber := TARGET = clobber -all install lint clean clobber: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) .PARALLEL: $(SUBDIRS) diff --git a/usr/src/lib/iconv_modules/Makefile.iconv b/usr/src/lib/iconv_modules/Makefile.iconv index 9359286219..3b48123f64 100644 --- a/usr/src/lib/iconv_modules/Makefile.iconv +++ b/usr/src/lib/iconv_modules/Makefile.iconv @@ -53,7 +53,7 @@ LDLIBS= -lc ICONV_DIR = $(ROOT)/usr/lib/iconv -ICONV_DIR_64 = $(ROOT)/usr/lib/iconv/$(MACH64) +ICONV_DIR_64 = $(ROOT)/usr/lib/iconv/$(MACH64) ICONV_LIBS = $(PROGS:%=$(ICONV_DIR)/%) @@ -91,8 +91,6 @@ $(ICONV_DIR)/%: ../% $(COMPILE.c) $(CFLAGS) -o $@ $< $(POST_PROCESS_O) -lint: FRC - clean: $(RM) $(CLEANFILES) diff --git a/usr/src/lib/iconv_modules/common/Makefile b/usr/src/lib/iconv_modules/common/Makefile index eaa4f5a9f1..7930aa289f 100644 --- a/usr/src/lib/iconv_modules/common/Makefile +++ b/usr/src/lib/iconv_modules/common/Makefile @@ -32,12 +32,11 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint echo := TARGET = echo .KEEP_STATE: -all clean clobber install lint echo: $(SUBDIRS) +all clean clobber install echo: $(SUBDIRS) .PARALLEL: $(SUBDIRS) diff --git a/usr/src/lib/iconv_modules/euro/Makefile b/usr/src/lib/iconv_modules/euro/Makefile index eaa4f5a9f1..7930aa289f 100644 --- a/usr/src/lib/iconv_modules/euro/Makefile +++ b/usr/src/lib/iconv_modules/euro/Makefile @@ -32,12 +32,11 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint echo := TARGET = echo .KEEP_STATE: -all clean clobber install lint echo: $(SUBDIRS) +all clean clobber install echo: $(SUBDIRS) .PARALLEL: $(SUBDIRS) diff --git a/usr/src/lib/iconv_modules/euro/utils/Makefile b/usr/src/lib/iconv_modules/euro/utils/Makefile index da26c3adf1..e8ab7ec738 100644 --- a/usr/src/lib/iconv_modules/euro/utils/Makefile +++ b/usr/src/lib/iconv_modules/euro/utils/Makefile @@ -32,12 +32,11 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint echo := TARGET = echo .KEEP_STATE: -all clean clobber install lint echo: $(SUBDIRS) +all clean clobber install echo: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/iconv_modules/hi_IN/Makefile b/usr/src/lib/iconv_modules/hi_IN/Makefile index eaa4f5a9f1..7930aa289f 100644 --- a/usr/src/lib/iconv_modules/hi_IN/Makefile +++ b/usr/src/lib/iconv_modules/hi_IN/Makefile @@ -32,12 +32,11 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint echo := TARGET = echo .KEEP_STATE: -all clean clobber install lint echo: $(SUBDIRS) +all clean clobber install echo: $(SUBDIRS) .PARALLEL: $(SUBDIRS) diff --git a/usr/src/lib/iconv_modules/ja/Makefile b/usr/src/lib/iconv_modules/ja/Makefile index eaa4f5a9f1..7930aa289f 100644 --- a/usr/src/lib/iconv_modules/ja/Makefile +++ b/usr/src/lib/iconv_modules/ja/Makefile @@ -32,12 +32,11 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint echo := TARGET = echo .KEEP_STATE: -all clean clobber install lint echo: $(SUBDIRS) +all clean clobber install echo: $(SUBDIRS) .PARALLEL: $(SUBDIRS) diff --git a/usr/src/lib/iconv_modules/ja/Makefile.com b/usr/src/lib/iconv_modules/ja/Makefile.com index a7c1bbd205..af5fcf6721 100644 --- a/usr/src/lib/iconv_modules/ja/Makefile.com +++ b/usr/src/lib/iconv_modules/ja/Makefile.com @@ -43,7 +43,6 @@ CLEANFILES += $(INSTALL_MODULES) install := TARGET = install all := TARGET = all -lint := TARGET = lint clean := TARGET = clean clobber := TARGET = clobber diff --git a/usr/src/lib/iconv_modules/ko/Makefile b/usr/src/lib/iconv_modules/ko/Makefile index eaa4f5a9f1..7930aa289f 100644 --- a/usr/src/lib/iconv_modules/ko/Makefile +++ b/usr/src/lib/iconv_modules/ko/Makefile @@ -32,12 +32,11 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint echo := TARGET = echo .KEEP_STATE: -all clean clobber install lint echo: $(SUBDIRS) +all clean clobber install echo: $(SUBDIRS) .PARALLEL: $(SUBDIRS) diff --git a/usr/src/lib/iconv_modules/ko/Makefile.com b/usr/src/lib/iconv_modules/ko/Makefile.com index 2aea057571..5e18f19797 100644 --- a/usr/src/lib/iconv_modules/ko/Makefile.com +++ b/usr/src/lib/iconv_modules/ko/Makefile.com @@ -29,7 +29,6 @@ include $(SRC)/lib/iconv_modules/Makefile.iconv install := TARGET = install all := TARGET = all -lint := TARGET = lint clean := TARGET = clean clobber := TARGET = clobber diff --git a/usr/src/lib/iconv_modules/th_TH/Makefile b/usr/src/lib/iconv_modules/th_TH/Makefile index eaa4f5a9f1..7930aa289f 100644 --- a/usr/src/lib/iconv_modules/th_TH/Makefile +++ b/usr/src/lib/iconv_modules/th_TH/Makefile @@ -32,12 +32,11 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint echo := TARGET = echo .KEEP_STATE: -all clean clobber install lint echo: $(SUBDIRS) +all clean clobber install echo: $(SUBDIRS) .PARALLEL: $(SUBDIRS) diff --git a/usr/src/lib/iconv_modules/utf-8/Makefile b/usr/src/lib/iconv_modules/utf-8/Makefile index edcee27320..472066bc7e 100644 --- a/usr/src/lib/iconv_modules/utf-8/Makefile +++ b/usr/src/lib/iconv_modules/utf-8/Makefile @@ -53,7 +53,6 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint echo := TARGET = echo $(ICONV_DIR)/alias:= FILEMODE=0444 @@ -89,7 +88,7 @@ install: all $(BINARYTABLES) $(BTS_DIR) $(ICONV_DIR)/alias clean: $(RM) $(BINARYTABLES) -all clean clobber install lint echo: $(SUBDIRS) +all clean clobber install echo: $(SUBDIRS) .PARALLEL: $(SUBDIRS) diff --git a/usr/src/lib/iconv_modules/vi/Makefile b/usr/src/lib/iconv_modules/vi/Makefile index eaa4f5a9f1..7930aa289f 100644 --- a/usr/src/lib/iconv_modules/vi/Makefile +++ b/usr/src/lib/iconv_modules/vi/Makefile @@ -32,12 +32,11 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint echo := TARGET = echo .KEEP_STATE: -all clean clobber install lint echo: $(SUBDIRS) +all clean clobber install echo: $(SUBDIRS) .PARALLEL: $(SUBDIRS) diff --git a/usr/src/lib/iconv_modules/zh/Makefile b/usr/src/lib/iconv_modules/zh/Makefile index eaa4f5a9f1..7930aa289f 100644 --- a/usr/src/lib/iconv_modules/zh/Makefile +++ b/usr/src/lib/iconv_modules/zh/Makefile @@ -32,12 +32,11 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint echo := TARGET = echo .KEEP_STATE: -all clean clobber install lint echo: $(SUBDIRS) +all clean clobber install echo: $(SUBDIRS) .PARALLEL: $(SUBDIRS) diff --git a/usr/src/lib/krb5/Makefile b/usr/src/lib/krb5/Makefile index 0e290610da..1a18b1fe7a 100644 --- a/usr/src/lib/krb5/Makefile +++ b/usr/src/lib/krb5/Makefile @@ -2,10 +2,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/krb5/Makefile -# + # include global definitions include ../../Makefile.master @@ -27,12 +24,11 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all install clean clobber lint _msg: $(SUBDIRS) +all install clean clobber _msg: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/krb5/Makefile.lib b/usr/src/lib/krb5/Makefile.lib index 1cd613abdb..f20baca434 100644 --- a/usr/src/lib/krb5/Makefile.lib +++ b/usr/src/lib/krb5/Makefile.lib @@ -22,19 +22,8 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/Makefile.lib ROOTLIBDIR= $(ROOT)/usr/lib/krb5 ROOTLIBDIR64= $(ROOT)/usr/lib/krb5/$(MACH64) -ROOTLINTDIR= $(ROOT)/usr/lib/krb5 - -# definitions for lint -LINTFLAGS= -u -I.. -LINTFLAGS64= -u -I.. -LINTSRC= $(LINTLIB:%.ln=%) -ROOTLINT= $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES += $(LINTOUT) $(LINTLIB) diff --git a/usr/src/lib/krb5/Makefile.targ b/usr/src/lib/krb5/Makefile.targ index ff183bcdc0..794676c7b9 100644 --- a/usr/src/lib/krb5/Makefile.targ +++ b/usr/src/lib/krb5/Makefile.targ @@ -2,13 +2,6 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" -# -# -# lib/krb5/Makefile.targ -# -# included to define local library targets -# include $(SRC)/lib/Makefile.targ @@ -33,7 +26,3 @@ $(POFILE): $(DERIVED_FILES) .WAIT $(POFILES) $(MSGDOMAIN): $(INS.dir) - -# install rule for lint library target -$(ROOTLINTDIR)/%: ./% - $(INS.file) diff --git a/usr/src/lib/krb5/dyn/Makefile b/usr/src/lib/krb5/dyn/Makefile index fb23ce54a0..7efe47e87a 100644 --- a/usr/src/lib/krb5/dyn/Makefile +++ b/usr/src/lib/krb5/dyn/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -33,11 +31,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) _msg: diff --git a/usr/src/lib/krb5/dyn/Makefile.com b/usr/src/lib/krb5/dyn/Makefile.com index 0036b363b4..a0ab5662b9 100644 --- a/usr/src/lib/krb5/dyn/Makefile.com +++ b/usr/src/lib/krb5/dyn/Makefile.com @@ -71,7 +71,6 @@ SMOFF += no_if_block all: $(LIBS) -lint: lintcheck # include library targets include ../../Makefile.targ diff --git a/usr/src/lib/krb5/kadm5/Makefile b/usr/src/lib/krb5/kadm5/Makefile index bcdff4783e..b869878a5d 100644 --- a/usr/src/lib/krb5/kadm5/Makefile +++ b/usr/src/lib/krb5/kadm5/Makefile @@ -2,10 +2,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/krb5/kadm5/Makefile -# + # include global definitions include ../../../Makefile.master @@ -19,12 +16,11 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all clean clobber install lint _msg: $(SUBDIRS) +all clean clobber install _msg: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/krb5/kadm5/clnt/Makefile b/usr/src/lib/krb5/kadm5/clnt/Makefile index ee930293f6..f5ae215ddc 100644 --- a/usr/src/lib/krb5/kadm5/clnt/Makefile +++ b/usr/src/lib/krb5/kadm5/clnt/Makefile @@ -32,15 +32,14 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint -LIBRARY= libkadm5clnt.a +LIBRARY= libkadm5clnt.a POFILE= $(LIBRARY:%.a=%.po) POFILES= generic.po .KEEP_STATE: -all clean install lint: $(SUBDIRS) +all clean install: $(SUBDIRS) clobber: $(SUBDIRS) $(RM) $(CLOBBERFILES) diff --git a/usr/src/lib/krb5/kadm5/clnt/Makefile.com b/usr/src/lib/krb5/kadm5/clnt/Makefile.com index 7d1ba760d9..4f0ea34d96 100644 --- a/usr/src/lib/krb5/kadm5/clnt/Makefile.com +++ b/usr/src/lib/krb5/kadm5/clnt/Makefile.com @@ -105,7 +105,6 @@ $(LIBS): $(ISRCHDR) CLEANFILES += $(ISRCHDR) -lint: lintcheck # include library targets include ../../../Makefile.targ diff --git a/usr/src/lib/krb5/kadm5/srv/Makefile b/usr/src/lib/krb5/kadm5/srv/Makefile index d85cc5dadb..d515234243 100644 --- a/usr/src/lib/krb5/kadm5/srv/Makefile +++ b/usr/src/lib/krb5/kadm5/srv/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -33,12 +31,11 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all clean clobber install lint _msg: $(SUBDIRS) +all clean clobber install _msg: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/krb5/kadm5/srv/Makefile.com b/usr/src/lib/krb5/kadm5/srv/Makefile.com index 4242c57ff3..1b6295e378 100644 --- a/usr/src/lib/krb5/kadm5/srv/Makefile.com +++ b/usr/src/lib/krb5/kadm5/srv/Makefile.com @@ -57,7 +57,7 @@ include ../../../Makefile.lib SRCS= $(SRV_OBJS:%.o=../%.c) \ $(SHARED_OBJS:%.o=../../%.c) -KRB5LIB= $(ROOT)/usr/lib/krb5 +KRB5LIB= $(ROOT)/usr/lib/krb5 LIBS= $(DYNLIB) @@ -100,7 +100,6 @@ SMOFF += all_func_returns,indenting all: $(LIBS) -lint: lintcheck # include library targets include ../../../Makefile.targ diff --git a/usr/src/lib/krb5/kdb/Makefile b/usr/src/lib/krb5/kdb/Makefile index 99160be316..d661792aec 100644 --- a/usr/src/lib/krb5/kdb/Makefile +++ b/usr/src/lib/krb5/kdb/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -33,12 +31,11 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all clean clobber install lint _msg: $(SUBDIRS) +all clean clobber install _msg: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/krb5/kdb/Makefile.com b/usr/src/lib/krb5/kdb/Makefile.com index bf341da1be..12e7bc3bbd 100644 --- a/usr/src/lib/krb5/kdb/Makefile.com +++ b/usr/src/lib/krb5/kdb/Makefile.com @@ -111,11 +111,6 @@ CLEANFILES += $(ISRCHDR) $(ISRCXDR) # Explicitly state the dependancy on iprop.h $(LIBS): $(ISRCHDR) -# We turn off ptr-cast warnings, since we're doing mmapping in kdb_log -LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN - -lint: lintcheck - # include library targets include ../../Makefile.targ diff --git a/usr/src/lib/krb5/plugins/Makefile b/usr/src/lib/krb5/plugins/Makefile index baeda9e18e..adbd4dadd7 100644 --- a/usr/src/lib/krb5/plugins/Makefile +++ b/usr/src/lib/krb5/plugins/Makefile @@ -37,12 +37,11 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all install clean clobber lint _msg: $(SUBDIRS) +all install clean clobber _msg: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/krb5/plugins/kdb/Makefile b/usr/src/lib/krb5/plugins/kdb/Makefile index 98ebdf761e..0b2411bbe6 100644 --- a/usr/src/lib/krb5/plugins/kdb/Makefile +++ b/usr/src/lib/krb5/plugins/kdb/Makefile @@ -21,8 +21,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# + # include global definitions include ../../../../Makefile.master @@ -38,12 +37,11 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all install clean clobber lint _msg: $(SUBDIRS) +all install clean clobber _msg: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/krb5/plugins/kdb/db2/Makefile b/usr/src/lib/krb5/plugins/kdb/db2/Makefile index 81afe989cb..07be6f773a 100644 --- a/usr/src/lib/krb5/plugins/kdb/db2/Makefile +++ b/usr/src/lib/krb5/plugins/kdb/db2/Makefile @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/krb5/Makefile.lib @@ -37,12 +35,11 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all clean clobber lint _msg: $(SUBDIRS) +all clean clobber _msg: $(SUBDIRS) $(ROOTLIBDIR): $(INS.dir) diff --git a/usr/src/lib/krb5/plugins/kdb/db2/Makefile.com b/usr/src/lib/krb5/plugins/kdb/db2/Makefile.com index 2715dee4aa..eaaa569dc2 100644 --- a/usr/src/lib/krb5/plugins/kdb/db2/Makefile.com +++ b/usr/src/lib/krb5/plugins/kdb/db2/Makefile.com @@ -37,7 +37,7 @@ DB2_OBJS= \ kdb_db2.o \ kdb_xdr.o \ pol_xdr.o - + OBJECTS= $(DB2_OBJS) # include library definitions @@ -54,7 +54,7 @@ POFILES = generic.po #override liblink INS.liblink= -$(RM) $@; $(SYMLINK) $(LIBLINKS)$(VERS) $@ -CPPFLAGS += -DHAVE_CONFIG_H -DHAVE_BT_RSEQ \ +CPPFLAGS += -DHAVE_CONFIG_H -DHAVE_BT_RSEQ \ -I$(SRC)/cmd/krb5/iprop \ -I$(SRC)/lib/krb5 \ -I$(SRC)/lib/krb5/kdb \ @@ -80,7 +80,6 @@ LDLIBS += -L $(ROOTLIBDIR) -ldb2 -lkdb -lkadm5srv -lc -lnsl all: $(LIBS) -lint: lintcheck # include library targets include $(SRC)/lib/krb5/Makefile.targ diff --git a/usr/src/lib/krb5/plugins/kdb/db2/libdb2/Makefile b/usr/src/lib/krb5/plugins/kdb/db2/libdb2/Makefile index c30b49d724..4b0dbd8a70 100644 --- a/usr/src/lib/krb5/plugins/kdb/db2/libdb2/Makefile +++ b/usr/src/lib/krb5/plugins/kdb/db2/libdb2/Makefile @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/krb5/Makefile.lib @@ -35,7 +33,6 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg README= README.db2 @@ -44,7 +41,7 @@ $(ROOTLIBDIR)/$(README) := FILEMODE= 444 .KEEP_STATE: -all clean clobber lint _msg: $(SUBDIRS) +all clean clobber _msg: $(SUBDIRS) $(ROOTLIBDIR): $(INS.dir) diff --git a/usr/src/lib/krb5/plugins/kdb/db2/libdb2/Makefile.com b/usr/src/lib/krb5/plugins/kdb/db2/libdb2/Makefile.com index 21245b1a0a..eff6cc3052 100644 --- a/usr/src/lib/krb5/plugins/kdb/db2/libdb2/Makefile.com +++ b/usr/src/lib/krb5/plugins/kdb/db2/libdb2/Makefile.com @@ -27,7 +27,7 @@ LIBRARY= libdb2.a VERS= .1 -# btree +# btree BTREE_OBJS= \ bt_close.o \ bt_conv.o \ @@ -41,9 +41,9 @@ BTREE_OBJS= \ bt_search.o \ bt_seq.o \ bt_split.o \ - bt_utils.o - -# db + bt_utils.o + +# db DB_OBJS= db.o # hash @@ -92,7 +92,7 @@ POFILES = generic.po #override liblink INS.liblink= -$(RM) $@; $(SYMLINK) $(LIBLINKS)$(VERS) $@ -CPPFLAGS += -DHAVE_CONFIG_H \ +CPPFLAGS += -DHAVE_CONFIG_H \ -I$(SRC)/lib/krb5/plugins/kdb/db2/libdb2/mpool \ -I$(SRC)/lib/krb5/plugins/kdb/db2/libdb2/db \ -I$(SRC)/lib/krb5/plugins/kdb/db2/libdb2/hash \ @@ -118,7 +118,6 @@ DYNFLAGS += $(ZINTERPOSE) all: $(LIBS) -lint: lintcheck # include library targets include $(SRC)/lib/krb5/Makefile.targ diff --git a/usr/src/lib/krb5/plugins/kdb/ldap/Makefile b/usr/src/lib/krb5/plugins/kdb/ldap/Makefile index e8f2cca368..219b4ba659 100644 --- a/usr/src/lib/krb5/plugins/kdb/ldap/Makefile +++ b/usr/src/lib/krb5/plugins/kdb/ldap/Makefile @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/krb5/Makefile.lib @@ -35,12 +33,11 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all clean clobber lint: $(SUBDIRS) +all clean clobber: $(SUBDIRS) # no messages in this current dir but there are in libkdb_ldap _msg: libkdb_ldap diff --git a/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/Makefile b/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/Makefile index caf1946078..b109a1c1b4 100644 --- a/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/Makefile +++ b/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/Makefile @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/krb5/Makefile.lib @@ -35,7 +33,6 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg LDIF= kerberos.ldif @@ -45,7 +42,7 @@ $(ROOTLDIF) := FILEMODE= 444 .KEEP_STATE: -all clean clobber lint _msg: $(SUBDIRS) +all clean clobber _msg: $(SUBDIRS) $(ROOTLIBDIR): $(INS.dir) diff --git a/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/Makefile.com b/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/Makefile.com index a3751a8a9b..da239b2e3b 100644 --- a/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/Makefile.com +++ b/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/Makefile.com @@ -45,7 +45,7 @@ LIBKLDAP_OBJS= \ ldap_service_stash.o \ ldap_services.o \ ldap_tkt_policy.o \ - princ_xdr.o + princ_xdr.o OBJECTS= $(LIBKLDAP_OBJS) @@ -64,7 +64,7 @@ POFILES = generic.po #override liblink INS.liblink= -$(RM) $@; $(SYMLINK) $(LIBLINKS)$(VERS) $@ -CPPFLAGS += -DHAVE_CONFIG_H \ +CPPFLAGS += -DHAVE_CONFIG_H \ -I$(SRC)/lib/krb5 \ -I$(SRC)/lib/krb5/kdb \ -I$(SRC)/lib/gss_mechs/mech_krb5/include \ @@ -88,7 +88,6 @@ LDLIBS += -L $(ROOTLIBDIR) -lkadm5srv -lc -lnsl -lldap all: $(LIBS) -lint: lintcheck # include library targets include $(SRC)/lib/krb5/Makefile.targ diff --git a/usr/src/lib/krb5/plugins/preauth/Makefile b/usr/src/lib/krb5/plugins/preauth/Makefile index 884a2af6ff..7add481d7d 100644 --- a/usr/src/lib/krb5/plugins/preauth/Makefile +++ b/usr/src/lib/krb5/plugins/preauth/Makefile @@ -36,12 +36,11 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all install clean clobber lint _msg: $(SUBDIRS) +all install clean clobber _msg: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile b/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile index 84965753db..9cc69b1f11 100644 --- a/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile +++ b/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile @@ -34,12 +34,11 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all clean clobber lint _msg: $(SUBDIRS) +all clean clobber _msg: $(SUBDIRS) $(ROOTLIBDIR): $(INS.dir) diff --git a/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com b/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com index 361550a94a..f8ad41f345 100644 --- a/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com +++ b/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com @@ -84,7 +84,6 @@ $(ROOTLIBDIR): all: $(LIBS) -lint: lintcheck # include library targets include $(SRC)/lib/krb5/Makefile.targ diff --git a/usr/src/lib/krb5/ss/Makefile b/usr/src/lib/krb5/ss/Makefile index 06dbca35d3..7f2ec44406 100644 --- a/usr/src/lib/krb5/ss/Makefile +++ b/usr/src/lib/krb5/ss/Makefile @@ -31,16 +31,15 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint -LIBRARY= libss.a +LIBRARY= libss.a POFILE = $(LIBRARY:%.a=%.po) POFILES = generic.po .KEEP_STATE: -all clean install lint: $(SUBDIRS) +all clean install: $(SUBDIRS) clobber: $(SUBDIRS) $(RM) $(CLOBBERFILES) diff --git a/usr/src/lib/krb5/ss/Makefile.com b/usr/src/lib/krb5/ss/Makefile.com index e8a090776a..c4b4f98bdc 100644 --- a/usr/src/lib/krb5/ss/Makefile.com +++ b/usr/src/lib/krb5/ss/Makefile.com @@ -82,7 +82,6 @@ $(PICS) := CFLAGS += $(XFFLAG) all: $(LIBS) -lint: lintcheck # include library targets include ../../Makefile.targ diff --git a/usr/src/lib/libadm/Makefile b/usr/src/lib/libadm/Makefile index cd9fc7955b..4f3e985ef1 100644 --- a/usr/src/lib/libadm/Makefile +++ b/usr/src/lib/libadm/Makefile @@ -22,23 +22,20 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib SUBDIRS= $(MACH) -$(BUILD64)SUBDIRS += $(MACH64) +$(BUILD64)SUBDIRS += $(MACH64) all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libadm/Makefile.com b/usr/src/lib/libadm/Makefile.com index 5089dc1829..fa113289e5 100644 --- a/usr/src/lib/libadm/Makefile.com +++ b/usr/src/lib/libadm/Makefile.com @@ -39,7 +39,7 @@ include ../../Makefile.lib # install this library in the root filesystem include ../../Makefile.rootfs -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) SRCDIR= ../common CPPFLAGS += -I ../inc @@ -51,13 +51,11 @@ CERRWARN += -_gcc=-Wno-char-subscripts # not linted SMATCH=off -$(LINTLIB) := SRCS=$(SRCDIR)/$(LINTSRC) LDLIBS += -lc .KEEP_STATE: all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libadm/amd64/Makefile b/usr/src/lib/libadm/amd64/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/libadm/amd64/Makefile +++ b/usr/src/lib/libadm/amd64/Makefile @@ -23,10 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libadm/i386/Makefile b/usr/src/lib/libadm/i386/Makefile index 6351d70dde..3ec0fc6bb2 100644 --- a/usr/src/lib/libadm/i386/Makefile +++ b/usr/src/lib/libadm/i386/Makefile @@ -23,11 +23,7 @@ # Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/libadm/i386/Makefile -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libadm/sparc/Makefile b/usr/src/lib/libadm/sparc/Makefile index 38a07e9239..3ec0fc6bb2 100644 --- a/usr/src/lib/libadm/sparc/Makefile +++ b/usr/src/lib/libadm/sparc/Makefile @@ -23,11 +23,7 @@ # Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/libadm/sparc/Makefile -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libadm/sparcv9/Makefile b/usr/src/lib/libadm/sparcv9/Makefile index a4498e6166..e66fe7847d 100644 --- a/usr/src/lib/libadm/sparcv9/Makefile +++ b/usr/src/lib/libadm/sparcv9/Makefile @@ -23,7 +23,7 @@ # Copyright 1998-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # lib/libadm/sparcv9/Makefile # @@ -31,4 +31,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libads/Makefile b/usr/src/lib/libads/Makefile index 41b86fab1d..e1b85c9312 100644 --- a/usr/src/lib/libads/Makefile +++ b/usr/src/lib/libads/Makefile @@ -45,11 +45,10 @@ RPCGENFLAGS = -CMN CLEANFILES += $(DERIVED_FILES) -all := TARGET = all +all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: @@ -59,7 +58,7 @@ install: all .WAIT $(SUBDIRS) install_h: $(DERIVED_FILES) $(ROOTHDRS) -clean clobber lint: $(SUBDIRS) +clean clobber: $(SUBDIRS) check: $(CHECKHDRS) diff --git a/usr/src/lib/libads/Makefile.com b/usr/src/lib/libads/Makefile.com index aa5fde985e..0d235d4272 100644 --- a/usr/src/lib/libads/Makefile.com +++ b/usr/src/lib/libads/Makefile.com @@ -27,18 +27,15 @@ LIBRARY = libads.a VERS = .1 -LINT_OBJECTS = dsgetdc.o poke.o -OBJECTS = $(LINT_OBJECTS) adspriv_xdr.o +OBJECTS = dsgetdc.o poke.o adspriv_xdr.o include ../../Makefile.lib CSTD= $(CSTD_GNU99) -C99LMODE= -Xc99=%all -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lnsl -lc SRCDIR = ../common -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CPPFLAGS += -D_REENTRANT -I$(SRCDIR) -I.. @@ -52,11 +49,5 @@ CERRWARN += -_gcc=-Wno-unused-variable all: $(LIBS) -lint := OBJECTS = $(LINT_OBJECTS) - -lint: lintcheck - -#LINTFLAGS += -erroff=E_CONSTANT_CONDITION -#LINTFLAGS64 += -erroff=E_CONSTANT_CONDITION include ../../Makefile.targ diff --git a/usr/src/lib/libads/i386/Makefile b/usr/src/lib/libads/i386/Makefile index 3cf14ec6d8..be76a683a2 100644 --- a/usr/src/lib/libads/i386/Makefile +++ b/usr/src/lib/libads/i386/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libads/sparc/Makefile b/usr/src/lib/libads/sparc/Makefile index 3cf14ec6d8..be76a683a2 100644 --- a/usr/src/lib/libads/sparc/Makefile +++ b/usr/src/lib/libads/sparc/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libadt_jni/Makefile b/usr/src/lib/libadt_jni/Makefile index ef277af6a0..d09559456b 100644 --- a/usr/src/lib/libadt_jni/Makefile +++ b/usr/src/lib/libadt_jni/Makefile @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -41,13 +39,12 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: CLEANFILES += $(GENSRCS) -all install lint: $(GENSRCS) com/sun .WAIT $(SUBDIRS) +all install: $(GENSRCS) com/sun .WAIT $(SUBDIRS) com/sun $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libadt_jni/Makefile.com b/usr/src/lib/libadt_jni/Makefile.com index eb72d00d79..d0fdcae27d 100644 --- a/usr/src/lib/libadt_jni/Makefile.com +++ b/usr/src/lib/libadt_jni/Makefile.com @@ -32,7 +32,7 @@ OBJECTS= adt_jni.o \ include $(SRC)/lib/Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common @@ -45,26 +45,11 @@ SMATCH=off DYNFLAGS += LDLIBS += -lc -lbsm -CLEANFILES= $(LINTOUT) $(LINTLIB) -CLOBBERFILES += - -$(LINTLIB) := SRCS=../common/llib-ladt_jni - -LINTSRC= $(LINTLIB:%.ln=%) -ROOTLINTDIR= $(ROOTLIBDIR) -ROOTLINT= $(LINTSRC:%=$(ROOTLINTDIR)/%) - .KEEP_STATE: -lint: lintcheck include $(SRC)/lib/Makefile.targ pics/%.o: ../common/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) - -# install rule for lint library target -$(ROOTLINTDIR)/%: ../common/% - $(INS.file) - diff --git a/usr/src/lib/libadt_jni/com/sun/Makefile b/usr/src/lib/libadt_jni/com/sun/Makefile index 9224e31284..70389a82af 100644 --- a/usr/src/lib/libadt_jni/com/sun/Makefile +++ b/usr/src/lib/libadt_jni/com/sun/Makefile @@ -23,10 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libadt_jni/com/sun/Makefile include Makefile.com @@ -44,7 +40,6 @@ all clean install clobber: ${SUBDIRS} ${SUBDIRS}: FRC cd $@; pwd; $(MAKE) $(TARGET) -lint: .WAIT: diff --git a/usr/src/lib/libadutils/Makefile b/usr/src/lib/libadutils/Makefile index c7e81dec5a..b8c7c76102 100644 --- a/usr/src/lib/libadutils/Makefile +++ b/usr/src/lib/libadutils/Makefile @@ -28,15 +28,14 @@ include $(SRC)/lib/Makefile.lib SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) -all := TARGET = all +all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) check: $(CHECKHDRS) diff --git a/usr/src/lib/libadutils/Makefile.com b/usr/src/lib/libadutils/Makefile.com index 107734dfdc..7699189fcb 100644 --- a/usr/src/lib/libadutils/Makefile.com +++ b/usr/src/lib/libadutils/Makefile.com @@ -34,12 +34,10 @@ OBJECTS = adutils.o addisc.o adutils_threadfuncs.o \ include ../../Makefile.lib CSTD= $(CSTD_GNU99) -C99LMODE= -Xc99=%all -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lldap -lresolv -lsocket -lnsl -lc SRCDIR = ../common -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CPPFLAGS += -D_REENTRANT -I$(SRCDIR) @@ -55,9 +53,6 @@ SMATCH=off all: $(LIBS) -lint: lintcheck -LINTFLAGS += -erroff=E_CONSTANT_CONDITION -LINTFLAGS64 += -erroff=E_CONSTANT_CONDITION include ../../Makefile.targ diff --git a/usr/src/lib/libadutils/i386/Makefile b/usr/src/lib/libadutils/i386/Makefile index c7cca61bea..4acb0bde30 100644 --- a/usr/src/lib/libadutils/i386/Makefile +++ b/usr/src/lib/libadutils/i386/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libadutils/sparc/Makefile b/usr/src/lib/libadutils/sparc/Makefile index c7cca61bea..4acb0bde30 100644 --- a/usr/src/lib/libadutils/sparc/Makefile +++ b/usr/src/lib/libadutils/sparc/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libaio/Makefile b/usr/src/lib/libaio/Makefile index 6cb7a4fa8a..ef1592a4a5 100644 --- a/usr/src/lib/libaio/Makefile +++ b/usr/src/lib/libaio/Makefile @@ -36,7 +36,6 @@ install := TARGET= install all clean clobber install: $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libaio/Makefile.com b/usr/src/lib/libaio/Makefile.com index 0ab9422e5d..62b2ffe2a7 100644 --- a/usr/src/lib/libaio/Makefile.com +++ b/usr/src/lib/libaio/Makefile.com @@ -27,5 +27,4 @@ VERS = .1 include $(SRC)/lib/Makefile.rootfs -LIBS += $(LINTLIB) DYNFLAGS += -F libc.so.1 diff --git a/usr/src/lib/libaio/amd64/Makefile b/usr/src/lib/libaio/amd64/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libaio/amd64/Makefile +++ b/usr/src/lib/libaio/amd64/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libaio/i386/Makefile b/usr/src/lib/libaio/i386/Makefile index 4e4e8c02a9..682e5560ca 100644 --- a/usr/src/lib/libaio/i386/Makefile +++ b/usr/src/lib/libaio/i386/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libaio/sparc/Makefile b/usr/src/lib/libaio/sparc/Makefile index 4e4e8c02a9..682e5560ca 100644 --- a/usr/src/lib/libaio/sparc/Makefile +++ b/usr/src/lib/libaio/sparc/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libaio/sparcv9/Makefile b/usr/src/lib/libaio/sparcv9/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libaio/sparcv9/Makefile +++ b/usr/src/lib/libaio/sparcv9/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libast/Makefile b/usr/src/lib/libast/Makefile index 2cd1e2bdf3..d9faffb382 100644 --- a/usr/src/lib/libast/Makefile +++ b/usr/src/lib/libast/Makefile @@ -35,14 +35,13 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint -_msg := TARGET= _msg +_msg := TARGET= _msg .KEEP_STATE: -all clean clobber install lint _msg: $(SUBDIRS) +all clean clobber install _msg: $(SUBDIRS) -LIBRARY= libast.a +LIBRARY= libast.a HDRS= \ align.h \ diff --git a/usr/src/lib/libast/Makefile.com b/usr/src/lib/libast/Makefile.com index b701451368..4385e64f53 100644 --- a/usr/src/lib/libast/Makefile.com +++ b/usr/src/lib/libast/Makefile.com @@ -673,15 +673,13 @@ include ../../../Makefile.ast # and $(TRANSMACH) (generated) SRCS= $(OBJECTS:%.o=../%.c) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += \ -lsocket \ -lm \ -lc -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) - SRCDIR = ../common # We use "=" here since using $(CPPFLAGS.master) is very tricky in our @@ -751,27 +749,19 @@ pics/common/hash/memhash.o := CERRWARN += -erroff=E_CONST_PROMOTED_UNSIGNED_LON pics/common/hash/memsum.o := CERRWARN += -erroff=E_CONST_PROMOTED_UNSIGNED_LONG pics/common/hash/strhash.o := CERRWARN += -erroff=E_CONST_PROMOTED_UNSIGNED_LONG pics/common/hash/strsum.o := CERRWARN += -erroff=E_CONST_PROMOTED_UNSIGNED_LONG -pics/common/misc/recstr.o := CERRWARN += -erroff=E_INTEGER_OVERFLOW_DETECTED -pics/common/misc/translate.o := CERRWARN += -erroff=E_INTEGER_OVERFLOW_DETECTED +pics/common/misc/recstr.o := CERRWARN += -erroff=E_INTEGER_OVERFLOW_DETECTED +pics/common/misc/translate.o := CERRWARN += -erroff=E_INTEGER_OVERFLOW_DETECTED pics/common/path/pathkey.o := CERRWARN += -erroff=E_CONST_PROMOTED_UNSIGNED_LONG pics/common/port/astconf.o := CERRWARN += -erroff=E_CONST_OBJ_SHOULD_HAVE_INITIZR -pics/common/stdio/fflush.o := CERRWARN += -erroff=E_NO_IMPLICIT_DECL_ALLOWED -pics/common/stdio/getline.o := CERRWARN += -erroff=E_NO_IMPLICIT_DECL_ALLOWED -pics/common/sfio/sfmove.o := CERRWARN += -erroff=E_NO_IMPLICIT_DECL_ALLOWED -pics/common/sfio/sfrd.o := CERRWARN += -erroff=E_NO_IMPLICIT_DECL_ALLOWED -pics/common/sfio/sfvscanf.o := CERRWARN += -erroff=E_END_OF_LOOP_CODE_NOT_REACHED -pics/common/tm/tmxduration.o := CERRWARN += -erroff=E_NO_IMPLICIT_DECL_ALLOWED +pics/common/stdio/fflush.o := CERRWARN += -erroff=E_NO_IMPLICIT_DECL_ALLOWED +pics/common/stdio/getline.o := CERRWARN += -erroff=E_NO_IMPLICIT_DECL_ALLOWED +pics/common/sfio/sfmove.o := CERRWARN += -erroff=E_NO_IMPLICIT_DECL_ALLOWED +pics/common/sfio/sfrd.o := CERRWARN += -erroff=E_NO_IMPLICIT_DECL_ALLOWED +pics/common/sfio/sfvscanf.o := CERRWARN += -erroff=E_END_OF_LOOP_CODE_NOT_REACHED +pics/common/tm/tmxduration.o := CERRWARN += -erroff=E_NO_IMPLICIT_DECL_ALLOWED .KEEP_STATE: all: mkpicdirs .WAIT $(LIBS) -# -# libast is not lint-clean yet; fake up a target. (You can use -# "make lintcheck" to actually run lint; please send all lint fixes -# upstream (to AT&T) so the next update will pull them into ON.) -# -lint: - @ print "usr/src/lib/libast is not lint-clean: skipping" - include ../../Makefile.targ diff --git a/usr/src/lib/libast/i386/Makefile b/usr/src/lib/libast/i386/Makefile index f601e12e04..a42bed719a 100644 --- a/usr/src/lib/libast/i386/Makefile +++ b/usr/src/lib/libast/i386/Makefile @@ -41,4 +41,4 @@ include ../Makefile.com # (and on 32bit it is close to the barrier) i386_C_PICFLAGS = $(C_BIGPICFLAGS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libast/sparc/Makefile b/usr/src/lib/libast/sparc/Makefile index 54f6ad2f28..96eee28151 100644 --- a/usr/src/lib/libast/sparc/Makefile +++ b/usr/src/lib/libast/sparc/Makefile @@ -42,4 +42,4 @@ include ../Makefile.com # (and on 32bit it is close to the barrier) sparc_C_PICFLAGS = $(C_BIGPICFLAGS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libavl/Makefile b/usr/src/lib/libavl/Makefile index 8647d0ecf4..ca67331aa4 100644 --- a/usr/src/lib/libavl/Makefile +++ b/usr/src/lib/libavl/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # include library definitions include ../Makefile.lib @@ -35,11 +33,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libavl/Makefile.com b/usr/src/lib/libavl/Makefile.com index 04b9027c11..02c162c986 100644 --- a/usr/src/lib/libavl/Makefile.com +++ b/usr/src/lib/libavl/Makefile.com @@ -30,12 +30,10 @@ OBJECTS= avl.o include ../../Makefile.lib include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCS = $(COMDIR)/avl.c -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) - -COMDIR = $(SRC)/common/avl +COMDIR = $(SRC)/common/avl LDLIBS += -lc CFLAGS += $(CCVERBOSE) @@ -44,8 +42,6 @@ CFLAGS += $(CCVERBOSE) all : $(LIBS) -lint : lintcheck - pics/%.o: $(COMDIR)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) diff --git a/usr/src/lib/libavl/amd64/Makefile b/usr/src/lib/libavl/amd64/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/libavl/amd64/Makefile +++ b/usr/src/lib/libavl/amd64/Makefile @@ -23,10 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libavl/i386/Makefile b/usr/src/lib/libavl/i386/Makefile index 739c5ed597..16c9d09c13 100644 --- a/usr/src/lib/libavl/i386/Makefile +++ b/usr/src/lib/libavl/i386/Makefile @@ -23,10 +23,7 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libavl/i386/Makefile include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libavl/sparc/Makefile b/usr/src/lib/libavl/sparc/Makefile index 60fa8fb87d..16c9d09c13 100644 --- a/usr/src/lib/libavl/sparc/Makefile +++ b/usr/src/lib/libavl/sparc/Makefile @@ -23,10 +23,7 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libavl/sparc/Makefile include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libavl/sparcv9/Makefile b/usr/src/lib/libavl/sparcv9/Makefile index 0f67286356..164f1daab9 100644 --- a/usr/src/lib/libavl/sparcv9/Makefile +++ b/usr/src/lib/libavl/sparcv9/Makefile @@ -23,11 +23,11 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" + # # lib/libavl/sparcv9/Makefile include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libbe/Makefile b/usr/src/lib/libbe/Makefile index 0e68a32954..cce00a0f58 100644 --- a/usr/src/lib/libbe/Makefile +++ b/usr/src/lib/libbe/Makefile @@ -38,22 +38,21 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint POFILE = libbe.po MSGFILES = `$(GREP) -l gettext $(HDRDIR)/*.[ch]` .KEEP_STATE: -all install lint: install_h $(SUBDIRS) +all install: install_h $(SUBDIRS) clean clobber: $(SUBDIRS) -$(POFILE): pofile_MSGFILES +$(POFILE): pofile_MSGFILES -install_h: $(ROOTHDRS) +install_h: $(ROOTHDRS) -check: $(CHECKHDRS) +check: $(CHECKHDRS) _msg: $(MSGDOMAINPOFILE) diff --git a/usr/src/lib/libbe/Makefile.com b/usr/src/lib/libbe/Makefile.com index 765f8e981a..969de425f3 100644 --- a/usr/src/lib/libbe/Makefile.com +++ b/usr/src/lib/libbe/Makefile.com @@ -43,7 +43,7 @@ OBJECTS= \ include ../../Makefile.lib -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) SRCDIR= ../common @@ -57,12 +57,9 @@ CPPFLAGS += $(INCS) CLOBBERFILES += $(LIBRARY) -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) - .KEEP_STATE: all: $(LIBS) $(LIBRARY) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libbe/amd64/Makefile b/usr/src/lib/libbe/amd64/Makefile index 5d3fa158a8..a281d41133 100644 --- a/usr/src/lib/libbe/amd64/Makefile +++ b/usr/src/lib/libbe/amd64/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libbe/i386/Makefile b/usr/src/lib/libbe/i386/Makefile index c6e75c4787..51dea8dd0e 100644 --- a/usr/src/lib/libbe/i386/Makefile +++ b/usr/src/lib/libbe/i386/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libbe/sparc/Makefile b/usr/src/lib/libbe/sparc/Makefile index c6e75c4787..51dea8dd0e 100644 --- a/usr/src/lib/libbe/sparc/Makefile +++ b/usr/src/lib/libbe/sparc/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libbe/sparcv9/Makefile b/usr/src/lib/libbe/sparcv9/Makefile index 5d3fa158a8..a281d41133 100644 --- a/usr/src/lib/libbe/sparcv9/Makefile +++ b/usr/src/lib/libbe/sparcv9/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libbrand/Makefile b/usr/src/lib/libbrand/Makefile index 9e2f22e24c..af75b5548e 100644 --- a/usr/src/lib/libbrand/Makefile +++ b/usr/src/lib/libbrand/Makefile @@ -32,7 +32,6 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint HDRDIR= common HDRS= libbrand.h @@ -51,7 +50,7 @@ $(DTDDIR)/%: % .KEEP_STATE: -all clean clobber lint install: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libbrand/amd64/Makefile b/usr/src/lib/libbrand/amd64/Makefile index 1e902f7e49..b13b247ca8 100644 --- a/usr/src/lib/libbrand/amd64/Makefile +++ b/usr/src/lib/libbrand/amd64/Makefile @@ -22,9 +22,8 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libbrand/i386/Makefile b/usr/src/lib/libbrand/i386/Makefile index f237b7e80a..282da97a76 100644 --- a/usr/src/lib/libbrand/i386/Makefile +++ b/usr/src/lib/libbrand/i386/Makefile @@ -22,8 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libbrand/sparc/Makefile b/usr/src/lib/libbrand/sparc/Makefile index f237b7e80a..282da97a76 100644 --- a/usr/src/lib/libbrand/sparc/Makefile +++ b/usr/src/lib/libbrand/sparc/Makefile @@ -22,8 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libbrand/sparcv9/Makefile b/usr/src/lib/libbrand/sparcv9/Makefile index 1e902f7e49..b13b247ca8 100644 --- a/usr/src/lib/libbrand/sparcv9/Makefile +++ b/usr/src/lib/libbrand/sparcv9/Makefile @@ -22,9 +22,8 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libbsdmalloc/Makefile b/usr/src/lib/libbsdmalloc/Makefile index 7438442c4f..6986d16e17 100644 --- a/usr/src/lib/libbsdmalloc/Makefile +++ b/usr/src/lib/libbsdmalloc/Makefile @@ -34,11 +34,10 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg package := TARGET= package -LIBRARY= libbsdmalloc.a +LIBRARY= libbsdmalloc.a TEXT_DOMAIN= SUNW_OST_OSLIB XGETFLAGS= -a POFILE= $(LIBRARY:.a=.po) @@ -49,7 +48,7 @@ GREP= grep .KEEP_STATE: -all clean clobber delete install lint package: $(SUBDIRS) +all clean clobber delete install package: $(SUBDIRS) # definitions for install_h target HDRS= diff --git a/usr/src/lib/libbsdmalloc/Makefile.com b/usr/src/lib/libbsdmalloc/Makefile.com index 9732e9b2b5..92df179637 100644 --- a/usr/src/lib/libbsdmalloc/Makefile.com +++ b/usr/src/lib/libbsdmalloc/Makefile.com @@ -35,19 +35,7 @@ include ../../Makefile.lib SRCDIR = ../common -LIBS = $(DYNLIB) $(LINTLIB) - -# definitions for lint - -LINTFLAGS = -uax -LINTFLAGS64 = -uax -m64 -LINTOUT= lint.out - -LINTSRC= $(LINTLIB:%.ln=%) -ROOTLINTDIR= $(ROOTLIBDIR) -ROOTLINT= $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES += $(LINTOUT) $(LINTLIB) +LIBS = $(DYNLIB) CFLAGS += $(CCVERBOSE) CPPFLAGS += -D_REENTRANT @@ -59,8 +47,6 @@ SMATCH=off .KEEP_STATE: -lint: - $(LINT.c) $(SRCS) $(LDLIBS) # # create message catalogue files @@ -80,8 +66,3 @@ include ../../Makefile.targ pics/%.o: ../common/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) - -# install rule for lint library target -$(ROOTLINTDIR)/%: ../common/% - $(INS.file) - diff --git a/usr/src/lib/libbsdmalloc/amd64/Makefile b/usr/src/lib/libbsdmalloc/amd64/Makefile index 70e24a9a5d..add8308228 100644 --- a/usr/src/lib/libbsdmalloc/amd64/Makefile +++ b/usr/src/lib/libbsdmalloc/amd64/Makefile @@ -22,13 +22,11 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) .KEEP_STATE: diff --git a/usr/src/lib/libbsdmalloc/i386/Makefile b/usr/src/lib/libbsdmalloc/i386/Makefile index 2a944b0b43..d6eed917a9 100644 --- a/usr/src/lib/libbsdmalloc/i386/Makefile +++ b/usr/src/lib/libbsdmalloc/i386/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -31,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libbsdmalloc/sparc/Makefile b/usr/src/lib/libbsdmalloc/sparc/Makefile index 2a944b0b43..d6eed917a9 100644 --- a/usr/src/lib/libbsdmalloc/sparc/Makefile +++ b/usr/src/lib/libbsdmalloc/sparc/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -31,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libbsdmalloc/sparcv9/Makefile b/usr/src/lib/libbsdmalloc/sparcv9/Makefile index 70e24a9a5d..add8308228 100644 --- a/usr/src/lib/libbsdmalloc/sparcv9/Makefile +++ b/usr/src/lib/libbsdmalloc/sparcv9/Makefile @@ -22,13 +22,11 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) .KEEP_STATE: diff --git a/usr/src/lib/libbsm/Makefile b/usr/src/lib/libbsm/Makefile index 86c7bb9802..bdc233e81c 100644 --- a/usr/src/lib/libbsm/Makefile +++ b/usr/src/lib/libbsm/Makefile @@ -34,7 +34,6 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint package := TARGET= package .KEEP_STATE: @@ -45,20 +44,20 @@ COMMONDIR = common # Macros for libbsm header files. These define user-level only interfaces. # GENHDRS = audit_uevents.h -HDRS = libbsm.h devices.h devalloc.h adt.h adt_event.h audit_private.h +HDRS = libbsm.h devices.h devalloc.h adt.h adt_event.h audit_private.h GENSRCS = $(COMMONDIR)/adt_xlate.c $(COMMONDIR)/adt_event.h COMMONHDRS = $(HDRS:%=$(COMMONDIR)/%) -ROOTHDRDIR = $(ROOT)/usr/include/bsm -ROOTCHDRS = $(HDRS:%=$(ROOTHDRDIR)/%) -ROOTHDRS = $(GENHDRS:%=$(ROOTHDRDIR)/%) +ROOTHDRDIR = $(ROOT)/usr/include/bsm +ROOTCHDRS = $(HDRS:%=$(ROOTHDRDIR)/%) +ROOTHDRS = $(GENHDRS:%=$(ROOTHDRDIR)/%) CHECKCHDRS = $(COMMONHDRS:%.h=%.check) CHECKHDRS = $(GENHDRS:%.h=%.check) -$(ROOTHDRS) := FILEMODE = 0644 +$(ROOTHDRS) := FILEMODE = 0644 $(ROOTCHDRS) := FILEMODE = 0644 -all install lint package: $(GENSRCS) $(SUBDIRS) +all install package: $(GENSRCS) $(SUBDIRS) clean clobber delete: $(SUBDIRS) # @@ -67,8 +66,8 @@ clean clobber delete: $(SUBDIRS) # from here. # -ROOTETCSECURITY = $(ROOT)/etc/security -$(ROOTETCSECURITY) := DIRMODE = 0755 +ROOTETCSECURITY = $(ROOT)/etc/security +$(ROOTETCSECURITY) := DIRMODE = 0755 ESFILES = audit_class audit_event ESSRC = $(ESFILES:%=%.txt) @@ -176,7 +175,7 @@ $(ROOTDTDDIR)/% $(ROOTXSLDIR)/%: % $(AUDITDIRS): $(INS.dir) -$(ARSYMLNK): +$(ARSYMLNK): $(RM) $@ $(SYMLINK) ../../../../var/audit $@ diff --git a/usr/src/lib/libbsm/Makefile.com b/usr/src/lib/libbsm/Makefile.com index 86c8ebd0fb..d608a188a8 100644 --- a/usr/src/lib/libbsm/Makefile.com +++ b/usr/src/lib/libbsm/Makefile.com @@ -24,7 +24,7 @@ # Copyright (c) 2018, Joyent, Inc. LIBRARY = libbsm.a -VERS = .1 +VERS = .1 OBJECTS= adr.o \ adrf.o \ adrm.o \ @@ -74,14 +74,7 @@ include ../../Makefile.rootfs SRCDIR = ../common -LIBS = $(DYNLIB) $(LINTLIB) - -LINTSRC= $(LINTLIB:%.ln=%) -$(LINTLIB) := SRCS = ../common/$(LINTSRC) -ROOTLINTDIR= $(ROOTLIBDIR) -ROOTLINT= $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES += $(LINTOUT) $(LINTLIB) +LIBS = $(DYNLIB) CFLAGS += $(CCVERBOSE) LDLIBS += -lsocket -lnsl -lmd -lc -lsecdb -ltsol -linetutil -lscf @@ -107,7 +100,6 @@ TEXT_DOMAIN= SUNW_OST_OSLIB all: $(LIBS) -lint: lintcheck # Include library targets # @@ -116,7 +108,3 @@ include ../../Makefile.targ pics/%.o: ../common/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) - -# install rule for lint library target -$(ROOTLINTDIR)/%: ../common/% - $(INS.file) diff --git a/usr/src/lib/libbsm/amd64/Makefile b/usr/src/lib/libbsm/amd64/Makefile index 2e8cdecf75..6782495649 100644 --- a/usr/src/lib/libbsm/amd64/Makefile +++ b/usr/src/lib/libbsm/amd64/Makefile @@ -22,10 +22,10 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libbsm/i386/Makefile b/usr/src/lib/libbsm/i386/Makefile index a333224278..cf2087e71e 100644 --- a/usr/src/lib/libbsm/i386/Makefile +++ b/usr/src/lib/libbsm/i386/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libbsm/sparc/Makefile b/usr/src/lib/libbsm/sparc/Makefile index a333224278..cf2087e71e 100644 --- a/usr/src/lib/libbsm/sparc/Makefile +++ b/usr/src/lib/libbsm/sparc/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libbsm/sparcv9/Makefile b/usr/src/lib/libbsm/sparcv9/Makefile index 2e8cdecf75..6782495649 100644 --- a/usr/src/lib/libbsm/sparcv9/Makefile +++ b/usr/src/lib/libbsm/sparcv9/Makefile @@ -22,10 +22,10 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libc/Makefile b/usr/src/lib/libc/Makefile index 9f2e51e4f7..ebc1338484 100644 --- a/usr/src/lib/libc/Makefile +++ b/usr/src/lib/libc/Makefile @@ -47,6 +47,7 @@ ROOTVARIANTDIR64= $(ROOTLIB64)/libc # include common library definitions include ../Makefile.lib +include ../Makefile.rootfs # # on some architectures, we build multiple libc variants @@ -94,7 +95,7 @@ $(BUILD64)SUBDIRS += $(MACH64) $(VARIANT_SUBDIRS64) LIBS = $(DYNLIB) -ROOTLIBS64= $(ROOTLIBDIR64)/$(DYNLIB) +ROOTLIBS64= $(ROOTLIB64)/$(DYNLIB) MACHLIBS64= $(MACH64)/$(DYNLIB) VARIANTLIBS= $(VARIANTS:%=$(MACH)_%/$(VARBLD)/$(LIBBASENAME)_%.so.1) VARIANTLIBS64= $(VARIANTS64:%=$(MACH)_%/$(VARBLD64)/$(LIBBASENAME)_%.so.1) @@ -112,8 +113,8 @@ CLOBBERFILES += THIRDPARTYLICENSE extract-copyright $(ROOTHDRDIR)/%: port/gen/% $(INS.file) -$(ROOTLIBDIR)/$(DYNLIB) := FILEMODE = 755 -$(ROOTLIBDIR64)/$(DYNLIB) := FILEMODE = 755 +$(ROOTLIB)/$(DYNLIB) := FILEMODE = 755 +$(ROOTLIB64)/$(DYNLIB) := FILEMODE = 755 $(ROOTFS_LIBDIR)/$(DYNLIB) := FILEMODE = 755 $(ROOTFS_LIBDIR64)/$(DYNLIB) := FILEMODE = 755 @@ -167,7 +168,9 @@ $($(MACH)_COMP): FRC install: all \ etc \ inslib32 \ - $(BUILD64) inslib64 + $(ROOTCOMPATLINKS) + +$(BUILD64)install: inslib64 $(ROOTCOMPATLINKS64) inslib32: $(ROOTFS_LIBS) $(ROOTFS_LINKS) $(ROOTVARIANTLIBS) @@ -179,15 +182,6 @@ all_h: $(MACH)/assym.h $(MACH64)/assym.h check: $(CHECKHDRS) -$(ROOTFS_LIB)/%: $(MACH)/% - $(INS.file) -$(ROOTFS_LIBDIR)/$(LIBLINKS): $(ROOTFS_LIBDIR)/$(LIBLINKS)$(VERS) - $(INS.liblink) -$(ROOTFS_LIB64)/%: $(MACH64)/% - $(INS.file) -$(ROOTFS_LIBDIR64)/$(LIBLINKS): $(ROOTFS_LIBDIR64)/$(LIBLINKS)$(VERS) - $(INS.liblink) - $(ROOTVARIANTDIR): $(ROOTLIB) $(INS.dir) $(ROOTVARIANTDIR)/%: $(ROOTVARIANTDIR) $(VAR1_BLDDIR)/% @@ -211,7 +205,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint .PARALLEL: $(SUBDIRS) @@ -223,7 +216,6 @@ clobber: $(SUBDIRS) etc clobber_local clobber_local: $(RM) $(CLOBBERFILES) -lint: _msg: $(MSGDOMAIN) catalog @@ -237,5 +229,6 @@ cscope.out tags: FRC $(XREF) -x $@ FRC: + # include MACH-specific library targets include ../Makefile.mach diff --git a/usr/src/lib/libc/capabilities/Makefile b/usr/src/lib/libc/capabilities/Makefile index ab390454fd..ca514f03e9 100644 --- a/usr/src/lib/libc/capabilities/Makefile +++ b/usr/src/lib/libc/capabilities/Makefile @@ -47,7 +47,6 @@ install := TARGET= install all clean clobber install: \ $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libc/capabilities/sun4u-opl/Makefile b/usr/src/lib/libc/capabilities/sun4u-opl/Makefile index 247f7c3456..cccb8eeab5 100644 --- a/usr/src/lib/libc/capabilities/sun4u-opl/Makefile +++ b/usr/src/lib/libc/capabilities/sun4u-opl/Makefile @@ -37,7 +37,6 @@ install := TARGET= install all clean clobber install: \ $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/Makefile b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/Makefile index 77aed04fa7..dddbce3b10 100644 --- a/usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/Makefile +++ b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/Makefile @@ -39,7 +39,6 @@ install := TARGET= install all clean clobber install: \ $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/Makefile b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/Makefile index 77aed04fa7..dddbce3b10 100644 --- a/usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/Makefile +++ b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/Makefile @@ -39,7 +39,6 @@ install := TARGET= install all clean clobber install: \ $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libc/capabilities/sun4u/Makefile b/usr/src/lib/libc/capabilities/sun4u/Makefile index 77aed04fa7..dddbce3b10 100644 --- a/usr/src/lib/libc/capabilities/sun4u/Makefile +++ b/usr/src/lib/libc/capabilities/sun4u/Makefile @@ -39,7 +39,6 @@ install := TARGET= install all clean clobber install: \ $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libc/capabilities/sun4v-hwcap1/Makefile b/usr/src/lib/libc/capabilities/sun4v-hwcap1/Makefile index a23938e6d9..44ad706cab 100644 --- a/usr/src/lib/libc/capabilities/sun4v-hwcap1/Makefile +++ b/usr/src/lib/libc/capabilities/sun4v-hwcap1/Makefile @@ -38,7 +38,6 @@ install := TARGET= install all clean clobber install: \ $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libc/capabilities/sun4v-hwcap2/Makefile b/usr/src/lib/libc/capabilities/sun4v-hwcap2/Makefile index 77aed04fa7..dddbce3b10 100644 --- a/usr/src/lib/libc/capabilities/sun4v-hwcap2/Makefile +++ b/usr/src/lib/libc/capabilities/sun4v-hwcap2/Makefile @@ -39,7 +39,6 @@ install := TARGET= install all clean clobber install: \ $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libc/i386/etc/Makefile b/usr/src/lib/libc/i386/etc/Makefile index 98506e66f6..616190a7e8 100644 --- a/usr/src/lib/libc/i386/etc/Makefile +++ b/usr/src/lib/libc/i386/etc/Makefile @@ -35,7 +35,6 @@ all:= TARGET= all install:= TARGET= install clean:= TARGET= clean clobber:= TARGET= clobber -lint:= TARGET= lint ROOTETC= $(ROOT)/etc ETCFLASHD= $(ROOTETC)/flash @@ -61,7 +60,6 @@ install: all .WAIT $(DIRS) .WAIT $(ETCFLASHPREPROG) cstyle: -lint: $(FLASHPREPROG): $(FLASHPRESRC) $(CP) $@.ksh $@ diff --git a/usr/src/lib/libc_db/Makefile b/usr/src/lib/libc_db/Makefile index a715f0a195..64decb2e50 100644 --- a/usr/src/lib/libc_db/Makefile +++ b/usr/src/lib/libc_db/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -34,13 +32,12 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint TEXT_DOMAIN= SUNW_OST_OSLIB .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libc_db/Makefile.com b/usr/src/lib/libc_db/Makefile.com index 6dfd7e623a..6ea52f8754 100644 --- a/usr/src/lib/libc_db/Makefile.com +++ b/usr/src/lib/libc_db/Makefile.com @@ -36,11 +36,10 @@ OBJECTS = $(CRTI) $(CMNOBJS) $(CRTN) include ../../Makefile.lib include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common SRCS = $(CMNOBJS:%.o=$(SRCDIR)/%.c) -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) ASFLAGS += -P -D__STDC__ -D_ASM -DPIC CPPFLAGS += -I../../libc/inc -D_REENTRANT @@ -57,7 +56,6 @@ SMATCH=off all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libc_db/amd64/Makefile b/usr/src/lib/libc_db/amd64/Makefile index 9a111ae271..99231f7c40 100644 --- a/usr/src/lib/libc_db/amd64/Makefile +++ b/usr/src/lib/libc_db/amd64/Makefile @@ -33,4 +33,5 @@ CPPFLAGS += -D_SYSCALL32 BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libc_db/i386/Makefile b/usr/src/lib/libc_db/i386/Makefile index cce50fc565..5e1faf8ef7 100644 --- a/usr/src/lib/libc_db/i386/Makefile +++ b/usr/src/lib/libc_db/i386/Makefile @@ -30,4 +30,5 @@ include ../Makefile.com BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libc_db/sparc/Makefile b/usr/src/lib/libc_db/sparc/Makefile index 6d3026e506..64b7326c93 100644 --- a/usr/src/lib/libc_db/sparc/Makefile +++ b/usr/src/lib/libc_db/sparc/Makefile @@ -30,4 +30,5 @@ include ../Makefile.com BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libc_db/sparcv9/Makefile b/usr/src/lib/libc_db/sparcv9/Makefile index ee65b634b0..6e0e5d6357 100644 --- a/usr/src/lib/libc_db/sparcv9/Makefile +++ b/usr/src/lib/libc_db/sparcv9/Makefile @@ -33,4 +33,5 @@ CPPFLAGS += -D_SYSCALL32 BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libcfgadm/Makefile b/usr/src/lib/libcfgadm/Makefile index f611f09cfe..fb11d6b18e 100644 --- a/usr/src/lib/libcfgadm/Makefile +++ b/usr/src/lib/libcfgadm/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/Makefile.lib @@ -38,11 +36,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) check install_h: diff --git a/usr/src/lib/libcfgadm/Makefile.com b/usr/src/lib/libcfgadm/Makefile.com index d246e9a0e7..ea2f33e0a3 100644 --- a/usr/src/lib/libcfgadm/Makefile.com +++ b/usr/src/lib/libcfgadm/Makefile.com @@ -30,11 +30,10 @@ OBJECTS = config_admin.o include ../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -ldevinfo -lc SRCDIR = ../common -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-type-limits @@ -46,6 +45,5 @@ SMOFF += snprintf_overflow all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libcfgadm/i386/Makefile b/usr/src/lib/libcfgadm/i386/Makefile index affb29d3e2..e1ed99e193 100644 --- a/usr/src/lib/libcfgadm/i386/Makefile +++ b/usr/src/lib/libcfgadm/i386/Makefile @@ -23,9 +23,7 @@ # Copyright 1997-2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libcfgadm/sparc/Makefile b/usr/src/lib/libcfgadm/sparc/Makefile index affb29d3e2..e1ed99e193 100644 --- a/usr/src/lib/libcfgadm/sparc/Makefile +++ b/usr/src/lib/libcfgadm/sparc/Makefile @@ -23,9 +23,7 @@ # Copyright 1997-2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libcmd/Makefile b/usr/src/lib/libcmd/Makefile index 45c808effe..f958be9ad9 100644 --- a/usr/src/lib/libcmd/Makefile +++ b/usr/src/lib/libcmd/Makefile @@ -36,12 +36,11 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint -_msg := TARGET= _msg +_msg := TARGET= _msg .KEEP_STATE: -all clean clobber install lint _msg: $(SUBDIRS) +all clean clobber install _msg: $(SUBDIRS) HDRS= \ cmd.h \ diff --git a/usr/src/lib/libcmd/Makefile.com b/usr/src/lib/libcmd/Makefile.com index 0e8f049eef..4382f40764 100644 --- a/usr/src/lib/libcmd/Makefile.com +++ b/usr/src/lib/libcmd/Makefile.com @@ -91,9 +91,7 @@ MAPFILES= ../mapfile-vers # Set common AST build flags (e.g. C99/XPG6, needed to support the math stuff) include ../../../Makefile.ast -LIBS = $(DYNLIB) $(LINTLIB) - -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) +LIBS = $(DYNLIB) LDLIBS += \ -lsum \ @@ -148,14 +146,6 @@ pics/vmstate.o := CERRWARN += -erroff=E_NO_IMPLICIT_DECL_ALLOWED .KEEP_STATE: -all: $(LIBS) - -# -# libcmd is not lint-clean yet; fake up a target. (You can use -# "make lintcheck" to actually run lint; please send all lint fixes -# upstream (to AT&T) so the next update will pull them into ON.) -# -lint: - @ print "usr/src/lib/libcmd is not lint-clean: skipping" +all: $(LIBS) include ../../Makefile.targ diff --git a/usr/src/lib/libcmd/i386/Makefile b/usr/src/lib/libcmd/i386/Makefile index c3ea53cfe4..6cbbf06d61 100644 --- a/usr/src/lib/libcmd/i386/Makefile +++ b/usr/src/lib/libcmd/i386/Makefile @@ -23,11 +23,9 @@ # Copyright (c) 1997-2001 by Sun Microsystems, Inc. # All rights reserved. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libcmd/sparc/Makefile b/usr/src/lib/libcmd/sparc/Makefile index c3ea53cfe4..6cbbf06d61 100644 --- a/usr/src/lib/libcmd/sparc/Makefile +++ b/usr/src/lib/libcmd/sparc/Makefile @@ -23,11 +23,9 @@ # Copyright (c) 1997-2001 by Sun Microsystems, Inc. # All rights reserved. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libcmdutils/Makefile b/usr/src/lib/libcmdutils/Makefile index 20de3cba82..06e951aab1 100644 --- a/usr/src/lib/libcmdutils/Makefile +++ b/usr/src/lib/libcmdutils/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -34,7 +32,6 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint # definitions for install_h target HDRS= libcmdutils.h @@ -44,7 +41,7 @@ CHECKHDRS= $(HDRS:%.h=%.check) .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(ROOTHDRDIR)/%: % $(INS.file) diff --git a/usr/src/lib/libcmdutils/Makefile.com b/usr/src/lib/libcmdutils/Makefile.com index 72e7330eba..09849c48fb 100644 --- a/usr/src/lib/libcmdutils/Makefile.com +++ b/usr/src/lib/libcmdutils/Makefile.com @@ -34,7 +34,7 @@ OBJECTS= $(CMD_OBJS) $(COM_OBJS) include ../../Makefile.lib include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -lavl -lnvpair @@ -45,8 +45,6 @@ SRCS= \ $(CMD_OBJS:%.o=$(SRCDIR)/%.c) \ $(COM_OBJS:%.o=$(COMDIR)/%.c) -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) - CFLAGS += $(CCVERBOSE) # All commands using the common avltree interfaces must @@ -57,7 +55,6 @@ CPPFLAGS += -I.. -I../../common/inc -D_REENTRANT -D_FILE_OFFSET_BITS=64 all: $(LIBS) -lint: lintcheck pics/%.o: $(COMDIR)/%.c $(COMPILE.c) -o $@ $< diff --git a/usr/src/lib/libcmdutils/amd64/Makefile b/usr/src/lib/libcmdutils/amd64/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/libcmdutils/amd64/Makefile +++ b/usr/src/lib/libcmdutils/amd64/Makefile @@ -23,10 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libcmdutils/i386/Makefile b/usr/src/lib/libcmdutils/i386/Makefile index 96cc6102e0..16c9d09c13 100644 --- a/usr/src/lib/libcmdutils/i386/Makefile +++ b/usr/src/lib/libcmdutils/i386/Makefile @@ -23,10 +23,7 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libcmdutils/i386/Makefile include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libcmdutils/sparc/Makefile b/usr/src/lib/libcmdutils/sparc/Makefile index bfca2e1372..16c9d09c13 100644 --- a/usr/src/lib/libcmdutils/sparc/Makefile +++ b/usr/src/lib/libcmdutils/sparc/Makefile @@ -23,10 +23,7 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libcmdutils/sparc/Makefile include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libcmdutils/sparcv9/Makefile b/usr/src/lib/libcmdutils/sparcv9/Makefile index 8b7605f4cf..ceab7c0bdd 100644 --- a/usr/src/lib/libcmdutils/sparcv9/Makefile +++ b/usr/src/lib/libcmdutils/sparcv9/Makefile @@ -23,11 +23,11 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" + # # lib/libcmdutils/sparcv9/Makefile include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libcommputil/Makefile b/usr/src/lib/libcommputil/Makefile index af66849ca2..01f28ba2b9 100644 --- a/usr/src/lib/libcommputil/Makefile +++ b/usr/src/lib/libcommputil/Makefile @@ -21,8 +21,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -35,11 +33,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libcommputil/Makefile.com b/usr/src/lib/libcommputil/Makefile.com index 75cc04bf52..30558d0acc 100644 --- a/usr/src/lib/libcommputil/Makefile.com +++ b/usr/src/lib/libcommputil/Makefile.com @@ -21,8 +21,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY = libcommputil.a VERS = .1 @@ -31,8 +29,7 @@ OBJECTS = commp_util.o sdp_parse_helper.o sdp.o sdp_parse.o include ../../Makefile.lib SRCDIR = ../common -LIBS = $(DYNLIB) $(LINTLIB) -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) +LIBS = $(DYNLIB) LDLIBS += -lc CFLAGS += $(CCVERBOSE) @@ -42,6 +39,5 @@ CPPFLAGS += -DNDEBUG all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libcommputil/i386/Makefile b/usr/src/lib/libcommputil/i386/Makefile index 3a2e1d517e..32145a695a 100644 --- a/usr/src/lib/libcommputil/i386/Makefile +++ b/usr/src/lib/libcommputil/i386/Makefile @@ -21,9 +21,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libcommputil/sparc/Makefile b/usr/src/lib/libcommputil/sparc/Makefile index 3a2e1d517e..32145a695a 100644 --- a/usr/src/lib/libcommputil/sparc/Makefile +++ b/usr/src/lib/libcommputil/sparc/Makefile @@ -21,9 +21,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libcontract/Makefile b/usr/src/lib/libcontract/Makefile index 8d05db4980..1768051bb4 100644 --- a/usr/src/lib/libcontract/Makefile +++ b/usr/src/lib/libcontract/Makefile @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -36,15 +34,14 @@ MSGFILES = common/process_dump.c common/device_dump.c \ common/libcontract_priv.c POFILE = libcontract.po -all := TARGET = all +all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(POFILE): $(MSGFILES) $(BUILDPO.msgfiles) diff --git a/usr/src/lib/libcontract/Makefile.com b/usr/src/lib/libcontract/Makefile.com index 050d42944e..6ec88f473f 100644 --- a/usr/src/lib/libcontract/Makefile.com +++ b/usr/src/lib/libcontract/Makefile.com @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY = libcontract.a VERS = .1 @@ -40,10 +38,9 @@ OBJECTS = \ include ../../Makefile.lib include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) -SRCDIR = ../common +LIBS = $(DYNLIB) +SRCDIR = ../common -$(LINTLIB) := SRCS = $(SRCDIR)/llib-lcontract LDLIBS += -lnvpair -lc CPPFLAGS += -I$(SRCDIR) -D_REENTRANT @@ -53,6 +50,5 @@ CFLAGS += $(CCVERBOSE) all: $(LIBS) -lint: $(LINTLIB) lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libcontract/amd64/Makefile b/usr/src/lib/libcontract/amd64/Makefile index dd68231e26..2bbd813164 100644 --- a/usr/src/lib/libcontract/amd64/Makefile +++ b/usr/src/lib/libcontract/amd64/Makefile @@ -23,10 +23,8 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libcontract/i386/Makefile b/usr/src/lib/libcontract/i386/Makefile index af76f5ab90..59045395eb 100644 --- a/usr/src/lib/libcontract/i386/Makefile +++ b/usr/src/lib/libcontract/i386/Makefile @@ -23,9 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libcontract/sparc/Makefile b/usr/src/lib/libcontract/sparc/Makefile index af76f5ab90..59045395eb 100644 --- a/usr/src/lib/libcontract/sparc/Makefile +++ b/usr/src/lib/libcontract/sparc/Makefile @@ -23,9 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libcontract/sparcv9/Makefile b/usr/src/lib/libcontract/sparcv9/Makefile index cb39a2beff..2bbd813164 100644 --- a/usr/src/lib/libcontract/sparcv9/Makefile +++ b/usr/src/lib/libcontract/sparcv9/Makefile @@ -23,10 +23,8 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libcpc/Makefile b/usr/src/lib/libcpc/Makefile index 400c0ef52b..33f63217ae 100644 --- a/usr/src/lib/libcpc/Makefile +++ b/usr/src/lib/libcpc/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -37,16 +35,15 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint -LIBRARY= libcpc.a +LIBRARY= libcpc.a POFILE= $(LIBRARY:.a=.po) MSGFILES = common/libcpc.c common/obsoleted.c common/subr.c XGETFLAGS= -a .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libcpc/Makefile.com b/usr/src/lib/libcpc/Makefile.com index 096cab7672..1980fb76ef 100644 --- a/usr/src/lib/libcpc/Makefile.com +++ b/usr/src/lib/libcpc/Makefile.com @@ -36,8 +36,7 @@ SRCS = $(ASOBJS:%.o=../$(MACH)/%.s) \ $(V1_OBJS:%.o=../common/%.c) \ $(COBJS:%.o=../common/%.c) -LIBS = $(DYNLIB) $(LINTLIB) -$(LINTLIB) := SRCS = ../common/llib-lcpc +LIBS = $(DYNLIB) LDLIBS += -lpctx -lnvpair -lc SRCDIR = ../common @@ -56,7 +55,6 @@ SMATCH=off all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libcpc/i386/Makefile b/usr/src/lib/libcpc/i386/Makefile index 3dacd61ab9..52dcb47986 100644 --- a/usr/src/lib/libcpc/i386/Makefile +++ b/usr/src/lib/libcpc/i386/Makefile @@ -23,12 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# MACHCOBJS = conf_pentium.o event_pentium.o -ASOBJS = getcpuid.o +ASOBJS = getcpuid.o include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libcpc/sparc/Makefile b/usr/src/lib/libcpc/sparc/Makefile index 74eb98601b..c89709520b 100644 --- a/usr/src/lib/libcpc/sparc/Makefile +++ b/usr/src/lib/libcpc/sparc/Makefile @@ -23,8 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# MACHCOBJS = conf_ultra.o event_ultra.o @@ -32,4 +30,4 @@ include ../Makefile.com LDLIBS += -ldevinfo -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libcrypt/Makefile b/usr/src/lib/libcrypt/Makefile index 7e799cd36f..5479015393 100644 --- a/usr/src/lib/libcrypt/Makefile +++ b/usr/src/lib/libcrypt/Makefile @@ -32,11 +32,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) check: $(CHECKHDRS) diff --git a/usr/src/lib/libcrypt/Makefile.com b/usr/src/lib/libcrypt/Makefile.com index a7f7632667..eb4db4b311 100644 --- a/usr/src/lib/libcrypt/Makefile.com +++ b/usr/src/lib/libcrypt/Makefile.com @@ -38,9 +38,7 @@ include ../../Makefile.lib SRCDIR= ../common -LIBS= $(DYNLIB) $(LINTLIB) - -$(LINTLIB):= SRCS=$(SRCDIR)/$(LINTSRC) +LIBS= $(DYNLIB) CFLAGS += $(CCVERBOSE) CPPFLAGS += -D_REENTRANT -I../inc -I../../common/inc -I../../libgen/inc @@ -53,28 +51,25 @@ CERRWARN += $(CNOWARN_UNINIT) all: $(LIBS) -lint: lintcheck -include ../../Makefile.targ +COMPATLINKS = usr/lib/libcrypt_i.so$(VERS) \ + usr/lib/libcrypt_i.so \ + usr/lib/libcrypt_d.so$(VERS) \ + usr/lib/libcrypt_d.so -$(ROOTLINKS) := INS.liblink = \ - $(RM) $@; $(SYMLINK) $(LIBLINKPATH)$(LIBLINKS)$(VERS) $@; \ - cd $(ROOTLIBDIR); \ - $(RM) libcrypt_i.so$(VERS) libcrypt_i.so ;\ - $(RM) libcrypt_d.so$(VERS) libcrypt_d.so ;\ - $(SYMLINK) libcrypt.so$(VERS) libcrypt_i.so$(VERS); \ - $(SYMLINK) libcrypt.so libcrypt_i.so; \ - $(SYMLINK) libcrypt.so$(VERS) libcrypt_d.so$(VERS); \ - $(SYMLINK) libcrypt.so libcrypt_d.so; +COMPATLINKS64 = usr/lib/$(MACH64)/libcrypt_i.so$(VERS) \ + usr/lib/$(MACH64)/libcrypt_i.so \ + usr/lib/$(MACH64)/libcrypt_d.so$(VERS) \ + usr/lib/$(MACH64)/libcrypt_d.so -$(ROOTLINKS64) := INS.liblink64 = \ - $(RM) $@; $(SYMLINK) $(LIBLINKPATH)$(LIBLINKS)$(VERS) $@; \ - cd $(ROOTLIBDIR64); \ - $(RM) libcrypt_i.so$(VERS) libcrypt_i.so ;\ - $(RM) libcrypt_d.so$(VERS) libcrypt_d.so ;\ - $(SYMLINK) libcrypt.so$(VERS) libcrypt_i.so$(VERS); \ - $(SYMLINK) libcrypt.so libcrypt_i.so; \ - $(SYMLINK) libcrypt.so$(VERS) libcrypt_d.so$(VERS); \ - $(SYMLINK) libcrypt.so libcrypt_d.so; +$(ROOT)/usr/lib/libcrypt_i.so$(VERS) := COMPATLINKTARGET= libcrypt.so$(VERS) +$(ROOT)/usr/lib/libcrypt_i.so := COMPATLINKTARGET= libcrypt.so +$(ROOT)/usr/lib/libcrypt_d.so$(VERS) := COMPATLINKTARGET= libcrypt.so$(VERS) +$(ROOT)/usr/lib/libcrypt_d.so := COMPATLINKTARGET= libcrypt.so +$(ROOT)/usr/lib/$(MACH64)/libcrypt_i.so$(VERS) := COMPATLINKTARGET= libcrypt.so$(VERS) +$(ROOT)/usr/lib/$(MACH64)/libcrypt_i.so := COMPATLINKTARGET= libcrypt.so +$(ROOT)/usr/lib/$(MACH64)/libcrypt_d.so$(VERS) := COMPATLINKTARGET= libcrypt.so$(VERS) +$(ROOT)/usr/lib/$(MACH64)/libcrypt_d.so := COMPATLINKTARGET= libcrypt.so +include ../../Makefile.targ diff --git a/usr/src/lib/libcrypt/amd64/Makefile b/usr/src/lib/libcrypt/amd64/Makefile index bd2cdcd780..410bdb818e 100644 --- a/usr/src/lib/libcrypt/amd64/Makefile +++ b/usr/src/lib/libcrypt/amd64/Makefile @@ -23,13 +23,10 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/libcrypt/amd64/Makefile include ../Makefile.com include ../../Makefile.lib.64 .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libcrypt/i386/Makefile b/usr/src/lib/libcrypt/i386/Makefile index d4def41822..dc6deda296 100644 --- a/usr/src/lib/libcrypt/i386/Makefile +++ b/usr/src/lib/libcrypt/i386/Makefile @@ -23,10 +23,7 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/libcrypt/ie86/Makefile include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libcrypt/sparc/Makefile b/usr/src/lib/libcrypt/sparc/Makefile index bcba4a291d..dc6deda296 100644 --- a/usr/src/lib/libcrypt/sparc/Makefile +++ b/usr/src/lib/libcrypt/sparc/Makefile @@ -23,10 +23,7 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/libcrypt/sparc/Makefile include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libcrypt/sparcv9/Makefile b/usr/src/lib/libcrypt/sparcv9/Makefile index 87ac99efc1..14bdb8486d 100644 --- a/usr/src/lib/libcrypt/sparcv9/Makefile +++ b/usr/src/lib/libcrypt/sparcv9/Makefile @@ -23,11 +23,8 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/libcrypt/sparc/Makefile include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libcryptoutil/Makefile b/usr/src/lib/libcryptoutil/Makefile index 3f17cf53ab..582f2bb041 100644 --- a/usr/src/lib/libcryptoutil/Makefile +++ b/usr/src/lib/libcryptoutil/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/Makefile.lib @@ -36,11 +34,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libcryptoutil/Makefile.com b/usr/src/lib/libcryptoutil/Makefile.com index ff22edb318..df824b45ab 100644 --- a/usr/src/lib/libcryptoutil/Makefile.com +++ b/usr/src/lib/libcryptoutil/Makefile.com @@ -44,13 +44,11 @@ include $(SRC)/lib/Makefile.rootfs SRCDIR= ../common -LIBS = $(DYNLIB) $(LINTLIB) -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) +LIBS = $(DYNLIB) LDLIBS += -lc CFLAGS += $(CCVERBOSE) CPPFLAGS += -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -I$(SRCDIR) -LINTFLAGS64 += -errchk=longptr64 CERRWARN += -_gcc=-Wno-parentheses CERRWARN += $(CNOWARN_UNINIT) @@ -60,6 +58,5 @@ SMATCH=off all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libcryptoutil/amd64/Makefile b/usr/src/lib/libcryptoutil/amd64/Makefile index 4720148af4..f7ec944033 100644 --- a/usr/src/lib/libcryptoutil/amd64/Makefile +++ b/usr/src/lib/libcryptoutil/amd64/Makefile @@ -23,12 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libcryptoutil/i386/Makefile b/usr/src/lib/libcryptoutil/i386/Makefile index 3921305654..f8be94d718 100644 --- a/usr/src/lib/libcryptoutil/i386/Makefile +++ b/usr/src/lib/libcryptoutil/i386/Makefile @@ -23,9 +23,7 @@ # Copyright 2002-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libcryptoutil/sparc/Makefile b/usr/src/lib/libcryptoutil/sparc/Makefile index 3921305654..f8be94d718 100644 --- a/usr/src/lib/libcryptoutil/sparc/Makefile +++ b/usr/src/lib/libcryptoutil/sparc/Makefile @@ -23,9 +23,7 @@ # Copyright 2002-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libcryptoutil/sparcv9/Makefile b/usr/src/lib/libcryptoutil/sparcv9/Makefile index 5b07b54edf..d8eeb607d8 100644 --- a/usr/src/lib/libcryptoutil/sparcv9/Makefile +++ b/usr/src/lib/libcryptoutil/sparcv9/Makefile @@ -23,12 +23,10 @@ # Copyright 2002-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libctf/Makefile b/usr/src/lib/libctf/Makefile index 5a8b3f9ed4..e89f63cba8 100644 --- a/usr/src/lib/libctf/Makefile +++ b/usr/src/lib/libctf/Makefile @@ -22,26 +22,23 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib HDRS = libctf.h HDRDIR = common -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libctf/Makefile.com b/usr/src/lib/libctf/Makefile.com index 0169c2a367..45c2cd3117 100644 --- a/usr/src/lib/libctf/Makefile.com +++ b/usr/src/lib/libctf/Makefile.com @@ -30,7 +30,6 @@ include ../../Makefile.rootfs all: $(LIBS) -lint: lintcheck include ../../Makefile.targ include ../Makefile.shared.targ diff --git a/usr/src/lib/libctf/Makefile.shared.com b/usr/src/lib/libctf/Makefile.shared.com index 39100e6831..76cfd00da4 100644 --- a/usr/src/lib/libctf/Makefile.shared.com +++ b/usr/src/lib/libctf/Makefile.shared.com @@ -70,11 +70,10 @@ SRCS = \ $(LIST_OBJS:%.o=$(SRC)/common/list/%.c) \ $(MERGEQ_OBJS:%.o=$(SRC)/lib/mergeq/%.c) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -lelf -ldwarf -lavl CSTD = $(CSTD_GNU99) -C99LMODE = -Xc99=%all SRCDIR = $(SRC)/lib/libctf/common @@ -86,5 +85,3 @@ CPPFLAGS += -I$(SRC)/lib/libctf/common \ CFLAGS += $(CCVERBOSE) CERRWARN += $(CNOWARN_UNINIT) - -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) diff --git a/usr/src/lib/libctf/amd64/Makefile b/usr/src/lib/libctf/amd64/Makefile index c9bd26cfd3..a48c536235 100644 --- a/usr/src/lib/libctf/amd64/Makefile +++ b/usr/src/lib/libctf/amd64/Makefile @@ -22,10 +22,8 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libctf/i386/Makefile b/usr/src/lib/libctf/i386/Makefile index a333224278..cf2087e71e 100644 --- a/usr/src/lib/libctf/i386/Makefile +++ b/usr/src/lib/libctf/i386/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libctf/sparc/Makefile b/usr/src/lib/libctf/sparc/Makefile index a333224278..cf2087e71e 100644 --- a/usr/src/lib/libctf/sparc/Makefile +++ b/usr/src/lib/libctf/sparc/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libctf/sparcv9/Makefile b/usr/src/lib/libctf/sparcv9/Makefile index c9bd26cfd3..a48c536235 100644 --- a/usr/src/lib/libctf/sparcv9/Makefile +++ b/usr/src/lib/libctf/sparcv9/Makefile @@ -22,10 +22,8 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libcurses/Makefile b/usr/src/lib/libcurses/Makefile index 9e88e23114..594a2c7ba7 100644 --- a/usr/src/lib/libcurses/Makefile +++ b/usr/src/lib/libcurses/Makefile @@ -33,7 +33,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint test := TARGET= test SCRFILES = screen/keycaps \ @@ -48,7 +47,7 @@ SCRFILES = screen/keycaps \ screen/term.h # definitions for install_h target -HDRS= curses.h term.h unctrl.h +HDRS= curses.h term.h unctrl.h HDRDIR= screen LIBRARY= libcurses.a @@ -71,7 +70,7 @@ all: $(SCRFILES) .WAIT $(SUBDIRS) install: all .WAIT $(SUBDIRS) -clean clobber lint test: $(SUBDIRS) +clean clobber test: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libcurses/Makefile.com b/usr/src/lib/libcurses/Makefile.com index 51dce6c5bc..2082f3b634 100644 --- a/usr/src/lib/libcurses/Makefile.com +++ b/usr/src/lib/libcurses/Makefile.com @@ -136,16 +136,7 @@ include ../../Makefile.rootfs SRCDIR = ../screen -LIBS = $(DYNLIB) $(LINTLIB) - -# definitions for lint - -$(LINTLIB):= SRCS=../screen/llib-lcurses - -LINTOUT= lint.out -LINTSRC= $(LINTLIB:%.ln=%) - -CLEANFILES += $(LINTOUT) $(LINTLIB) +LIBS = $(DYNLIB) CFLAGS += $(CCVERBOSE) @@ -171,51 +162,37 @@ CLOBBERFILES= libcurses.so libcurses.so$(VERS) all: $(LIBS) -lint: lintcheck - -# -# Install rules for libtermlib.so links. -# Augments the rule in Makefile.targ -# -$(ROOTLIBDIR)/$(LIBLINKS) := INS.liblink= \ - $(RM) $@; $(SYMLINK) $(LIBLINKPATH)$(LIBLINKS)$(VERS) $@; \ - cd $(ROOTLIBDIR); \ - $(RM) libtermlib.so libtermlib.so$(VERS); \ - $(SYMLINK) libcurses.so$(VERS) libtermlib.so$(VERS); \ - $(SYMLINK) libtermlib.so$(VERS) libtermlib.so; - -$(ROOTLIBDIR64)/$(LIBLINKS) := INS.liblink64= \ - $(RM) $@; $(SYMLINK) $(LIBLINKPATH)$(LIBLINKS)$(VERS) $@; \ - cd $(ROOTLIBDIR64); \ - $(RM) libtermlib.so libtermlib.so$(VERS);\ - $(SYMLINK) libcurses.so$(VERS) libtermlib.so$(VERS); \ - $(SYMLINK) libtermlib.so$(VERS) libtermlib.so; - -# -# Install rules for libtermlib.ln links. -# Augments a pattern rule in Makefile.targ -# -$(ROOTLIBDIR)/$(LINTLIB) := INS.file= \ - -$(RM) $@; $(INS) -s -m $(FILEMODE) -f $(@D) $(LINTLIB); \ - cd $(ROOTLIBDIR); \ - $(RM) llib-ltermlib.ln ; \ - $(SYMLINK) ./llib-lcurses.ln llib-ltermlib.ln; - -$(ROOTLIBDIR64)/$(LINTLIB) := INS.file= \ - -$(RM) $@; $(INS) -s -m $(FILEMODE) -f $(@D) $(LINTLIB); \ - cd $(ROOTLIBDIR64); \ - $(RM) llib-ltermlib.ln ; \ - $(SYMLINK) ./llib-lcurses.ln llib-ltermlib.ln; - -# -# Install rule for the lint source, which is installed only in -# the default library dir, not MACH64 etc. -# -$(ROOTLINTDIR)/%: ../screen/% - $(INS.file) - cd $(ROOTLINTDIR); \ - $(RM) llib-ltermlib ; \ - $(SYMLINK) ./llib-lcurses llib-ltermlib; +COMPATLINKS += usr/ccs/lib/libcurses.so \ + usr/ccs/lib/libtermlib.so \ + usr/lib/libtermlib.so \ + usr/lib/libtermlib.so.1 \ + lib/libtermlib.so \ + lib/libtermlib.so.1 + +COMPATLINKS64 += usr/ccs/lib/$(MACH64)/libcurses.so \ + usr/ccs/lib/$(MACH64)/libtermlib.so \ + usr/lib/$(MACH64)/libtermlib.so \ + usr/lib/$(MACH64)/libtermlib.so.1 \ + lib/$(MACH64)/libtermlib.so \ + lib/$(MACH64)/libtermlib.so.1 + +$(ROOT)/usr/ccs/lib/libcurses.so := COMPATLINKTARGET=../../../lib/libcurses.so.1 +$(ROOT)/usr/ccs/lib/libtermlib.so := \ + COMPATLINKTARGET=../../../lib/libcurses.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libcurses.so := \ + COMPATLINKTARGET=../../../../lib/$(MACH64)/libcurses.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libtermlib.so := \ + COMPATLINKTARGET=../../../../lib/$(MACH64)/libcurses.so.1 +$(ROOT)/usr/lib/libtermlib.so.1 := COMPATLINKTARGET= ../../lib/libcurses.so.1 +$(ROOT)/usr/lib/libtermlib.so := COMPATLINKTARGET= ../../lib/libcurses.so.1 +$(ROOT)/usr/lib/$(MACH64)/libtermlib.so.1 := \ + COMPATLINKTARGET= ../../../lib/$(MACH64)/libcurses.so.1 +$(ROOT)/usr/lib/$(MACH64)/libtermlib.so := \ + COMPATLINKTARGET= ../../../lib/$(MACH64)/libcurses.so.1 +$(ROOT)/lib/libtermlib.so.1 := COMPATLINKTARGET= libcurses.so.1 +$(ROOT)/lib/libtermlib.so := COMPATLINKTARGET= libtermlib.so.1 +$(ROOT)/lib/$(MACH64)/libtermlib.so.1 := COMPATLINKTARGET= libcurses.so.1 +$(ROOT)/lib/$(MACH64)/libtermlib.so := COMPATLINKTARGET= libtermlib.so.1 # # Include library targets diff --git a/usr/src/lib/libcurses/amd64/Makefile b/usr/src/lib/libcurses/amd64/Makefile index 57138967e0..81d2c84ed7 100644 --- a/usr/src/lib/libcurses/amd64/Makefile +++ b/usr/src/lib/libcurses/amd64/Makefile @@ -31,4 +31,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libcurses/i386/Makefile b/usr/src/lib/libcurses/i386/Makefile index 2a944b0b43..8537c30eda 100644 --- a/usr/src/lib/libcurses/i386/Makefile +++ b/usr/src/lib/libcurses/i386/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -31,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libcurses/sparc/Makefile b/usr/src/lib/libcurses/sparc/Makefile index 2a944b0b43..8537c30eda 100644 --- a/usr/src/lib/libcurses/sparc/Makefile +++ b/usr/src/lib/libcurses/sparc/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -31,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libcurses/sparcv9/Makefile b/usr/src/lib/libcurses/sparcv9/Makefile index 57138967e0..81d2c84ed7 100644 --- a/usr/src/lib/libcurses/sparcv9/Makefile +++ b/usr/src/lib/libcurses/sparcv9/Makefile @@ -31,4 +31,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libcustr/Makefile b/usr/src/lib/libcustr/Makefile index c89032e534..8ca9874ff0 100644 --- a/usr/src/lib/libcustr/Makefile +++ b/usr/src/lib/libcustr/Makefile @@ -25,14 +25,13 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint # needs work SMOFF=all_func_returns .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libcustr/Makefile.com b/usr/src/lib/libcustr/Makefile.com index cbd61ece4b..a02e344400 100644 --- a/usr/src/lib/libcustr/Makefile.com +++ b/usr/src/lib/libcustr/Makefile.com @@ -24,17 +24,15 @@ include $(SRC)/lib/Makefile.lib # split onto its own filesystem. include $(SRC)/lib/Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc CPPFLAGS += -D__EXTENSIONS__ SRCDIR = ../common -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) .KEEP_STATE: all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libcustr/i386/Makefile b/usr/src/lib/libcustr/i386/Makefile index f32d7a5b91..830e377109 100644 --- a/usr/src/lib/libcustr/i386/Makefile +++ b/usr/src/lib/libcustr/i386/Makefile @@ -15,4 +15,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libcustr/sparc/Makefile b/usr/src/lib/libcustr/sparc/Makefile index f32d7a5b91..830e377109 100644 --- a/usr/src/lib/libcustr/sparc/Makefile +++ b/usr/src/lib/libcustr/sparc/Makefile @@ -15,4 +15,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libdemangle/Makefile b/usr/src/lib/libdemangle/Makefile index 2d17d76e7f..cc9547b148 100644 --- a/usr/src/lib/libdemangle/Makefile +++ b/usr/src/lib/libdemangle/Makefile @@ -23,11 +23,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libdemangle/Makefile.com b/usr/src/lib/libdemangle/Makefile.com index 7eba05ce1c..76f2e444fc 100644 --- a/usr/src/lib/libdemangle/Makefile.com +++ b/usr/src/lib/libdemangle/Makefile.com @@ -20,24 +20,19 @@ OBJECTS = str.o strview.o util.o cxx_util.o cxx.o demangle.o rust.o include ../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -lcustr SRCDIR = ../common -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CSTD = $(CSTD_GNU99) CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(SRCDIR) -D_REENTRANT -D__EXTENSIONS__ -LINTFLAGS += -erroff=E_BAD_FORMAT_ARG_TYPE2 -LINTFLAGS64 += -erroff=E_BAD_FORMAT_ARG_TYPE2 -C99LMODE = -Xc99=%all .KEEP_STATE: all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libdemangle/amd64/Makefile b/usr/src/lib/libdemangle/amd64/Makefile index 137dd0cf23..3311ca3c1f 100644 --- a/usr/src/lib/libdemangle/amd64/Makefile +++ b/usr/src/lib/libdemangle/amd64/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libdemangle/i386/Makefile b/usr/src/lib/libdemangle/i386/Makefile index a91bb3aa20..029e658444 100644 --- a/usr/src/lib/libdemangle/i386/Makefile +++ b/usr/src/lib/libdemangle/i386/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libdemangle/sparc/Makefile b/usr/src/lib/libdemangle/sparc/Makefile index a91bb3aa20..029e658444 100644 --- a/usr/src/lib/libdemangle/sparc/Makefile +++ b/usr/src/lib/libdemangle/sparc/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libdemangle/sparcv9/Makefile b/usr/src/lib/libdemangle/sparcv9/Makefile index 86609bbf96..9889ba1f77 100644 --- a/usr/src/lib/libdemangle/sparcv9/Makefile +++ b/usr/src/lib/libdemangle/sparcv9/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libdevice/Makefile b/usr/src/lib/libdevice/Makefile index deea4f83e8..6366f93d66 100644 --- a/usr/src/lib/libdevice/Makefile +++ b/usr/src/lib/libdevice/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -35,7 +33,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint test := TARGET= test # definitions for install_h target @@ -46,7 +43,7 @@ CHECKHDRS= $(HDRS:%.h=%.check) .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) # install rule for install_h target diff --git a/usr/src/lib/libdevice/Makefile.com b/usr/src/lib/libdevice/Makefile.com index 49b8083fa6..de399daaec 100644 --- a/usr/src/lib/libdevice/Makefile.com +++ b/usr/src/lib/libdevice/Makefile.com @@ -30,9 +30,8 @@ OBJECTS= devctl.o include ../../Makefile.lib include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -lnvpair -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CPPFLAGS += -D_REENTRANT @@ -41,7 +40,6 @@ CERRWARN += -_gcc=-Wno-parentheses all: $(LIBS) -lint: lintcheck .KEEP_STATE: diff --git a/usr/src/lib/libdevice/amd64/Makefile b/usr/src/lib/libdevice/amd64/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/libdevice/amd64/Makefile +++ b/usr/src/lib/libdevice/amd64/Makefile @@ -23,10 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdevice/i386/Makefile b/usr/src/lib/libdevice/i386/Makefile index af76f5ab90..59045395eb 100644 --- a/usr/src/lib/libdevice/i386/Makefile +++ b/usr/src/lib/libdevice/i386/Makefile @@ -23,9 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdevice/sparc/Makefile b/usr/src/lib/libdevice/sparc/Makefile index af76f5ab90..59045395eb 100644 --- a/usr/src/lib/libdevice/sparc/Makefile +++ b/usr/src/lib/libdevice/sparc/Makefile @@ -23,9 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdevice/sparcv9/Makefile b/usr/src/lib/libdevice/sparcv9/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/libdevice/sparcv9/Makefile +++ b/usr/src/lib/libdevice/sparcv9/Makefile @@ -23,10 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdevid/Makefile b/usr/src/lib/libdevid/Makefile index 86addda787..0596f63e85 100644 --- a/usr/src/lib/libdevid/Makefile +++ b/usr/src/lib/libdevid/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -31,11 +29,10 @@ SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) # conditional assignments -all := TARGET= all +all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint test := TARGET= test # definitions for install_h target @@ -46,7 +43,7 @@ CHECKHDRS= $(HDRS:%.h=%.check) .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) $(ROOTHDRDIR)/%: % $(INS.file) diff --git a/usr/src/lib/libdevid/Makefile.com b/usr/src/lib/libdevid/Makefile.com index cfef8fb21f..7b69bdf822 100644 --- a/usr/src/lib/libdevid/Makefile.com +++ b/usr/src/lib/libdevid/Makefile.com @@ -34,8 +34,7 @@ include ../../Makefile.rootfs SRCS = ../deviceid.c $(SRC)/common/devid/devid.c \ $(SRC)/common/devid/devid_scsi.c \ $(SRC)/common/devid/devid_smp.c -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) # # Libraries added to the next line must be present in miniroot # @@ -47,7 +46,6 @@ CFLAGS += $(CCVERBOSE) all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libdevid/amd64/Makefile b/usr/src/lib/libdevid/amd64/Makefile index dd68231e26..2bbd813164 100644 --- a/usr/src/lib/libdevid/amd64/Makefile +++ b/usr/src/lib/libdevid/amd64/Makefile @@ -23,10 +23,8 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdevid/i386/Makefile b/usr/src/lib/libdevid/i386/Makefile index af76f5ab90..59045395eb 100644 --- a/usr/src/lib/libdevid/i386/Makefile +++ b/usr/src/lib/libdevid/i386/Makefile @@ -23,9 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdevid/sparc/Makefile b/usr/src/lib/libdevid/sparc/Makefile index af76f5ab90..59045395eb 100644 --- a/usr/src/lib/libdevid/sparc/Makefile +++ b/usr/src/lib/libdevid/sparc/Makefile @@ -23,9 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdevid/sparcv9/Makefile b/usr/src/lib/libdevid/sparcv9/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/libdevid/sparcv9/Makefile +++ b/usr/src/lib/libdevid/sparcv9/Makefile @@ -23,10 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdevinfo/Makefile b/usr/src/lib/libdevinfo/Makefile index 17b5ed71f6..f58392c518 100644 --- a/usr/src/lib/libdevinfo/Makefile +++ b/usr/src/lib/libdevinfo/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -31,11 +29,10 @@ SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) # conditional assignments -all := TARGET= all +all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint test := TARGET= test # definitions for install_h target @@ -46,7 +43,7 @@ CHECKHDRS= $(HDRS:%.h=%.check) .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) # install rule for install_h target diff --git a/usr/src/lib/libdevinfo/Makefile.com b/usr/src/lib/libdevinfo/Makefile.com index d27b673721..8d5b733d99 100644 --- a/usr/src/lib/libdevinfo/Makefile.com +++ b/usr/src/lib/libdevinfo/Makefile.com @@ -35,9 +35,8 @@ OBJECTS= devfsinfo.o devinfo.o devinfo_prop_decode.o devinfo_devlink.o \ include ../../Makefile.lib include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lnvpair -lsec -lc -lgen -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CPPFLAGS += -I.. @@ -51,6 +50,5 @@ SMATCH=off all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libdevinfo/amd64/Makefile b/usr/src/lib/libdevinfo/amd64/Makefile index 9ab764a959..a41aeec527 100644 --- a/usr/src/lib/libdevinfo/amd64/Makefile +++ b/usr/src/lib/libdevinfo/amd64/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -30,4 +30,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdevinfo/i386/Makefile b/usr/src/lib/libdevinfo/i386/Makefile index e41aa0aa25..1551cf2cb2 100644 --- a/usr/src/lib/libdevinfo/i386/Makefile +++ b/usr/src/lib/libdevinfo/i386/Makefile @@ -22,11 +22,9 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdevinfo/sparc/Makefile b/usr/src/lib/libdevinfo/sparc/Makefile index e41aa0aa25..1551cf2cb2 100644 --- a/usr/src/lib/libdevinfo/sparc/Makefile +++ b/usr/src/lib/libdevinfo/sparc/Makefile @@ -22,11 +22,9 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdevinfo/sparcv9/Makefile b/usr/src/lib/libdevinfo/sparcv9/Makefile index 9ab764a959..a41aeec527 100644 --- a/usr/src/lib/libdevinfo/sparcv9/Makefile +++ b/usr/src/lib/libdevinfo/sparcv9/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -30,4 +30,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdhcpagent/amd64/Makefile b/usr/src/lib/libdhcpagent/amd64/Makefile index 2b996f5855..f5b405d5a7 100644 --- a/usr/src/lib/libdhcpagent/amd64/Makefile +++ b/usr/src/lib/libdhcpagent/amd64/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdhcpagent/i386/Makefile b/usr/src/lib/libdhcpagent/i386/Makefile index 64d377eef1..1b2c7a9afc 100644 --- a/usr/src/lib/libdhcpagent/i386/Makefile +++ b/usr/src/lib/libdhcpagent/i386/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdhcpagent/sparc/Makefile b/usr/src/lib/libdhcpagent/sparc/Makefile index 64d377eef1..1b2c7a9afc 100644 --- a/usr/src/lib/libdhcpagent/sparc/Makefile +++ b/usr/src/lib/libdhcpagent/sparc/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdhcpagent/sparcv9/Makefile b/usr/src/lib/libdhcpagent/sparcv9/Makefile index 2b996f5855..f5b405d5a7 100644 --- a/usr/src/lib/libdhcpagent/sparcv9/Makefile +++ b/usr/src/lib/libdhcpagent/sparcv9/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdhcputil/Makefile b/usr/src/lib/libdhcputil/Makefile index d0ebae7172..1a5210fe92 100644 --- a/usr/src/lib/libdhcputil/Makefile +++ b/usr/src/lib/libdhcputil/Makefile @@ -45,11 +45,10 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libdhcputil/amd64/Makefile b/usr/src/lib/libdhcputil/amd64/Makefile index df2bad0003..4b5199cd4c 100644 --- a/usr/src/lib/libdhcputil/amd64/Makefile +++ b/usr/src/lib/libdhcputil/amd64/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdhcputil/i386/Makefile b/usr/src/lib/libdhcputil/i386/Makefile index f800c19b30..236b63a452 100644 --- a/usr/src/lib/libdhcputil/i386/Makefile +++ b/usr/src/lib/libdhcputil/i386/Makefile @@ -23,10 +23,7 @@ # Copyright (c) 1999-2001 by Sun Microsystems, Inc. # All rights reserved. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libdhcputil/i386/Makefile include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdhcputil/sparc/Makefile b/usr/src/lib/libdhcputil/sparc/Makefile index b83201c1d5..236b63a452 100644 --- a/usr/src/lib/libdhcputil/sparc/Makefile +++ b/usr/src/lib/libdhcputil/sparc/Makefile @@ -23,10 +23,7 @@ # Copyright (c) 1999-2001 by Sun Microsystems, Inc. # All rights reserved. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libdhcputil/sparc/Makefile include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdhcputil/sparcv9/Makefile b/usr/src/lib/libdhcputil/sparcv9/Makefile index df2bad0003..4b5199cd4c 100644 --- a/usr/src/lib/libdhcputil/sparcv9/Makefile +++ b/usr/src/lib/libdhcputil/sparcv9/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdisasm/Makefile b/usr/src/lib/libdisasm/Makefile index fbff822dc2..07daaf70f2 100644 --- a/usr/src/lib/libdisasm/Makefile +++ b/usr/src/lib/libdisasm/Makefile @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -33,15 +31,14 @@ HDRDIR= common SUBDIRS= $(MACH) $(BUILD64)SUBDIRS += $(MACH64) -all := TARGET = all +all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libdisasm/Makefile.com b/usr/src/lib/libdisasm/Makefile.com index 543b8e08cd..2173e5bb2c 100644 --- a/usr/src/lib/libdisasm/Makefile.com +++ b/usr/src/lib/libdisasm/Makefile.com @@ -104,7 +104,7 @@ CLOBBERFILES_standalone = $(LINKTEST_OBJ) CLOBBERFILES += $(CLOBBERFILES_$(CURTYPE)) LIBS_standalone = $(STANDLIBRARY) -LIBS_library = $(DYNLIB) $(LINTLIB) +LIBS_library = $(DYNLIB) LIBS = $(LIBS_$(CURTYPE)) MAPFILES = $(COMDIR)/mapfile-vers @@ -118,8 +118,6 @@ ASFLAGS_standalone = -DDIS_STANDALONE ASFLAGS_library = ASFLAGS += -P $(ASFLAGS_$(CURTYPE)) -D_ASM -$(LINTLIB) := SRCS = $(COMDIR)/$(LINTSRC) - CERRWARN += -_gcc=-Wno-parentheses CERRWARN += $(CNOWARN_UNINIT) diff --git a/usr/src/lib/libdisasm/Makefile.targ b/usr/src/lib/libdisasm/Makefile.targ index cdd938135f..21c89f507c 100644 --- a/usr/src/lib/libdisasm/Makefile.targ +++ b/usr/src/lib/libdisasm/Makefile.targ @@ -47,11 +47,6 @@ install.standalone.targ: all.standalone $(INSTALL_DEPS_standalone) all.library.targ: $(LIBS) all.standalone.targ: $(STANDLIBRARY) -lint: $(TYPES:%=lint.%) - -$(TYPES:%=lint.%): - @$(MAKE) lintcheck CURTYPE=$(@:lint.%=%) - $(STANDLIBRARY): $(OBJS) $(LINKTEST_OBJ) $(LD) $(BREDUCE) $(ZDEFS) $(LDFLAGS) -o $@.linktest $(OBJS) $(LINKTEST_OBJ) rm $@.linktest @@ -83,10 +78,6 @@ objs/%.o pics/%.o: $(COMDIR)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) -# install rule for lint library target -$(ROOTLINTDIR)/%: $(COMDIR)/% - $(INS.file) - # install rule for x86 common source objs/%.o pics/%.o: $(SRC)/common/dis/i386/%.c $(COMPILE.c) -o $@ $< diff --git a/usr/src/lib/libdisasm/amd64/Makefile b/usr/src/lib/libdisasm/amd64/Makefile index 86dddcf5fa..3f3ad54381 100644 --- a/usr/src/lib/libdisasm/amd64/Makefile +++ b/usr/src/lib/libdisasm/amd64/Makefile @@ -30,7 +30,7 @@ include ../../Makefile.lib.64 TYPES=library standalone -INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLINT64) $(ROOTLIBS64) +INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLIBS64) INSTALL_DEPS_standalone = $(ROOTLIBS64) include ../Makefile.targ diff --git a/usr/src/lib/libdisasm/i386/Makefile b/usr/src/lib/libdisasm/i386/Makefile index 42cabb8143..9b38cfd3bc 100644 --- a/usr/src/lib/libdisasm/i386/Makefile +++ b/usr/src/lib/libdisasm/i386/Makefile @@ -29,7 +29,7 @@ include ../Makefile.com TYPES=library standalone -INSTALL_DEPS_library = $(ROOTLINKS) $(ROOTLINT) $(ROOTLIBS) +INSTALL_DEPS_library = $(ROOTLINKS) $(ROOTLIBS) INSTALL_DEPS_standalone = $(ROOTLIBS) include ../Makefile.targ diff --git a/usr/src/lib/libdisasm/sparc/Makefile b/usr/src/lib/libdisasm/sparc/Makefile index a4e01c0419..a8c173f3a6 100644 --- a/usr/src/lib/libdisasm/sparc/Makefile +++ b/usr/src/lib/libdisasm/sparc/Makefile @@ -29,7 +29,7 @@ include ../Makefile.com TYPES=library standalone -INSTALL_DEPS_library = $(ROOTLINKS) $(ROOTLINT) $(ROOTLIBS) +INSTALL_DEPS_library = $(ROOTLINKS) $(ROOTLIBS) INSTALL_DEPS_standalone = $(ROOTLIBS) include ../Makefile.targ diff --git a/usr/src/lib/libdisasm/sparcv9/Makefile b/usr/src/lib/libdisasm/sparcv9/Makefile index 72b4ee6a4a..b0ff2f074f 100644 --- a/usr/src/lib/libdisasm/sparcv9/Makefile +++ b/usr/src/lib/libdisasm/sparcv9/Makefile @@ -30,7 +30,7 @@ include ../../Makefile.lib.64 TYPES=library standalone -INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLINT64) $(ROOTLIBS64) +INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLIBS64) INSTALL_DEPS_standalone = $(ROOTLIBS64) include ../Makefile.targ diff --git a/usr/src/lib/libdiskmgt/Makefile b/usr/src/lib/libdiskmgt/Makefile index 55ca6f483d..320580bb6f 100644 --- a/usr/src/lib/libdiskmgt/Makefile +++ b/usr/src/lib/libdiskmgt/Makefile @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -43,7 +41,6 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint install_h:= TARGET = install_h POFILE = libdiskmgt.po @@ -51,7 +48,7 @@ MSGFILES = `$(GREP) -l gettext common/*.[ch]` .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(POFILE): pofile_MSGFILES diff --git a/usr/src/lib/libdiskmgt/Makefile.com b/usr/src/lib/libdiskmgt/Makefile.com index 76023e5b57..2535dd878e 100644 --- a/usr/src/lib/libdiskmgt/Makefile.com +++ b/usr/src/lib/libdiskmgt/Makefile.com @@ -49,7 +49,7 @@ OBJECTS = alias.o \ include ../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) i386_LDLIBS = -lfdisk sparc_LDLIBS = LDLIBS += -ldevinfo -ladm -ldevid -lkstat -lsysevent \ @@ -57,7 +57,6 @@ LDLIBS += -ldevinfo -ladm -ldevid -lkstat -lsysevent \ DYNFLAGS += -R/opt/VRTSvxvm/lib SRCDIR = ../common -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-switch @@ -72,6 +71,5 @@ SMATCH=off all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libdiskmgt/amd64/Makefile b/usr/src/lib/libdiskmgt/amd64/Makefile index 80a8e6fcb2..83ef5cbc13 100644 --- a/usr/src/lib/libdiskmgt/amd64/Makefile +++ b/usr/src/lib/libdiskmgt/amd64/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 @@ -32,4 +30,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libdiskmgt/i386/Makefile b/usr/src/lib/libdiskmgt/i386/Makefile index ee785147da..7421a75150 100644 --- a/usr/src/lib/libdiskmgt/i386/Makefile +++ b/usr/src/lib/libdiskmgt/i386/Makefile @@ -23,10 +23,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libdiskmgt/i386/Makefile include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libdiskmgt/sparc/Makefile b/usr/src/lib/libdiskmgt/sparc/Makefile index 7cda8e1b48..7421a75150 100644 --- a/usr/src/lib/libdiskmgt/sparc/Makefile +++ b/usr/src/lib/libdiskmgt/sparc/Makefile @@ -23,10 +23,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libdiskmgt/sparc/Makefile include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libdiskmgt/sparcv9/Makefile b/usr/src/lib/libdiskmgt/sparcv9/Makefile index 80a8e6fcb2..83ef5cbc13 100644 --- a/usr/src/lib/libdiskmgt/sparcv9/Makefile +++ b/usr/src/lib/libdiskmgt/sparcv9/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 @@ -32,4 +30,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libdladm/Makefile b/usr/src/lib/libdladm/Makefile index 275c1c0866..dc61aabd00 100644 --- a/usr/src/lib/libdladm/Makefile +++ b/usr/src/lib/libdladm/Makefile @@ -64,11 +64,10 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libdladm/Makefile.com b/usr/src/lib/libdladm/Makefile.com index 348061cb54..19db4ccace 100644 --- a/usr/src/lib/libdladm/Makefile.com +++ b/usr/src/lib/libdladm/Makefile.com @@ -36,12 +36,11 @@ include ../../Makefile.lib # install this library in the root filesystem include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -ldevinfo -lc -linetutil -lsocket -lscf -lrcm -lnvpair \ -lexacct -lkstat -lpool -lvarpd SRCDIR = ../common -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-parentheses @@ -57,6 +56,5 @@ SMATCH=off all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libdladm/i386/Makefile b/usr/src/lib/libdladm/i386/Makefile index 7eae19fff7..703879a954 100644 --- a/usr/src/lib/libdladm/i386/Makefile +++ b/usr/src/lib/libdladm/i386/Makefile @@ -23,9 +23,7 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libdladm/sparc/Makefile b/usr/src/lib/libdladm/sparc/Makefile index 7eae19fff7..703879a954 100644 --- a/usr/src/lib/libdladm/sparc/Makefile +++ b/usr/src/lib/libdladm/sparc/Makefile @@ -23,9 +23,7 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libdll/Makefile b/usr/src/lib/libdll/Makefile index 6fda0f6155..11ea67996f 100644 --- a/usr/src/lib/libdll/Makefile +++ b/usr/src/lib/libdll/Makefile @@ -35,14 +35,13 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint -_msg := TARGET= _msg +_msg := TARGET= _msg .KEEP_STATE: -all clean clobber install lint _msg: $(SUBDIRS) +all clean clobber install _msg: $(SUBDIRS) -LIBRARY= libdll.a +LIBRARY= libdll.a HDRS= \ dlldefs.h diff --git a/usr/src/lib/libdll/Makefile.com b/usr/src/lib/libdll/Makefile.com index 183181c93d..bbc1813121 100644 --- a/usr/src/lib/libdll/Makefile.com +++ b/usr/src/lib/libdll/Makefile.com @@ -50,14 +50,12 @@ MAPFILES= ../mapfile-vers # Set common AST build flags (e.g. C99/XPG6, needed to support the math stuff) include ../../../Makefile.ast -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += \ -last \ -lc -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) - SRCDIR = ../common # We use "=" here since using $(CPPFLAGS.master) is very tricky in our @@ -94,12 +92,4 @@ SMOFF += all_func_returns,strcpy_overflow all: $(LIBS) -# -# libdll is not lint-clean yet; fake up a target. (You can use -# "make lintcheck" to actually run lint; please send all lint fixes -# upstream (to AT&T) so the next update will pull them into ON.) -# -lint: - @ print "usr/src/lib/libdll is not lint-clean: skipping" - include ../../Makefile.targ diff --git a/usr/src/lib/libdll/i386/Makefile b/usr/src/lib/libdll/i386/Makefile index 9569971c6a..2e6eac5888 100644 --- a/usr/src/lib/libdll/i386/Makefile +++ b/usr/src/lib/libdll/i386/Makefile @@ -30,4 +30,4 @@ DLLPLATFORMCPPFLAGS = '-DHOSTTYPE="sol$(RELEASE_MINOR).i386"' include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libdll/sparc/Makefile b/usr/src/lib/libdll/sparc/Makefile index c850083cd4..3869ccf5b4 100644 --- a/usr/src/lib/libdll/sparc/Makefile +++ b/usr/src/lib/libdll/sparc/Makefile @@ -30,4 +30,4 @@ DLLPLATFORMCPPFLAGS = '-DHOSTTYPE="sol$(RELEASE_MINOR).sun4"' include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libdlpi/Makefile b/usr/src/lib/libdlpi/Makefile index 1f0a03b675..1ee424e49a 100644 --- a/usr/src/lib/libdlpi/Makefile +++ b/usr/src/lib/libdlpi/Makefile @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/Makefile.lib @@ -40,11 +38,10 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libdlpi/Makefile.com b/usr/src/lib/libdlpi/Makefile.com index aadf9c5fa0..f51dd0d1b4 100644 --- a/usr/src/lib/libdlpi/Makefile.com +++ b/usr/src/lib/libdlpi/Makefile.com @@ -32,12 +32,11 @@ include ../../Makefile.lib # install this library in the root filesystem include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -linetutil -ldladm SRCDIR = ../common -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CERRWARN += $(CNOWARN_UNINIT) @@ -47,6 +46,5 @@ CPPFLAGS += -I$(SRCDIR) -D_REENTRANT all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libdlpi/amd64/Makefile b/usr/src/lib/libdlpi/amd64/Makefile index a76ebb70e3..99ed908528 100644 --- a/usr/src/lib/libdlpi/amd64/Makefile +++ b/usr/src/lib/libdlpi/amd64/Makefile @@ -22,10 +22,10 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdlpi/i386/Makefile b/usr/src/lib/libdlpi/i386/Makefile index 7eae19fff7..dc6deda296 100644 --- a/usr/src/lib/libdlpi/i386/Makefile +++ b/usr/src/lib/libdlpi/i386/Makefile @@ -23,9 +23,7 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdlpi/sparc/Makefile b/usr/src/lib/libdlpi/sparc/Makefile index 7eae19fff7..dc6deda296 100644 --- a/usr/src/lib/libdlpi/sparc/Makefile +++ b/usr/src/lib/libdlpi/sparc/Makefile @@ -23,9 +23,7 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdlpi/sparcv9/Makefile b/usr/src/lib/libdlpi/sparcv9/Makefile index 600ff73f12..99ed908528 100644 --- a/usr/src/lib/libdlpi/sparcv9/Makefile +++ b/usr/src/lib/libdlpi/sparcv9/Makefile @@ -22,10 +22,10 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdoor/Makefile b/usr/src/lib/libdoor/Makefile index 6cb7a4fa8a..ef1592a4a5 100644 --- a/usr/src/lib/libdoor/Makefile +++ b/usr/src/lib/libdoor/Makefile @@ -36,7 +36,6 @@ install := TARGET= install all clean clobber install: $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libdoor/Makefile.com b/usr/src/lib/libdoor/Makefile.com index 75dbfa358b..12d42b7132 100644 --- a/usr/src/lib/libdoor/Makefile.com +++ b/usr/src/lib/libdoor/Makefile.com @@ -28,5 +28,4 @@ VERS = .1 include $(SRC)/lib/Makefile.rootfs -LIBS += $(LINTLIB) DYNFLAGS += -F libc.so.1 diff --git a/usr/src/lib/libdoor/amd64/Makefile b/usr/src/lib/libdoor/amd64/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libdoor/amd64/Makefile +++ b/usr/src/lib/libdoor/amd64/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libdoor/i386/Makefile b/usr/src/lib/libdoor/i386/Makefile index 4e4e8c02a9..682e5560ca 100644 --- a/usr/src/lib/libdoor/i386/Makefile +++ b/usr/src/lib/libdoor/i386/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libdoor/sparc/Makefile b/usr/src/lib/libdoor/sparc/Makefile index 4e4e8c02a9..682e5560ca 100644 --- a/usr/src/lib/libdoor/sparc/Makefile +++ b/usr/src/lib/libdoor/sparc/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libdoor/sparcv9/Makefile b/usr/src/lib/libdoor/sparcv9/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libdoor/sparcv9/Makefile +++ b/usr/src/lib/libdoor/sparcv9/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libds/Makefile b/usr/src/lib/libds/Makefile index 059b9076c4..6a5e748f32 100644 --- a/usr/src/lib/libds/Makefile +++ b/usr/src/lib/libds/Makefile @@ -31,24 +31,23 @@ HDRDIR = common ROOTHDRDIR = $(ROOT)/usr/platform/sun4v/include/sys -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber lint: $(SUBDIRS) +all clean clobber: $(SUBDIRS) check: $(CHECKHDRS) install: all .WAIT $(SUBDIRS) -install_h: $(ROOTHDRS) +install_h: $(ROOTHDRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libds/Makefile.com b/usr/src/lib/libds/Makefile.com index fe2821b52d..6c56a34ed3 100644 --- a/usr/src/lib/libds/Makefile.com +++ b/usr/src/lib/libds/Makefile.com @@ -32,7 +32,7 @@ OBJECTS = $(LIBSRCS:%.c=%.o) include ../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common SRCS = $(LIBSRCS:%.c=$(SRCDIR)/%.c) @@ -43,19 +43,11 @@ CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS) LDLIBS += -lsysevent -lnvpair -lc -LINTFLAGS = -msux -LINTFLAGS64 = -msux -m64 - -$(LINTLIB) := SRCS = $(LINTSRC:%=$(SRCDIR)/%) -$(LINTLIB) := LINTFLAGS = -nsvx -I$(ROOT)/usr/platform/sun4v/include -$(LINTLIB) := LINTFLAGS64 = -nsvx -m64 \ - -I$(ROOT)/usr/platform/sun4v/include .KEEP_STATE: all: $(LIBS) -lint: $(LINTLIB) lintcheck pics/%.o: $(SRCDIR)/%.c $(COMPILE.c) -o $@ $< diff --git a/usr/src/lib/libds/sparc/Makefile b/usr/src/lib/libds/sparc/Makefile index ea09428ea0..ff785b8fef 100644 --- a/usr/src/lib/libds/sparc/Makefile +++ b/usr/src/lib/libds/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libds/sparcv9/Makefile b/usr/src/lib/libds/sparcv9/Makefile index 40e4cef06c..a378005193 100644 --- a/usr/src/lib/libds/sparcv9/Makefile +++ b/usr/src/lib/libds/sparcv9/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libdscp/Makefile b/usr/src/lib/libdscp/Makefile index ed1d5b934e..56b99b9cba 100644 --- a/usr/src/lib/libdscp/Makefile +++ b/usr/src/lib/libdscp/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -33,7 +31,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint # definitions for install_h target HDRS= libdscp.h @@ -43,7 +40,7 @@ CHECKHDRS= $(HDRS:%.h=%.check) .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) # install rule for install_h target diff --git a/usr/src/lib/libdscp/Makefile.com b/usr/src/lib/libdscp/Makefile.com index f480c1ece2..6b50138cd6 100644 --- a/usr/src/lib/libdscp/Makefile.com +++ b/usr/src/lib/libdscp/Makefile.com @@ -31,9 +31,8 @@ OBJECTS= libdscp.o include ../../Makefile.lib include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -lsocket -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CPPFLAGS += -I.. CFLAGS += $(CCVERBOSE) @@ -55,6 +54,5 @@ all: $(LIBS) install: all .WAIT $(ROOTLIBDIR) $(ROOTLIB) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libdscp/sparc/Makefile b/usr/src/lib/libdscp/sparc/Makefile index 182e6180d4..5c4980a2bd 100644 --- a/usr/src/lib/libdscp/sparc/Makefile +++ b/usr/src/lib/libdscp/sparc/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com diff --git a/usr/src/lib/libdscp/svc/Makefile b/usr/src/lib/libdscp/svc/Makefile index 8e995fa692..90a9a6065e 100644 --- a/usr/src/lib/libdscp/svc/Makefile +++ b/usr/src/lib/libdscp/svc/Makefile @@ -22,10 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# lib/libdscp/svc/Makefile.com -# -#ident "%Z%%M% %I% %E% SMI" -# MANIFEST= dscp.xml SVCMETHOD= svc-dscp @@ -48,7 +44,7 @@ $(ROOTOPTIONSDIR): $(ROOTOPTIONSDIR)/%: % $(INS.file) -all clean clobber lint: +all clean clobber: install: $(ROOTMANIFEST) $(ROOTSVCMETHOD) $(ROOTOPTIONS) diff --git a/usr/src/lib/libdtrace/Makefile b/usr/src/lib/libdtrace/Makefile index c24a0800ce..09407559a5 100644 --- a/usr/src/lib/libdtrace/Makefile +++ b/usr/src/lib/libdtrace/Makefile @@ -28,19 +28,18 @@ include ../Makefile.lib HDRS = dtrace.h HDRDIR = common -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint yydebug := TARGET = yydebug .KEEP_STATE: -all clean clobber lint yydebug: $(SUBDIRS) +all clean clobber yydebug: $(SUBDIRS) install: install_h $(SUBDIRS) diff --git a/usr/src/lib/libdtrace/Makefile.com b/usr/src/lib/libdtrace/Makefile.com index b45a334f8f..217c66ae77 100644 --- a/usr/src/lib/libdtrace/Makefile.com +++ b/usr/src/lib/libdtrace/Makefile.com @@ -108,7 +108,7 @@ DLIBSRCS += \ include ../../Makefile.lib SRCS = $(LIBSRCS:%.c=../common/%.c) $(LIBISASRCS:%.c=../$(MACH)/%.c) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common @@ -147,8 +147,6 @@ LIBDAUDITLIBS = $(LDLIBS.lib) -lmapmalloc -lc -lproc yydebug := YYCFLAGS += -DYYDEBUG -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) - LFLAGS = -t -v YFLAGS = -d -v @@ -169,10 +167,6 @@ $(ROOTDLIBDIR64)/%.so := FILEMODE=555 all: $(LIBS) $(DRTIOBJ) $(LIBDAUDIT) -lint: lintdlink lintcheck - -lintdlink: $(DLINKSRCS:%.c=../common/%.c) - $(LINT.c) $(DLINKSRCS:%.c=../common/%.c) $(DRTILDLIBS) dt_lex.c: $(SRCDIR)/dt_lex.l dt_grammar.h $(LEX) $(LFLAGS) $(SRCDIR)/dt_lex.l > $@ diff --git a/usr/src/lib/libdtrace/amd64/Makefile b/usr/src/lib/libdtrace/amd64/Makefile index e9cdd5bdda..eabc3117f7 100644 --- a/usr/src/lib/libdtrace/amd64/Makefile +++ b/usr/src/lib/libdtrace/amd64/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# ASFLAGS += $(AS_PICFLAGS) -P -D_ASM @@ -36,11 +34,10 @@ SRCS += $(SRC)/common/dis/i386/dis_tables.c CPPFLAGS += -I$(SRC)/common/dis/i386 CPPFLAGS += -D_ELF64 -LINTFLAGS64 += -erroff=E_BAD_PTR_CAST_ALIGN pics/%.o: $(SRC)/common/dis/i386/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) -install yydebug: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) \ +install yydebug: all $(ROOTLIBS64) $(ROOTLINKS64) \ $(ROOTDLIBS) $(ROOTDOBJS64) diff --git a/usr/src/lib/libdtrace/i386/Makefile b/usr/src/lib/libdtrace/i386/Makefile index 6c479392f9..be5262c0a9 100644 --- a/usr/src/lib/libdtrace/i386/Makefile +++ b/usr/src/lib/libdtrace/i386/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# ASFLAGS += $(AS_PICFLAGS) -P -D_ASM @@ -35,7 +33,6 @@ include ../Makefile.com SRCS += $(SRC)/common/dis/i386/dis_tables.c CPPFLAGS += -I$(SRC)/common/dis/i386 -LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN CLEANFILES += regs.sed regs.d @@ -50,5 +47,5 @@ pics/%.o: $(SRC)/common/dis/i386/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) -install yydebug: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) \ +install yydebug: all $(ROOTLIBS) $(ROOTLINKS) \ $(ROOTDLIBS) $(ROOTDOBJS) diff --git a/usr/src/lib/libdtrace/sparc/Makefile b/usr/src/lib/libdtrace/sparc/Makefile index 4c4ad06f89..b0a1b1c72a 100644 --- a/usr/src/lib/libdtrace/sparc/Makefile +++ b/usr/src/lib/libdtrace/sparc/Makefile @@ -27,7 +27,6 @@ ASFLAGS += -D_ASM $(AS_BIGPICFLAGS) -P include ../Makefile.com -LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN -install yydebug: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) \ +install yydebug: all $(ROOTLIBS) $(ROOTLINKS) \ $(ROOTDLIBS) $(ROOTDOBJS) diff --git a/usr/src/lib/libdtrace/sparcv9/Makefile b/usr/src/lib/libdtrace/sparcv9/Makefile index d22653cb31..1e08256b53 100644 --- a/usr/src/lib/libdtrace/sparcv9/Makefile +++ b/usr/src/lib/libdtrace/sparcv9/Makefile @@ -30,7 +30,6 @@ include ../../Makefile.lib.64 CPPFLAGS += -D_ELF64 -LINTFLAGS64 += -erroff=E_BAD_PTR_CAST_ALIGN -install yydebug: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) \ +install yydebug: all $(ROOTLIBS64) $(ROOTLINKS64) \ $(ROOTDLIBS) $(ROOTDOBJS64) diff --git a/usr/src/lib/libdtrace_jni/Makefile b/usr/src/lib/libdtrace_jni/Makefile index 4287dc1a01..d78224ec62 100644 --- a/usr/src/lib/libdtrace_jni/Makefile +++ b/usr/src/lib/libdtrace_jni/Makefile @@ -22,25 +22,22 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: all clean clobber install: java .WAIT $(SUBDIRS) -lint: $(SUBDIRS) +lint: install_h: diff --git a/usr/src/lib/libdtrace_jni/Makefile.com b/usr/src/lib/libdtrace_jni/Makefile.com index 8e4ca4a49b..0594c203bb 100644 --- a/usr/src/lib/libdtrace_jni/Makefile.com +++ b/usr/src/lib/libdtrace_jni/Makefile.com @@ -56,8 +56,6 @@ SMOFF += all_func_returns LDLIBS += -lc -luutil -ldtrace -lproc -LINTLIB = - LFLAGS = -t -v ROOTDLIBDIR = $(ROOT)/usr/lib/dtrace_jni @@ -69,7 +67,6 @@ ROOTDLIBS = $(DLIBSRCS:%=$(ROOTDLIBDIR)/%) all: $(DYNLIB) -lint: lintcheck %.o: ../common/%.c $(COMPILE.c) -o $@ $< diff --git a/usr/src/lib/libdtrace_jni/amd64/Makefile b/usr/src/lib/libdtrace_jni/amd64/Makefile index c9bd26cfd3..b13b247ca8 100644 --- a/usr/src/lib/libdtrace_jni/amd64/Makefile +++ b/usr/src/lib/libdtrace_jni/amd64/Makefile @@ -22,10 +22,8 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libdtrace_jni/i386/Makefile b/usr/src/lib/libdtrace_jni/i386/Makefile index a333224278..282da97a76 100644 --- a/usr/src/lib/libdtrace_jni/i386/Makefile +++ b/usr/src/lib/libdtrace_jni/i386/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libdtrace_jni/java/Makefile b/usr/src/lib/libdtrace_jni/java/Makefile index 3141eeaa90..0dbfe630d5 100644 --- a/usr/src/lib/libdtrace_jni/java/Makefile +++ b/usr/src/lib/libdtrace_jni/java/Makefile @@ -237,11 +237,9 @@ install: all $(JARDESTDIR) $(INSJARS) $(DOCDESTDIR) \ $(DOCIMAGESDESTDIR)/JavaDTraceAPI.gif # empty targets for top-level building compatability - -install_h lint: +install_h: # create API javadoc - doc: -@mkdir -p $(DOCAPI) cd $(APIJAVASRC); umask 022; \ diff --git a/usr/src/lib/libdtrace_jni/sparc/Makefile b/usr/src/lib/libdtrace_jni/sparc/Makefile index a333224278..282da97a76 100644 --- a/usr/src/lib/libdtrace_jni/sparc/Makefile +++ b/usr/src/lib/libdtrace_jni/sparc/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libdtrace_jni/sparcv9/Makefile b/usr/src/lib/libdtrace_jni/sparcv9/Makefile index c9bd26cfd3..b13b247ca8 100644 --- a/usr/src/lib/libdtrace_jni/sparcv9/Makefile +++ b/usr/src/lib/libdtrace_jni/sparcv9/Makefile @@ -22,10 +22,8 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libdwarf/Makefile.com b/usr/src/lib/libdwarf/Makefile.com index 10e841cfac..4311148f73 100644 --- a/usr/src/lib/libdwarf/Makefile.com +++ b/usr/src/lib/libdwarf/Makefile.com @@ -89,6 +89,5 @@ SMATCH = off all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libdwarf/amd64/Makefile b/usr/src/lib/libdwarf/amd64/Makefile index 15a899f96f..a3d127a1e3 100644 --- a/usr/src/lib/libdwarf/amd64/Makefile +++ b/usr/src/lib/libdwarf/amd64/Makefile @@ -16,4 +16,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdwarf/i386/Makefile b/usr/src/lib/libdwarf/i386/Makefile index 4398507523..dd7a697f17 100644 --- a/usr/src/lib/libdwarf/i386/Makefile +++ b/usr/src/lib/libdwarf/i386/Makefile @@ -15,4 +15,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdwarf/sparc/Makefile b/usr/src/lib/libdwarf/sparc/Makefile index 4398507523..dd7a697f17 100644 --- a/usr/src/lib/libdwarf/sparc/Makefile +++ b/usr/src/lib/libdwarf/sparc/Makefile @@ -15,4 +15,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdwarf/sparcv9/Makefile b/usr/src/lib/libdwarf/sparcv9/Makefile index 15a899f96f..a3d127a1e3 100644 --- a/usr/src/lib/libdwarf/sparcv9/Makefile +++ b/usr/src/lib/libdwarf/sparcv9/Makefile @@ -16,4 +16,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libefi/Makefile b/usr/src/lib/libefi/Makefile index 80360ae8b7..a4fb46c1c9 100644 --- a/usr/src/lib/libefi/Makefile +++ b/usr/src/lib/libefi/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -34,11 +32,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libefi/Makefile.com b/usr/src/lib/libefi/Makefile.com index c0108f5f85..412a6b48af 100644 --- a/usr/src/lib/libefi/Makefile.com +++ b/usr/src/lib/libefi/Makefile.com @@ -36,12 +36,10 @@ include ../../Makefile.rootfs SRCDIR = ../common -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -luuid -lsmbios -lc -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) -LINTFLAGS64 += -errchk=longptr64 SMOFF += kmalloc_wrong_size @@ -49,6 +47,5 @@ SMOFF += kmalloc_wrong_size all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libefi/amd64/Makefile b/usr/src/lib/libefi/amd64/Makefile index 1064169930..f820b35e24 100644 --- a/usr/src/lib/libefi/amd64/Makefile +++ b/usr/src/lib/libefi/amd64/Makefile @@ -23,14 +23,12 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libefi/i386/Makefile b/usr/src/lib/libefi/i386/Makefile index 0c05212571..a681a7f1a0 100644 --- a/usr/src/lib/libefi/i386/Makefile +++ b/usr/src/lib/libefi/i386/Makefile @@ -23,9 +23,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libefi/sparc/Makefile b/usr/src/lib/libefi/sparc/Makefile index 0c05212571..a681a7f1a0 100644 --- a/usr/src/lib/libefi/sparc/Makefile +++ b/usr/src/lib/libefi/sparc/Makefile @@ -23,9 +23,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libefi/sparcv9/Makefile b/usr/src/lib/libefi/sparcv9/Makefile index c522671f45..309834ae94 100644 --- a/usr/src/lib/libefi/sparcv9/Makefile +++ b/usr/src/lib/libefi/sparcv9/Makefile @@ -23,14 +23,12 @@ # Copyright 2002-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libelfsign/Makefile b/usr/src/lib/libelfsign/Makefile index 1d663e73d1..0558449631 100644 --- a/usr/src/lib/libelfsign/Makefile +++ b/usr/src/lib/libelfsign/Makefile @@ -23,9 +23,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# lib/libelfsign/Makefile -# -#ident "%Z%%M% %I% %E% SMI" include $(SRC)/lib/Makefile.lib @@ -43,7 +40,6 @@ all:= TARGET= all clean:= TARGET= clean clobber:= TARGET= clobber install:= TARGET= install -lint:= TARGET= lint .KEEP_STATE: diff --git a/usr/src/lib/libelfsign/Makefile.com b/usr/src/lib/libelfsign/Makefile.com index 37a3a076ad..2a35d52726 100644 --- a/usr/src/lib/libelfsign/Makefile.com +++ b/usr/src/lib/libelfsign/Makefile.com @@ -33,8 +33,7 @@ include $(SRC)/lib/Makefile.rootfs SRCDIR = ../common -LIBS = $(DYNLIB) $(LINTLIB) -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) +LIBS = $(DYNLIB) LDLIBS += -lmd -lelf -lkmf -lcryptoutil -lc @@ -45,6 +44,5 @@ CPPFLAGS += -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libelfsign/i386/Makefile b/usr/src/lib/libelfsign/i386/Makefile index a31def5dc7..e0bdaffa16 100644 --- a/usr/src/lib/libelfsign/i386/Makefile +++ b/usr/src/lib/libelfsign/i386/Makefile @@ -23,13 +23,9 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libelfsign/i386/Makefile -# include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libelfsign/sparc/Makefile b/usr/src/lib/libelfsign/sparc/Makefile index 7c783f69c9..e0bdaffa16 100644 --- a/usr/src/lib/libelfsign/sparc/Makefile +++ b/usr/src/lib/libelfsign/sparc/Makefile @@ -23,11 +23,9 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libeti/Makefile b/usr/src/lib/libeti/Makefile index 5a8950eb81..4de58bf6bd 100644 --- a/usr/src/lib/libeti/Makefile +++ b/usr/src/lib/libeti/Makefile @@ -20,12 +20,9 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1989 by Sun Microsystems, Inc. # -# lib/libeti/Makefile -# + # include global definitions include ../../Makefile.master @@ -38,7 +35,6 @@ clobber:= TARGET= clobber install:= TARGET= install install_h:= TARGET= install_h check:= TARGET= check -lint:= TARGET= lint # definitions for install_h target HDRS= eti.h @@ -52,7 +48,7 @@ $(ROOTHDRDIR)/%: % .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) $(HDRSUBDIRS) diff --git a/usr/src/lib/libeti/form/Makefile b/usr/src/lib/libeti/form/Makefile index a130b89a17..65b525da03 100644 --- a/usr/src/lib/libeti/form/Makefile +++ b/usr/src/lib/libeti/form/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -34,11 +32,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) # definitions for install_h target HDRS= form.h utility.h diff --git a/usr/src/lib/libeti/form/Makefile.com b/usr/src/lib/libeti/form/Makefile.com index c526d231b3..5a9eae2ad9 100644 --- a/usr/src/lib/libeti/form/Makefile.com +++ b/usr/src/lib/libeti/form/Makefile.com @@ -65,12 +65,10 @@ OBJECTS= \ # include library definitions include ../../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR= ../common -$(LINTLIB) := SRCS=$(SRCDIR)/$(LINTSRC) - CPPFLAGS += -I../inc CFLAGS += $(CCVERBOSE) LDLIBS += -lcurses -lc @@ -79,11 +77,17 @@ CERRWARN += -_gcc=-Wno-parentheses CERRWARN += $(CNOWARN_UNINIT) CERRWARN += -_gcc=-Wno-char-subscripts +COMPATLINKS= usr/ccs/lib/libform.so +COMPATLINKS64= usr/ccs/lib/$(MACH64)/libform.so + +$(ROOT)/usr/ccs/lib/libform.so := COMPATLINKTARGET= ../../lib/libform.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libform.so := \ + COMPATLINKTARGET= ../../../lib/$(MACH64)/libform.so.1 + .KEEP_STATE: all: $(LIBS) -lint: lintcheck # include library targets include ../../../Makefile.targ diff --git a/usr/src/lib/libeti/form/amd64/Makefile b/usr/src/lib/libeti/form/amd64/Makefile index 4201c0bb20..5757f3b5ec 100644 --- a/usr/src/lib/libeti/form/amd64/Makefile +++ b/usr/src/lib/libeti/form/amd64/Makefile @@ -29,4 +29,4 @@ DYNFLAGS += $(DYNFLAGS64) .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libeti/form/i386/Makefile b/usr/src/lib/libeti/form/i386/Makefile index af931b5d9a..ee434ebd50 100644 --- a/usr/src/lib/libeti/form/i386/Makefile +++ b/usr/src/lib/libeti/form/i386/Makefile @@ -26,4 +26,5 @@ include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libeti/form/sparc/Makefile b/usr/src/lib/libeti/form/sparc/Makefile index af931b5d9a..ee434ebd50 100644 --- a/usr/src/lib/libeti/form/sparc/Makefile +++ b/usr/src/lib/libeti/form/sparc/Makefile @@ -26,4 +26,5 @@ include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libeti/form/sparcv9/Makefile b/usr/src/lib/libeti/form/sparcv9/Makefile index 06a8dcb9bb..34a4272b2b 100644 --- a/usr/src/lib/libeti/form/sparcv9/Makefile +++ b/usr/src/lib/libeti/form/sparcv9/Makefile @@ -29,4 +29,4 @@ DYNFLAGS += $(DYNFLAGS64) .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libeti/menu/Makefile b/usr/src/lib/libeti/menu/Makefile index 903974a531..834c77014c 100644 --- a/usr/src/lib/libeti/menu/Makefile +++ b/usr/src/lib/libeti/menu/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -34,11 +32,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) # definitions for install_h target HDRS= menu.h diff --git a/usr/src/lib/libeti/menu/Makefile.com b/usr/src/lib/libeti/menu/Makefile.com index 2782c3bc6c..4964d9cb93 100644 --- a/usr/src/lib/libeti/menu/Makefile.com +++ b/usr/src/lib/libeti/menu/Makefile.com @@ -63,23 +63,27 @@ OBJECTS= \ # include library definitions include ../../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR= ../common -$(LINTLIB) := SRCS=$(SRCDIR)/$(LINTSRC) - CPPFLAGS += -I../inc CFLAGS += $(CCVERBOSE) LDLIBS += -lcurses -lc CERRWARN += -_gcc=-Wno-parentheses +COMPATLINKS= usr/ccs/lib/libmenu.so +COMPATLINKS64= usr/ccs/lib/$(MACH64)/libmenu.so + +$(ROOT)/usr/ccs/lib/libmenu.so := COMPATLINKTARGET= ../../lib/libmenu.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libmenu.so:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/libmenu.so.1 + .KEEP_STATE: all: $(LIBS) -lint: lintcheck # include library targets include ../../../Makefile.targ diff --git a/usr/src/lib/libeti/menu/amd64/Makefile b/usr/src/lib/libeti/menu/amd64/Makefile index 04160e850a..a2b9ee510c 100644 --- a/usr/src/lib/libeti/menu/amd64/Makefile +++ b/usr/src/lib/libeti/menu/amd64/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -32,4 +32,4 @@ DYNFLAGS += $(DYNFLAGS64) .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libeti/menu/i386/Makefile b/usr/src/lib/libeti/menu/i386/Makefile index 775621cd27..fa3f9786e2 100644 --- a/usr/src/lib/libeti/menu/i386/Makefile +++ b/usr/src/lib/libeti/menu/i386/Makefile @@ -22,11 +22,10 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libeti/menu/sparc/Makefile b/usr/src/lib/libeti/menu/sparc/Makefile index 775621cd27..fa3f9786e2 100644 --- a/usr/src/lib/libeti/menu/sparc/Makefile +++ b/usr/src/lib/libeti/menu/sparc/Makefile @@ -22,11 +22,10 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libeti/menu/sparcv9/Makefile b/usr/src/lib/libeti/menu/sparcv9/Makefile index 04160e850a..a2b9ee510c 100644 --- a/usr/src/lib/libeti/menu/sparcv9/Makefile +++ b/usr/src/lib/libeti/menu/sparcv9/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -32,4 +32,4 @@ DYNFLAGS += $(DYNFLAGS64) .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libeti/panel/Makefile b/usr/src/lib/libeti/panel/Makefile index d39c71495b..70d8a0ac35 100644 --- a/usr/src/lib/libeti/panel/Makefile +++ b/usr/src/lib/libeti/panel/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -34,11 +32,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) # definitions for install_h target HDRS= panel.h diff --git a/usr/src/lib/libeti/panel/Makefile.com b/usr/src/lib/libeti/panel/Makefile.com index 2783c77ee4..02ccd30ee2 100644 --- a/usr/src/lib/libeti/panel/Makefile.com +++ b/usr/src/lib/libeti/panel/Makefile.com @@ -39,23 +39,27 @@ OBJECTS= \ # include library definitions include ../../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR= ../common -$(LINTLIB) := SRCS=$(SRCDIR)/$(LINTSRC) - CPPFLAGS += -I../inc CFLAGS += $(CCVERBOSE) LDLIBS += -lcurses -lc CERRWARN += -_gcc=-Wno-parentheses +COMPATLINKS= usr/ccs/lib/libpanel.so +COMPATLINKS64= usr/ccs/lib/$(MACH64)/libpanel.so + +$(ROOT)/usr/ccs/lib/libpanel.so:= COMPATLINKTARGET=../../lib/libpanel.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libpanel.so:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/libpanel.so.1 + .KEEP_STATE: all: $(LIBS) -lint: lintcheck # include library targets include ../../../Makefile.targ diff --git a/usr/src/lib/libeti/panel/amd64/Makefile b/usr/src/lib/libeti/panel/amd64/Makefile index 04160e850a..a2b9ee510c 100644 --- a/usr/src/lib/libeti/panel/amd64/Makefile +++ b/usr/src/lib/libeti/panel/amd64/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -32,4 +32,4 @@ DYNFLAGS += $(DYNFLAGS64) .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libeti/panel/i386/Makefile b/usr/src/lib/libeti/panel/i386/Makefile index 775621cd27..fa3f9786e2 100644 --- a/usr/src/lib/libeti/panel/i386/Makefile +++ b/usr/src/lib/libeti/panel/i386/Makefile @@ -22,11 +22,10 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libeti/panel/sparc/Makefile b/usr/src/lib/libeti/panel/sparc/Makefile index 775621cd27..fa3f9786e2 100644 --- a/usr/src/lib/libeti/panel/sparc/Makefile +++ b/usr/src/lib/libeti/panel/sparc/Makefile @@ -22,11 +22,10 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libeti/panel/sparcv9/Makefile b/usr/src/lib/libeti/panel/sparcv9/Makefile index 04160e850a..a2b9ee510c 100644 --- a/usr/src/lib/libeti/panel/sparcv9/Makefile +++ b/usr/src/lib/libeti/panel/sparcv9/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -32,4 +32,4 @@ DYNFLAGS += $(DYNFLAGS64) .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libexacct/Makefile b/usr/src/lib/libexacct/Makefile index f09d2183a7..4bbfb1cd6c 100644 --- a/usr/src/lib/libexacct/Makefile +++ b/usr/src/lib/libexacct/Makefile @@ -35,7 +35,6 @@ clean := TARGET = clean clobber := TARGET = clobber delete := TARGET = delete install := TARGET = install -lint := TARGET = lint _msg := TARGET = _msg package := TARGET = package @@ -50,7 +49,7 @@ GREP= grep .KEEP_STATE: -all debug clean clobber delete install lint package: $(SUBDIRS) +all debug clean clobber delete install package: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libexacct/Makefile.com b/usr/src/lib/libexacct/Makefile.com index 59c2b0ced3..09b99624b2 100644 --- a/usr/src/lib/libexacct/Makefile.com +++ b/usr/src/lib/libexacct/Makefile.com @@ -34,11 +34,10 @@ include ../../Makefile.lib SRCS= $(COMMON_OBJS:%.o=../../../common/exacct/%.c) \ $(LIB_OBJS:%.o=../common/%.c) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc SRCDIR = ../common -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CERRWARN += $(CNOWARN_UNINIT) @@ -52,7 +51,6 @@ debug := COPTFLAG64 = $(CCGDEBUG) all debug: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libexacct/demo/Makefile b/usr/src/lib/libexacct/demo/Makefile index 3361389127..f08982c544 100644 --- a/usr/src/lib/libexacct/demo/Makefile +++ b/usr/src/lib/libexacct/demo/Makefile @@ -49,8 +49,6 @@ install: all $(ROOTDEMOFILES) clean: -lint: lint_PROG - $(ROOTDEMODIR): $(INS.dir) diff --git a/usr/src/lib/libexacct/demo/Makefile.demo b/usr/src/lib/libexacct/demo/Makefile.demo index 9682c46463..746f289cd0 100644 --- a/usr/src/lib/libexacct/demo/Makefile.demo +++ b/usr/src/lib/libexacct/demo/Makefile.demo @@ -23,34 +23,25 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# PROG = exdump CC = cc -LINT = lint LDLIBS = -lexacct -lproject -lsocket -lnsl CFLAGS = $(CCVERBOSE) -LINTFLAGS = SRCS = $(PROG:%=%.c) OBJS = $(PROG:%=%.o) -LINTFILES= $(PROG:%=%.ln) all: $(PROG) %.o: %.c $(CC) $(CFLAGS) -c $< -%.ln: %.c - $(LINT) $(LINTFLAGS) -c $< - clean: rm -f $(OBJS) $(PROG) clobber: - rm -f $(OBJS) $(LINTFILES) $(PROG) + rm -f $(OBJS) $(PROG) -lint: $(LINTFILES) - $(LINT) $(LINTFLAGS) $(LINTFILES) $(LDLIBS) +lint: diff --git a/usr/src/lib/libexacct/i386/Makefile b/usr/src/lib/libexacct/i386/Makefile index 18f3df5c4d..18584b4da1 100644 --- a/usr/src/lib/libexacct/i386/Makefile +++ b/usr/src/lib/libexacct/i386/Makefile @@ -23,11 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# libexacct/i386/Makefile -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libexacct/sparc/Makefile b/usr/src/lib/libexacct/sparc/Makefile index aceac14f5b..18584b4da1 100644 --- a/usr/src/lib/libexacct/sparc/Makefile +++ b/usr/src/lib/libexacct/sparc/Makefile @@ -23,11 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libexacct/sparc/Makefile -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libfakekernel/Makefile b/usr/src/lib/libfakekernel/Makefile index 34ed30c6a1..eb488dff8a 100644 --- a/usr/src/lib/libfakekernel/Makefile +++ b/usr/src/lib/libfakekernel/Makefile @@ -41,11 +41,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRDIR) $(ROOTHDRS) diff --git a/usr/src/lib/libfakekernel/Makefile.com b/usr/src/lib/libfakekernel/Makefile.com index 95d690f117..72fad2f3af 100644 --- a/usr/src/lib/libfakekernel/Makefile.com +++ b/usr/src/lib/libfakekernel/Makefile.com @@ -49,13 +49,10 @@ include ../../Makefile.rootfs SRCDIR= ../common -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCS= $(COBJS:%.o=$(SRCDIR)/%.c) -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) - CSTD = $(CSTD_GNU99) -C99LMODE = -Xc99=%all CFLAGS += $(CCVERBOSE) @@ -73,16 +70,11 @@ CPPFLAGS += -D_FILE_OFFSET_BITS=64 # this library is for debugging, let's always define DEBUG here. CPPFLAGS += -DDEBUG -LINTCHECKFLAGS += -erroff=E_INCONS_ARG_DECL2 -LINTCHECKFLAGS += -erroff=E_INCONS_VAL_TYPE_DECL2 -LINTCHECKFLAGS += -erroff=E_INCONS_VAL_TYPE_USED2 - LDLIBS += -lumem -lcryptoutil -lsocket -lc .KEEP_STATE: all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libfakekernel/amd64/Makefile b/usr/src/lib/libfakekernel/amd64/Makefile index 6792bbc3bb..5039a0aea7 100644 --- a/usr/src/lib/libfakekernel/amd64/Makefile +++ b/usr/src/lib/libfakekernel/amd64/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libfakekernel/i386/Makefile b/usr/src/lib/libfakekernel/i386/Makefile index c3b3d13b05..6c3e24318c 100644 --- a/usr/src/lib/libfakekernel/i386/Makefile +++ b/usr/src/lib/libfakekernel/i386/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libfakekernel/sparc/Makefile b/usr/src/lib/libfakekernel/sparc/Makefile index c3b3d13b05..6c3e24318c 100644 --- a/usr/src/lib/libfakekernel/sparc/Makefile +++ b/usr/src/lib/libfakekernel/sparc/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libfakekernel/sparcv9/Makefile b/usr/src/lib/libfakekernel/sparcv9/Makefile index e4445a2843..cbe3c9c9fb 100644 --- a/usr/src/lib/libfakekernel/sparcv9/Makefile +++ b/usr/src/lib/libfakekernel/sparcv9/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libfcoe/Makefile b/usr/src/lib/libfcoe/Makefile index e9b7036a1f..aaaf3fcb14 100644 --- a/usr/src/lib/libfcoe/Makefile +++ b/usr/src/lib/libfcoe/Makefile @@ -33,7 +33,6 @@ clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install install_h := TARGET= install_h -lint := TARGET= lint HDRS= libfcoe.h @@ -41,7 +40,7 @@ HDRDIR= common .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libfcoe/Makefile.com b/usr/src/lib/libfcoe/Makefile.com index e3daeefd56..8a92c043ba 100644 --- a/usr/src/lib/libfcoe/Makefile.com +++ b/usr/src/lib/libfcoe/Makefile.com @@ -30,7 +30,7 @@ OBJECTS= libfcoe.o include ../../Makefile.lib -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) SRCDIR = ../common @@ -39,15 +39,11 @@ INCS += -I$(SRC)/uts/common/sys/fcoe LDLIBS += -lc -ldladm -lscf CSTD= $(CSTD_GNU99) -C99LMODE= -Xc99=%all CPPFLAGS += $(INCS) -D_REENTRANT -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) - .KEEP_STATE: all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libfcoe/amd64/Makefile b/usr/src/lib/libfcoe/amd64/Makefile index 9e8a127855..31e46b8598 100644 --- a/usr/src/lib/libfcoe/amd64/Makefile +++ b/usr/src/lib/libfcoe/amd64/Makefile @@ -29,4 +29,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libfcoe/i386/Makefile b/usr/src/lib/libfcoe/i386/Makefile index 433a471ad6..405dd73bf3 100644 --- a/usr/src/lib/libfcoe/i386/Makefile +++ b/usr/src/lib/libfcoe/i386/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libfcoe/sparc/Makefile b/usr/src/lib/libfcoe/sparc/Makefile index 948a3578b3..08e81f8fe9 100644 --- a/usr/src/lib/libfcoe/sparc/Makefile +++ b/usr/src/lib/libfcoe/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libfcoe/sparcv9/Makefile b/usr/src/lib/libfcoe/sparcv9/Makefile index 3f8aa611ca..616f93b07c 100644 --- a/usr/src/lib/libfcoe/sparcv9/Makefile +++ b/usr/src/lib/libfcoe/sparcv9/Makefile @@ -27,7 +27,7 @@ include ../Makefile.com include ../../Makefile.lib.64 -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) all: $(LIBS) diff --git a/usr/src/lib/libfdisk/Makefile b/usr/src/lib/libfdisk/Makefile index 6f0330b4ad..f60d0b799c 100644 --- a/usr/src/lib/libfdisk/Makefile +++ b/usr/src/lib/libfdisk/Makefile @@ -30,19 +30,18 @@ HDRS= libfdisk.h HDRDIR= common -SUBDIRS= $(MACH) +SUBDIRS= $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all:= TARGET= all install:= TARGET= install clean:= TARGET= clean clobber:= TARGET= clobber -lint:= TARGET= lint _msg:= TARGET= _msg .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) # install rule for install_h target diff --git a/usr/src/lib/libfdisk/Makefile.com b/usr/src/lib/libfdisk/Makefile.com index 64298076cf..f524a1f214 100644 --- a/usr/src/lib/libfdisk/Makefile.com +++ b/usr/src/lib/libfdisk/Makefile.com @@ -37,7 +37,7 @@ include ../../Makefile.rootfs SRCDIR= ../common -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) CSTD= $(CSTD_GNU89) @@ -49,8 +49,6 @@ CFLAGS += -D_FILE_OFFSET_BITS=64 CFLAGS64 += -D_LARGEFILE64_SOURCE CFLAGS64 += -D_FILE_OFFSET_BITS=64 -LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN -LINTFLAGS64 += -erroff=E_BAD_PTR_CAST_ALIGN CERRWARN += $(CNOWARN_UNINIT) @@ -61,7 +59,6 @@ SMATCH=off all: $(LIBS) -lint: lintcheck pics/%.o: ../common/%.c $(COMPILE.c) -o $@ $< diff --git a/usr/src/lib/libfdisk/amd64/Makefile b/usr/src/lib/libfdisk/amd64/Makefile index 036c13779e..9704a84b6d 100644 --- a/usr/src/lib/libfdisk/amd64/Makefile +++ b/usr/src/lib/libfdisk/amd64/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libfdisk/i386/Makefile b/usr/src/lib/libfdisk/i386/Makefile index 0ef5233f44..7857fc5e13 100644 --- a/usr/src/lib/libfdisk/i386/Makefile +++ b/usr/src/lib/libfdisk/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libfdisk/sparcv9/Makefile b/usr/src/lib/libfdisk/sparcv9/Makefile index 31e1868b2d..c41dc63348 100644 --- a/usr/src/lib/libfdisk/sparcv9/Makefile +++ b/usr/src/lib/libfdisk/sparcv9/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libficl/amd64/Makefile b/usr/src/lib/libficl/amd64/Makefile index 1cac1cfedd..ec85a9a3ec 100644 --- a/usr/src/lib/libficl/amd64/Makefile +++ b/usr/src/lib/libficl/amd64/Makefile @@ -16,4 +16,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libficl/i386/Makefile b/usr/src/lib/libficl/i386/Makefile index ae94623a64..211165ec59 100644 --- a/usr/src/lib/libficl/i386/Makefile +++ b/usr/src/lib/libficl/i386/Makefile @@ -15,4 +15,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libficl/sparc/Makefile b/usr/src/lib/libficl/sparc/Makefile index ae94623a64..211165ec59 100644 --- a/usr/src/lib/libficl/sparc/Makefile +++ b/usr/src/lib/libficl/sparc/Makefile @@ -15,4 +15,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libficl/sparcv9/Makefile b/usr/src/lib/libficl/sparcv9/Makefile index 1cac1cfedd..ec85a9a3ec 100644 --- a/usr/src/lib/libficl/sparcv9/Makefile +++ b/usr/src/lib/libficl/sparcv9/Makefile @@ -16,4 +16,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libfru/Makefile b/usr/src/lib/libfru/Makefile index db52f8ccb3..8dce827c23 100644 --- a/usr/src/lib/libfru/Makefile +++ b/usr/src/lib/libfru/Makefile @@ -39,18 +39,17 @@ SUBDIRS = $(SUBDIRS_$(MACH)) # conditional assignments -all := TARGET= all +all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg POFILE= libfru.po .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) _msg: $(MSGDOMAIN) $(POFILE) $(RM) $(MSGDOMAIN)/$(POFILE) diff --git a/usr/src/lib/libfru/Makefile.flag b/usr/src/lib/libfru/Makefile.flag index 46fef309e9..6ab6a48b72 100644 --- a/usr/src/lib/libfru/Makefile.flag +++ b/usr/src/lib/libfru/Makefile.flag @@ -27,12 +27,6 @@ # lib/libfru/Makefile.flag # -LINTFLAGS = -uxn -LINTFLAGS64 = $(LINTFLAGS) -m64 -LINTOUT= lint.out -LINTSRC = $(LINTLIB:%.ln=%) -ROOTLINTDIR = $(ROOTLIBDIR) -ROOTLINT = $(LINTSRC:%=$(ROOTLINTDIR)/%) CPPFLAGS += -I../include -I$(SRC)/lib/libpicl CPPFLAGS += -I$(SRC)/lib/libfruutils @@ -49,11 +43,6 @@ CCERRWARN += -_gcc=-Wno-reorder CCERRWARN += -_gcc=-Wno-type-limits CLEANFILES += pics/lex.fru.cc pics/y.tab.cc pics/y.tab.h - -$(LINTLIB) := SRCS = ../llib-lfru -$(LINTLIB) := LINTFLAGS = -nvx -I../include -$(LINTLIB) := LINTFLAGS64 = -nvx -m64 -I../include - CLOBBERFILES += $(DYNLIBCCC) libfru.so .KEEP_STATE: @@ -62,6 +51,3 @@ all : pics .WAIT $(DYNLIBCCC) $(RM) libfru.so $(LN) $(DYNLIBCCC) libfru.so $(CHMOD) 755 libfru.so - -lint : - @ $(ECHO) "No C code here, only C++ code: skipping" diff --git a/usr/src/lib/libfru/libfrupicl/Makefile b/usr/src/lib/libfru/libfrupicl/Makefile index cd361c6ba3..10090e7f62 100644 --- a/usr/src/lib/libfru/libfrupicl/Makefile +++ b/usr/src/lib/libfru/libfrupicl/Makefile @@ -23,19 +23,16 @@ # Copyright (c) 2000 by Sun Microsystems, Inc. # All rights reserved. # -#pragma ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/Makefile.lib SUBDIRS = .WAIT $(MACH) $(BUILD64) $(MACH64) # conditional assignments -all := TARGET= all +all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg sparc_HDRS= @@ -48,7 +45,7 @@ CHECKHDRS= $(HDRS:%.h=%.check) .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) _msg: $(MACH) $(MACH64) diff --git a/usr/src/lib/libfru/libfrupicl/Makefile.com b/usr/src/lib/libfru/libfrupicl/Makefile.com index 4ecacb06af..435038f71d 100644 --- a/usr/src/lib/libfru/libfrupicl/Makefile.com +++ b/usr/src/lib/libfru/libfrupicl/Makefile.com @@ -38,27 +38,15 @@ LIBS = $(DYNLIB) # There should be a mapfile here MAPFILES = -LINTFLAGS = -mnux -LINTFLAGS64 = $(LINTFLAGS) -m64 -LINTOUT= lint.out -LINTSRC = $(LINTLIB:%.ln=%) -ROOTLINTDIR = $(ROOTLIBDIR) -ROOTLINT = $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES= $(LINTOUT) - CPPFLAGS += -I.. \ -I$(SRC)/lib/libfru/include \ -I$(SRC)/cmd/picl/plugins/sun4u/frudata \ -I$(SRC)/lib/libpicl \ -I$(SRC)/lib/libfruutils \ -I$(SRC)/cmd/picl/plugins/inc -CPPFLAGS += -D_REENTRANT +CPPFLAGS += -D_REENTRANT CFLAGS += $(CCVERBOSE) -$(LINTLIB) := LINTFLAGS = -nvx -I.. -$(LINTLIB) := LINTFLAGS64 = -nvx -m64 -I.. - XGETFLAGS += -a POFILE= picl.po @@ -67,8 +55,6 @@ POFILE= picl.po all : $(LIBS) chmod 755 $(DYNLIB) -lint : lintcheck - %.po: ../%.c $(CP) $< $<.i $(BUILD.po) @@ -83,6 +69,3 @@ include $(SRC)/lib/Makefile.targ pics/%.o: ../%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) - -$(ROOTLINTDIR)/%: ../% - $(INS.file) diff --git a/usr/src/lib/libfru/libfrupicltree/Makefile b/usr/src/lib/libfru/libfrupicltree/Makefile index 0bdf6ea08f..599986465a 100644 --- a/usr/src/lib/libfru/libfrupicltree/Makefile +++ b/usr/src/lib/libfru/libfrupicltree/Makefile @@ -23,20 +23,15 @@ # Copyright (c) 2000-2001 by Sun Microsystems, Inc. # All rights reserved. # -# lib/libfru/libfrupicltree/Makefile -# -#pragma ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/Makefile.lib SUBDIRS = .WAIT $(MACH) -all := TARGET= all +all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg sparc_HDRS= @@ -49,7 +44,7 @@ CHECKHDRS= $(HDRS:%.h=%.check) .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) _msg: $(MACH) $(MACH64) diff --git a/usr/src/lib/libfru/libfrupicltree/Makefile.com b/usr/src/lib/libfru/libfrupicltree/Makefile.com index ea099655a9..ebf91c5663 100644 --- a/usr/src/lib/libfru/libfrupicltree/Makefile.com +++ b/usr/src/lib/libfru/libfrupicltree/Makefile.com @@ -37,26 +37,15 @@ LIBS = $(DYNLIB) # There should be a mapfile here MAPFILES = -LINTFLAGS = -mnux -LINTFLAGS64 = $(LINTFLAGS) -m64 -LINTOUT= lint.out -LINTSRC = $(LINTLIB:%.ln=%) -ROOTLINTDIR = $(ROOTLIBDIR) -ROOTLINT = $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES= $(LINTOUT) - CPPFLAGS += -I.. \ -I$(SRC)/lib/libfru/include \ -I$(SRC)/cmd/picl/plugins/sun4u/frudata \ -I$(SRC)/lib/libpicl \ -I$(SRC)/lib/libfruutils \ -I$(SRC)/cmd/picl/plugins/inc -CPPFLAGS += -D_REENTRANT +CPPFLAGS += -D_REENTRANT CFLAGS += $(CCVERBOSE) -$(LINTLIB) := LINTFLAGS = -nvx -I.. -$(LINTLIB) := LINTFLAGS64 = -nvx -m64 -I.. XGETFLAGS += -a POFILE= picl.po @@ -66,8 +55,6 @@ POFILE= picl.po all : $(LIBS) chmod 755 $(DYNLIB) -lint : lintcheck - %.po: ../%.c $(CP) $< $<.i $(BUILD.po) @@ -81,6 +68,3 @@ include $(SRC)/lib/Makefile.targ pics/%.o: ../%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) - -$(ROOTLINTDIR)/%: ../% - $(INS.file) diff --git a/usr/src/lib/libfru/libfruraw/Makefile b/usr/src/lib/libfru/libfruraw/Makefile index 3d39b02828..a99f4f5c38 100644 --- a/usr/src/lib/libfru/libfruraw/Makefile +++ b/usr/src/lib/libfru/libfruraw/Makefile @@ -29,11 +29,10 @@ include $(SRC)/lib/Makefile.lib SUBDIRS = .WAIT $(MACH) $(BUILD64) $(MACH64) # conditional assignments -all := TARGET= all +all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg sparc_HDRS= @@ -46,7 +45,7 @@ CHECKHDRS= $(HDRS:%.h=%.check) .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) _msg: $(MACH) $(MACH64) diff --git a/usr/src/lib/libfru/libfruraw/Makefile.com b/usr/src/lib/libfru/libfruraw/Makefile.com index e4e7e67eab..ef9837ecb2 100644 --- a/usr/src/lib/libfru/libfruraw/Makefile.com +++ b/usr/src/lib/libfru/libfruraw/Makefile.com @@ -38,19 +38,10 @@ LIBS = $(DYNLIB) MAPFILES = -LINTFLAGS = -uxn -LINTFLAGS64 = $(LINTFLAGS) -m64 -LINTOUT= lint.out -LINTSRC = $(LINTLIB:%.ln=%) -ROOTLINTDIR = $(ROOTLIBDIR) -ROOTLINT = $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES= $(LINTOUT) - CPPFLAGS += -I.. \ -I$(SRC)/lib/libfru/include \ -I$(SRC)/lib/libfruutils -CPPFLAGS += -D_REENTRANT +CPPFLAGS += -D_REENTRANT CFLAGS += $(CCVERBOSE) CERRWARN += $(CNOWARN_UNINIT) @@ -58,8 +49,6 @@ CERRWARN += $(CNOWARN_UNINIT) # not linted SMATCH=off -$(LINTLIB) := LINTFLAGS = -nvx -I.. -$(LINTLIB) := LINTFLAGS64 = -nvx -m64 -I.. XGETFLAGS += -a POFILE= picl.po @@ -69,8 +58,6 @@ POFILE= picl.po all : $(LIBS) chmod 755 $(DYNLIB) -lint : lintcheck - %.po: ../%.c $(CP) $< $<.i $(BUILD.po) @@ -85,6 +72,3 @@ include $(SRC)/lib/Makefile.targ pics/%.o: ../%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) - -$(ROOTLINTDIR)/%: ../% - $(INS.file) diff --git a/usr/src/lib/libfru/libfrureg/Makefile b/usr/src/lib/libfru/libfrureg/Makefile index 9543bc389f..fd442d391b 100644 --- a/usr/src/lib/libfru/libfrureg/Makefile +++ b/usr/src/lib/libfru/libfrureg/Makefile @@ -23,19 +23,16 @@ # Copyright (c) 2000-2001 by Sun Microsystems, Inc. # All rights reserved. # -#pragma ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/Makefile.lib SUBDIRS = .WAIT $(MACH) $(BUILD64) $(MACH64) # conditional assignments -all := TARGET= all +all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg sparc_HDRS= @@ -48,7 +45,7 @@ CHECKHDRS= $(HDRS:%.h=%.check) .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) _msg: $(MACH) $(MACH64) diff --git a/usr/src/lib/libfru/libfrureg/Makefile.com b/usr/src/lib/libfru/libfrureg/Makefile.com index f52ae73c86..5d9a300ffa 100644 --- a/usr/src/lib/libfru/libfrureg/Makefile.com +++ b/usr/src/lib/libfru/libfrureg/Makefile.com @@ -38,28 +38,17 @@ LIBS = $(DYNLIB) # There should be a mapfile here MAPFILES = -LINTFLAGS = -uxn -LINTFLAGS64 = $(LINTFLAGS) -m64 -LINTOUT= lint.out -LINTSRC = $(LINTLIB:%.ln=%) -ROOTLINTDIR = $(ROOTLIBDIR) -ROOTLINT = $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES= $(LINTOUT) - CPPFLAGS += -I.. \ -I$(SRC)/lib/libfru/include \ -I$(SRC)/cmd/picl/plugins/sun4u/frudata \ -I$(SRC)/lib/libpicl \ -I$(SRC)/lib/libfruutils \ -I$(SRC)/cmd/picl/plugins/inc -CPPFLAGS += -D_REENTRANT +CPPFLAGS += -D_REENTRANT CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-unused-variable -$(LINTLIB) := LINTFLAGS = -nvx -I.. -$(LINTLIB) := LINTFLAGS64 = -nvx -m64 -I.. XGETFLAGS += -a POFILE= picl.po @@ -69,8 +58,6 @@ POFILE= picl.po all : $(LIBS) chmod 755 $(DYNLIB) -lint : lintcheck - %.po: ../%.c $(CP) $< $<.i $(BUILD.po) @@ -85,6 +72,3 @@ include $(SRC)/lib/Makefile.targ pics/%.o: ../%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) - -$(ROOTLINTDIR)/%: ../% - $(INS.file) diff --git a/usr/src/lib/libfru/libnvfru/Makefile b/usr/src/lib/libfru/libnvfru/Makefile index a2c44539ab..b7c0896e0f 100644 --- a/usr/src/lib/libfru/libnvfru/Makefile +++ b/usr/src/lib/libfru/libnvfru/Makefile @@ -30,11 +30,10 @@ SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) # conditional assignments -all := TARGET= all +all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg sparc_HDRS= @@ -47,7 +46,7 @@ CHECKHDRS= $(HDRS:%.h=%.check) .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) _msg: $(MACH) $(MACH64) diff --git a/usr/src/lib/libfru/libnvfru/Makefile.com b/usr/src/lib/libfru/libnvfru/Makefile.com index 5dc2723b30..216f9d029f 100644 --- a/usr/src/lib/libfru/libnvfru/Makefile.com +++ b/usr/src/lib/libfru/libnvfru/Makefile.com @@ -35,25 +35,14 @@ CLOBBERFILES += $(LIBLINKS) LIBS = $(DYNLIB) -LINTFLAGS = -uxn -LINTFLAGS64 = $(LINTFLAGS) -m64 -LINTOUT= lint.out -LINTSRC = $(LINTLIB:%.ln=%) -ROOTLINTDIR = $(ROOTLIBDIR) -ROOTLINT = $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES= $(LINTOUT) - CPPFLAGS += -I.. \ -I$(SRC)/lib/libfru/include \ -I$(SRC)/lib/libfruutils -CPPFLAGS += -D_REENTRANT +CPPFLAGS += -D_REENTRANT CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-switch -$(LINTLIB) := LINTFLAGS = -nvx -I.. -$(LINTLIB) := LINTFLAGS64 = -nvx -m64 -I.. XGETFLAGS += -a @@ -61,14 +50,9 @@ XGETFLAGS += -a all : $(LIBS) -lint : lintcheck - # include library targets include $(SRC)/lib/Makefile.targ pics/%.o: ../%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) - -$(ROOTLINTDIR)/%: ../% - $(INS.file) diff --git a/usr/src/lib/libfruutils/Makefile b/usr/src/lib/libfruutils/Makefile index bc8e7195bb..194ab33df7 100644 --- a/usr/src/lib/libfruutils/Makefile +++ b/usr/src/lib/libfruutils/Makefile @@ -23,10 +23,6 @@ # Copyright (c) 2000 by Sun Microsystems, Inc. # All rights reserved. # -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/libfruutils/Makefile -# # include library definitions include $(SRC)/lib/Makefile.lib @@ -38,14 +34,13 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg POFILE= libfruutils.po .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) _msg: $(MSGDOMAIN) $(POFILE) $(RM) $(MSGDOMAIN)/$(POFILE) diff --git a/usr/src/lib/libfruutils/Makefile.com b/usr/src/lib/libfruutils/Makefile.com index c60509e242..442c72d63e 100644 --- a/usr/src/lib/libfruutils/Makefile.com +++ b/usr/src/lib/libfruutils/Makefile.com @@ -38,38 +38,20 @@ LIBS = $(DYNLIB) # There should be a mapfile here MAPFILES = -LINTFLAGS = -uxn -LINTFLAGS64 = $(LINTFLAGS) -m64 -LINTOUT= lint.out -LINTSRC = $(LINTLIB:%.ln=%) -ROOTLINTDIR = $(ROOTLIBDIR) -ROOTLINT = $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES= $(LINTOUT) - CPPFLAGS += -I.. -D_REENTRANT CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-switch CERRWARN += $(CNOWARN_UNINIT) -$(LINTLIB) := LINTFLAGS = -nvx -$(LINTLIB) := LINTFLAGS64 = -nvx -m64 - .KEEP_STATE: all : $(LIBS) $(CHMOD) 755 $(DYNLIB) -lint : - $(LINT.c) $(SRCS) - # include library targets include $(SRC)/lib/Makefile.targ pics/%.o: ../%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) - -$(ROOTLINTDIR)/%: ../% - $(INS.file) diff --git a/usr/src/lib/libfsmgt/Makefile b/usr/src/lib/libfsmgt/Makefile index 13fd55c705..9e6169428a 100644 --- a/usr/src/lib/libfsmgt/Makefile +++ b/usr/src/lib/libfsmgt/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.master @@ -37,11 +35,10 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: diff --git a/usr/src/lib/libfsmgt/Makefile.com b/usr/src/lib/libfsmgt/Makefile.com index c55c93285b..637e789418 100644 --- a/usr/src/lib/libfsmgt/Makefile.com +++ b/usr/src/lib/libfsmgt/Makefile.com @@ -42,11 +42,10 @@ ROOTHDRS= $(HDRS:%=$(ROOTDIRS)/%) CHECKHDRS= $(HDRS:%.h=%.check) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -lnsl -lkstat SRCDIR = ../common -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CPPFLAGS += -D_REENTRANT -I$(SRC)/lib/libfsmgt/common \ @@ -66,7 +65,6 @@ CLOBBERFILES += $(SRCDIR)/sharetab.c all: $(LIBS) -lint: lintcheck $(SRCDIR)/sharetab.c: $(NFSLIB_DIR)/sharetab.c rm -f $(SRCDIR)/sharetab.c diff --git a/usr/src/lib/libfsmgt/i386/Makefile b/usr/src/lib/libfsmgt/i386/Makefile index 1fc6b79eac..e129d9ceb8 100644 --- a/usr/src/lib/libfsmgt/i386/Makefile +++ b/usr/src/lib/libfsmgt/i386/Makefile @@ -23,10 +23,7 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libdiskmgt/i386/Makefile include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libfsmgt/sparc/Makefile b/usr/src/lib/libfsmgt/sparc/Makefile index 87bc18045d..e129d9ceb8 100644 --- a/usr/src/lib/libfsmgt/sparc/Makefile +++ b/usr/src/lib/libfsmgt/sparc/Makefile @@ -23,10 +23,7 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libfsmgt/sparc/Makefile include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libfstyp/Makefile b/usr/src/lib/libfstyp/Makefile index 1878db324c..a9ef018d78 100644 --- a/usr/src/lib/libfstyp/Makefile +++ b/usr/src/lib/libfstyp/Makefile @@ -37,11 +37,10 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libfstyp/Makefile.com b/usr/src/lib/libfstyp/Makefile.com index 19177c1e25..b77c3b7afd 100644 --- a/usr/src/lib/libfstyp/Makefile.com +++ b/usr/src/lib/libfstyp/Makefile.com @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY = libfstyp.a VERS = .1 @@ -33,20 +31,17 @@ include ../../Makefile.lib SRCDIR = ../common -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc INCS += -I$(SRCDIR) -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_LARGEFILE64_SOURCE CPPFLAGS += $(INCS) -LINTFLAGS64 += -errchk=longptr64 .KEEP_STATE: all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libfstyp/i386/Makefile b/usr/src/lib/libfstyp/i386/Makefile index a333224278..282da97a76 100644 --- a/usr/src/lib/libfstyp/i386/Makefile +++ b/usr/src/lib/libfstyp/i386/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libfstyp/sparc/Makefile b/usr/src/lib/libfstyp/sparc/Makefile index a333224278..282da97a76 100644 --- a/usr/src/lib/libfstyp/sparc/Makefile +++ b/usr/src/lib/libfstyp/sparc/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libgen/Makefile b/usr/src/lib/libgen/Makefile index 50890d7703..16577ebd58 100644 --- a/usr/src/lib/libgen/Makefile +++ b/usr/src/lib/libgen/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -37,11 +35,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint:= TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libgen/Makefile.com b/usr/src/lib/libgen/Makefile.com index f0c3300e80..79e6526fc3 100644 --- a/usr/src/lib/libgen/Makefile.com +++ b/usr/src/lib/libgen/Makefile.com @@ -34,11 +34,10 @@ include ../../Makefile.lib # install this library in the root filesystem include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc SRCDIR = ../common -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CPPFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -I../inc -I../../common/inc @@ -50,10 +49,16 @@ CERRWARN += $(CNOWARN_UNINIT) # not linted SMATCH=off +COMPATLINKS += usr/ccs/lib/libgen.so +COMPATLINKS64 += usr/ccs/lib/$(MACH64)/libgen.so + +$(ROOT)/usr/ccs/lib/libgen.so := COMPATLINKTARGET=../../../lib/libgen.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libgen.so:= \ + COMPATLINKTARGET=../../../../lib/$(MACH64)/libgen.so.1 + .KEEP_STATE: all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libgen/amd64/Makefile b/usr/src/lib/libgen/amd64/Makefile index f3b194ffac..a21175e8a6 100644 --- a/usr/src/lib/libgen/amd64/Makefile +++ b/usr/src/lib/libgen/amd64/Makefile @@ -25,8 +25,8 @@ include ../Makefile.com include ../../Makefile.lib.64 -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libgen/i386/Makefile b/usr/src/lib/libgen/i386/Makefile index 8e78beab26..4294af4b98 100644 --- a/usr/src/lib/libgen/i386/Makefile +++ b/usr/src/lib/libgen/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libgen/sparc/Makefile b/usr/src/lib/libgen/sparc/Makefile index 8e78beab26..4294af4b98 100644 --- a/usr/src/lib/libgen/sparc/Makefile +++ b/usr/src/lib/libgen/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libgen/sparcv9/Makefile b/usr/src/lib/libgen/sparcv9/Makefile index f0311532a0..e09b255dd9 100644 --- a/usr/src/lib/libgen/sparcv9/Makefile +++ b/usr/src/lib/libgen/sparcv9/Makefile @@ -25,8 +25,8 @@ include ../Makefile.com include ../../Makefile.lib.64 -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libgrubmgmt/Makefile b/usr/src/lib/libgrubmgmt/Makefile index 5a147360bd..55705ea512 100644 --- a/usr/src/lib/libgrubmgmt/Makefile +++ b/usr/src/lib/libgrubmgmt/Makefile @@ -34,16 +34,15 @@ POFILES = common/libgrub_errno.po SUBDIRS = $(MACH) # conditional assignments -all := TARGET= all +all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint test := TARGET= test .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libgrubmgmt/Makefile.com b/usr/src/lib/libgrubmgmt/Makefile.com index ef1da17922..74fd51a797 100644 --- a/usr/src/lib/libgrubmgmt/Makefile.com +++ b/usr/src/lib/libgrubmgmt/Makefile.com @@ -33,13 +33,12 @@ OBJECTS += libgrub_menu.o libgrub_bargs.o libgrub_errno.o include ../../Makefile.lib include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common INCS += -I$(SRCDIR) -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) # # Libraries added to the next line must be present in miniroot # @@ -51,6 +50,5 @@ CFLAGS += $(CCVERBOSE) all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libgrubmgmt/i386/Makefile b/usr/src/lib/libgrubmgmt/i386/Makefile index 9b91a98d13..8697c2f834 100644 --- a/usr/src/lib/libgrubmgmt/i386/Makefile +++ b/usr/src/lib/libgrubmgmt/i386/Makefile @@ -32,4 +32,4 @@ include ../Makefile.com # LDLIBS += -lfdisk -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libgrubmgmt/sparc/Makefile b/usr/src/lib/libgrubmgmt/sparc/Makefile index 0ef5233f44..47878e05bc 100644 --- a/usr/src/lib/libgrubmgmt/sparc/Makefile +++ b/usr/src/lib/libgrubmgmt/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libgss/Makefile b/usr/src/lib/libgss/Makefile index 73d2c91060..4949cfb40e 100644 --- a/usr/src/lib/libgss/Makefile +++ b/usr/src/lib/libgss/Makefile @@ -42,7 +42,6 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint POFILE = $(LIBRARY:.a=.po) XGETFLAGS+= -a @@ -50,7 +49,7 @@ MSGFILES = `$(GREP) -l gettext *.[ch]` .KEEP_STATE: -all clean clobber lint: $(SUBDIRS) +all clean clobber: $(SUBDIRS) install: $(GSSMECH_DIR) all .WAIT $(SUBDIRS) diff --git a/usr/src/lib/libgss/Makefile.com b/usr/src/lib/libgss/Makefile.com index fd3ea535db..135ab47e3e 100644 --- a/usr/src/lib/libgss/Makefile.com +++ b/usr/src/lib/libgss/Makefile.com @@ -88,23 +88,19 @@ SRCS += $(GSSCREDOBJ:%.o=$(GSSCRED_DIR)/%.c) \ $(KRB5OBJ:%.o=$(KRB5DIR)/%.c) \ $(KRB5ETOBJ:%.o=$(KRB5ETDIR)/%.c) \ $(UTSGSSOBJ:%.o=$(UTSGSSDIR)/%.c) -GSSLINTSRC = $(GSSOBJECTS:%.o=$(SRCDIR)/%.c) \ - $(GSSCREDOBJ:%.o=$(GSSCRED_DIR)/%.c) \ - $(UTSGSSOBJ:%.o=$(UTSGSSDIR)/%.c) OBJECTS = $(GSSOBJECTS) $(GSSCREDOBJ) $(KRB5OBJ) $(UTSGSSOBJ) $(KRB5ETOBJ) # include library definitions include ../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) -LDLIBS += -lc +LDLIBS += -lc -CPPFLAGS += -I$(GSSCRED_DIR) -I$(SRC)/uts/common/gssapi/include \ - -I$(SRC)/uts/common/gssapi/mechs/krb5/include \ - -I$(SRC)/uts/common/gssapi/ \ - -I$(SRC)/lib/gss_mechs/mech_krb5/include/ \ +CPPFLAGS += -I$(GSSCRED_DIR) -I$(SRC)/uts/common/gssapi/include \ + -I$(SRC)/uts/common/gssapi/mechs/krb5/include \ + -I$(SRC)/uts/common/gssapi/ \ + -I$(SRC)/lib/gss_mechs/mech_krb5/include/ \ -DHAVE_STDLIB_H CERRWARN += -_gcc=-Wno-unused-function @@ -119,9 +115,6 @@ SMATCH=off all: $(LIBS) -lintcheck:= SRCS= $(GSSLINTSRC) - -lint: lintcheck $(GSSCREDOBJ:%.o=pics/%.o): $(COMPILE.c) -o $@ $(@:pics/%.o=$(GSSCRED_DIR)/%.c) @@ -241,7 +234,7 @@ pics/ss_err.o: $(KRB5ETDIR)/ss_err.c # used by rpcsec module pics/gen_oids.o: $(SRC)/uts/common/gssapi/gen_oids.c $(COMPILE.c) -o $@ $(SRC)/uts/common/gssapi/gen_oids.c - $(POST_PROCESS_O) + $(POST_PROCESS_O) # include library targets include ../../Makefile.targ diff --git a/usr/src/lib/libgss/i386/Makefile b/usr/src/lib/libgss/i386/Makefile index 3a9b043b65..4985a17a2a 100644 --- a/usr/src/lib/libgss/i386/Makefile +++ b/usr/src/lib/libgss/i386/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -31,5 +29,5 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libgss/sparc/Makefile b/usr/src/lib/libgss/sparc/Makefile index 2a944b0b43..d6eed917a9 100644 --- a/usr/src/lib/libgss/sparc/Makefile +++ b/usr/src/lib/libgss/sparc/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -31,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libgss/sparcv9/Makefile b/usr/src/lib/libgss/sparcv9/Makefile index a4095ab7ce..aac1ebbe1f 100644 --- a/usr/src/lib/libgss/sparcv9/Makefile +++ b/usr/src/lib/libgss/sparcv9/Makefile @@ -23,16 +23,13 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libgss/sparcv9/Makefile include ../Makefile.com include ../../Makefile.lib.64 GSSMECH_DIR_V9 = $(ROOT)/usr/lib/sparcv9/gss -install: all $(GSSMECH_DIR_V9) $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(GSSMECH_DIR_V9) $(ROOTLIBS64) $(ROOTLINKS64) $(GSSMECH_DIR_V9): $(INS.dir) diff --git a/usr/src/lib/libhotplug/Makefile b/usr/src/lib/libhotplug/Makefile index eaa5d492bd..7bcabdf05d 100644 --- a/usr/src/lib/libhotplug/Makefile +++ b/usr/src/lib/libhotplug/Makefile @@ -32,14 +32,13 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint HDRS= libhotplug.h libhotplug_impl.h HDRDIR= common .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) check: $(CHECKHDRS) diff --git a/usr/src/lib/libhotplug/Makefile.com b/usr/src/lib/libhotplug/Makefile.com index 92fb91de2a..95d1145ef7 100644 --- a/usr/src/lib/libhotplug/Makefile.com +++ b/usr/src/lib/libhotplug/Makefile.com @@ -29,12 +29,11 @@ OBJECTS= libhotplug.o include ../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -lnvpair SRCDIR = ../common CPPFLAGS += -I$(SRCDIR) -D_REENTRANT -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) CERRWARN += -_gcc=-Wno-parentheses @@ -42,6 +41,5 @@ CERRWARN += -_gcc=-Wno-parentheses all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libhotplug/amd64/Makefile b/usr/src/lib/libhotplug/amd64/Makefile index 036c13779e..8680082937 100644 --- a/usr/src/lib/libhotplug/amd64/Makefile +++ b/usr/src/lib/libhotplug/amd64/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libhotplug/i386/Makefile b/usr/src/lib/libhotplug/i386/Makefile index c86be4377c..d19fa69829 100644 --- a/usr/src/lib/libhotplug/i386/Makefile +++ b/usr/src/lib/libhotplug/i386/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libhotplug/sparc/Makefile b/usr/src/lib/libhotplug/sparc/Makefile index c86be4377c..d19fa69829 100644 --- a/usr/src/lib/libhotplug/sparc/Makefile +++ b/usr/src/lib/libhotplug/sparc/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libhotplug/sparcv9/Makefile b/usr/src/lib/libhotplug/sparcv9/Makefile index 036c13779e..8680082937 100644 --- a/usr/src/lib/libhotplug/sparcv9/Makefile +++ b/usr/src/lib/libhotplug/sparcv9/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libidmap/Makefile b/usr/src/lib/libidmap/Makefile index a2a6cccd23..c55d64113e 100644 --- a/usr/src/lib/libidmap/Makefile +++ b/usr/src/lib/libidmap/Makefile @@ -38,15 +38,14 @@ XGETFLAGS = --foreign-user --strict -n -E --width=72 \ --omit-header --keyword=directoryError:2 \ --language=C --force-po -all := TARGET = all +all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libidmap/Makefile.com b/usr/src/lib/libidmap/Makefile.com index aff1f976e9..7e20f65a0a 100644 --- a/usr/src/lib/libidmap/Makefile.com +++ b/usr/src/lib/libidmap/Makefile.com @@ -26,28 +26,25 @@ LIBRARY = libidmap.a VERS = .1 -LINT_OBJECTS = \ +OBJECTS = \ directory_client.o \ directory_error.o \ - directory_helper.o \ + directory_helper.o \ directory_rpc_clnt.o \ + idmap_xdr.o \ sidutil.o \ sized_array.o \ idmap_api.o \ idmap_cache.o \ utils.o -OBJECTS = $(LINT_OBJECTS) \ - idmap_xdr.o - include ../../Makefile.lib CSTD = $(CSTD_GNU99) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -lavl -lnsl -lnvpair -luutil SRCDIR = ../common -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) # Relative path to ensure path to idmap_prot.h is also relative IDMAP_PROT_X = ../../../uts/common/rpcsvc/idmap_prot.x @@ -60,8 +57,6 @@ CERRWARN += -_gcc=-Wno-switch CLOBBERFILES += idmap_xdr.c -lint := OBJECTS = $(LINT_OBJECTS) - .KEEP_STATE: all: $(LIBS) @@ -69,9 +64,5 @@ all: $(LIBS) idmap_xdr.c: $(IDMAP_PROT_X) $(RM) $@; $(RPCGEN) -CMNc -o $@ $(IDMAP_PROT_X) -lint: lintcheck - -LINTFLAGS += -erroff=E_CONSTANT_CONDITION -LINTFLAGS64 += -erroff=E_CONSTANT_CONDITION include ../../Makefile.targ diff --git a/usr/src/lib/libidmap/i386/Makefile b/usr/src/lib/libidmap/i386/Makefile index f91f0270e9..2845cd3c2d 100644 --- a/usr/src/lib/libidmap/i386/Makefile +++ b/usr/src/lib/libidmap/i386/Makefile @@ -22,9 +22,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libidmap/sparc/Makefile b/usr/src/lib/libidmap/sparc/Makefile index f91f0270e9..2845cd3c2d 100644 --- a/usr/src/lib/libidmap/sparc/Makefile +++ b/usr/src/lib/libidmap/sparc/Makefile @@ -22,9 +22,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libilb/Makefile b/usr/src/lib/libilb/Makefile index af3afb9ebe..d8c4130a74 100644 --- a/usr/src/lib/libilb/Makefile +++ b/usr/src/lib/libilb/Makefile @@ -23,7 +23,7 @@ # Use is subject to license terms. # -include $(SRC)/lib/Makefile.lib +include $(SRC)/lib/Makefile.lib HDRS = libilb.h HDRDIR = common @@ -33,15 +33,14 @@ $(BUILD64)SUBDIRS += $(MACH64) POFILE = libilb.po MSGFILES = common/ilb_subr.c -all := TARGET = all +all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) @@ -57,5 +56,5 @@ $(SUBDIRS): FRC FRC: -include $(SRC)/Makefile.msg.targ +include $(SRC)/Makefile.msg.targ include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libilb/Makefile.com b/usr/src/lib/libilb/Makefile.com index dd8e50d040..e5d4a5e6ac 100644 --- a/usr/src/lib/libilb/Makefile.com +++ b/usr/src/lib/libilb/Makefile.com @@ -28,17 +28,16 @@ VERS = .1 LIB_OBJS = ilb_sg.o ilb_comm.o ilb_subr.o ilb_rules.o LIB_OBJS += ilb_hc.o ilb_nat.o -OBJECTS = $(LIB_OBJS) +OBJECTS = $(LIB_OBJS) include ../../Makefile.lib LIB_SRCS= $(LIB_OBJS:%.o=$(SRCDIR)/%.c) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) INCS += -I../common -I$(SRC)/uts/common LDLIBS += -lc SRCDIR = ../common -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CSTD = $(CSTD_GNU99) @@ -50,7 +49,5 @@ LDLIBS += -lsocket all: $(LIBS) -lint: $(LIB_SRCS) - $(LINT.c) $(LINTCHECKFLAGS) $(LIB_SRCS) $(LDLIBS) include ../../Makefile.targ diff --git a/usr/src/lib/libilb/i386/Makefile b/usr/src/lib/libilb/i386/Makefile index c86be4377c..d19fa69829 100644 --- a/usr/src/lib/libilb/i386/Makefile +++ b/usr/src/lib/libilb/i386/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libilb/sparc/Makefile b/usr/src/lib/libilb/sparc/Makefile index c86be4377c..d19fa69829 100644 --- a/usr/src/lib/libilb/sparc/Makefile +++ b/usr/src/lib/libilb/sparc/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libima/Makefile b/usr/src/lib/libima/Makefile index 1f1e96f466..0c3d18b77b 100644 --- a/usr/src/lib/libima/Makefile +++ b/usr/src/lib/libima/Makefile @@ -35,11 +35,10 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libima/Makefile.com b/usr/src/lib/libima/Makefile.com index 7e2b2eaa16..20dad2beed 100644 --- a/usr/src/lib/libima/Makefile.com +++ b/usr/src/lib/libima/Makefile.com @@ -35,7 +35,7 @@ include ../../Makefile.lib IETCFILES= $(CONFIGFILE:%=$(ROOTETC)/%) IETCFILES:= FILEMODE= 644 -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc CFLAGS += -mt @@ -55,11 +55,8 @@ CERRWARN += -_gcc=-Wno-unused-variable # not linted SMATCH=off -LINTFLAGS += -DSOLARIS -LINTFLAGS64 += -DSOLARIS SRCDIR = ../common -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) $(ROOTETC)/%: ../common/% $(INS.file) @@ -68,7 +65,4 @@ $(ROOTETC)/%: ../common/% all: $(LIBS) $(IETCFILES) -lint: - @echo "This section is not required to be lint clean" - include ../../Makefile.targ diff --git a/usr/src/lib/libima/i386/Makefile b/usr/src/lib/libima/i386/Makefile index 95a52ca13f..4f51c80a6e 100644 --- a/usr/src/lib/libima/i386/Makefile +++ b/usr/src/lib/libima/i386/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libima/sparc/Makefile b/usr/src/lib/libima/sparc/Makefile index 95a52ca13f..4f51c80a6e 100644 --- a/usr/src/lib/libima/sparc/Makefile +++ b/usr/src/lib/libima/sparc/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libinetsvc/Makefile b/usr/src/lib/libinetsvc/Makefile index 0b426c7c65..31f045299c 100644 --- a/usr/src/lib/libinetsvc/Makefile +++ b/usr/src/lib/libinetsvc/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -33,14 +31,13 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint HDRDIR = common HDRS = inetsvc.h .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libinetsvc/Makefile.com b/usr/src/lib/libinetsvc/Makefile.com index 1fb0e2b7fa..3a3a6c6099 100644 --- a/usr/src/lib/libinetsvc/Makefile.com +++ b/usr/src/lib/libinetsvc/Makefile.com @@ -30,11 +30,10 @@ OBJECTS = inetsvc.o include ../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lscf -lc -lsocket -lnsl -lmd -luutil SRCDIR = ../common -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) -Wp,$(CSTD_GNU99) CPPFLAGS += -I../common -D_REENTRANT @@ -51,6 +50,5 @@ SMATCH=off all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libinetsvc/i386/Makefile b/usr/src/lib/libinetsvc/i386/Makefile index c56fff345b..18584b4da1 100644 --- a/usr/src/lib/libinetsvc/i386/Makefile +++ b/usr/src/lib/libinetsvc/i386/Makefile @@ -23,9 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libinetsvc/sparc/Makefile b/usr/src/lib/libinetsvc/sparc/Makefile index c56fff345b..18584b4da1 100644 --- a/usr/src/lib/libinetsvc/sparc/Makefile +++ b/usr/src/lib/libinetsvc/sparc/Makefile @@ -23,9 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libinetutil/Makefile b/usr/src/lib/libinetutil/Makefile index 1d1ed69ccd..5b4c1afe78 100644 --- a/usr/src/lib/libinetutil/Makefile +++ b/usr/src/lib/libinetutil/Makefile @@ -31,15 +31,14 @@ HDRDIR = common SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) -all := TARGET = all +all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libinetutil/Makefile.com b/usr/src/lib/libinetutil/Makefile.com index d73fecb5ef..c3b3b98ddc 100644 --- a/usr/src/lib/libinetutil/Makefile.com +++ b/usr/src/lib/libinetutil/Makefile.com @@ -25,7 +25,7 @@ # Copyright (c) 2018, Joyent, Inc. LIBRARY = libinetutil.a -VERS = .1 +VERS = .1 OBJECTS = octet.o inetutil.o ifspec.o ifaddrlist.o ifaddrlistx.o eh.o tq.o include ../../Makefile.lib @@ -33,15 +33,14 @@ include ../../Makefile.lib # install this library in the root filesystem include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common COMDIR = $(SRC)/common/net/dhcp -SRCS = $(COMDIR)/octet.c $(SRCDIR)/inetutil.c \ +SRCS = $(COMDIR)/octet.c $(SRCDIR)/inetutil.c \ $(SRCDIR)/ifspec.c $(SRCDIR)/eh.c $(SRCDIR)/tq.c \ $(SRCDIR)/ifaddrlist.c $(SRCDIR)/ifaddrlistx.c -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) LDLIBS += -lsocket -lc CFLAGS += $(CCVERBOSE) @@ -55,7 +54,6 @@ SMOFF += index_overflow all: $(LIBS) -lint: lintcheck pics/%.o: $(COMDIR)/%.c $(COMPILE.c) -o $@ $< diff --git a/usr/src/lib/libinetutil/amd64/Makefile b/usr/src/lib/libinetutil/amd64/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/libinetutil/amd64/Makefile +++ b/usr/src/lib/libinetutil/amd64/Makefile @@ -23,10 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libinetutil/i386/Makefile b/usr/src/lib/libinetutil/i386/Makefile index 3fb883a3f8..748553c12b 100644 --- a/usr/src/lib/libinetutil/i386/Makefile +++ b/usr/src/lib/libinetutil/i386/Makefile @@ -23,8 +23,7 @@ # Copyright (c) 2001 by Sun Microsystems, Inc. # All rights reserved. # -# ident "%Z%%M% %I% %E% SMI" -# + include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libinetutil/sparc/Makefile b/usr/src/lib/libinetutil/sparc/Makefile index 19a9e65a11..748553c12b 100644 --- a/usr/src/lib/libinetutil/sparc/Makefile +++ b/usr/src/lib/libinetutil/sparc/Makefile @@ -23,9 +23,7 @@ # Copyright (c) 2001 by Sun Microsystems, Inc. # All rights reserved. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libinetutil/sparcv9/Makefile b/usr/src/lib/libinetutil/sparcv9/Makefile index 87e9702141..b9a9d5ad47 100644 --- a/usr/src/lib/libinetutil/sparcv9/Makefile +++ b/usr/src/lib/libinetutil/sparcv9/Makefile @@ -23,10 +23,10 @@ # Copyright (c) 2001 by Sun Microsystems, Inc. # All rights reserved. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libinstzones/Makefile b/usr/src/lib/libinstzones/Makefile index 85d3363ba1..189238daad 100644 --- a/usr/src/lib/libinstzones/Makefile +++ b/usr/src/lib/libinstzones/Makefile @@ -32,7 +32,7 @@ HDRS = instzones_api.h HDRDIR = hdrs -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all @@ -40,12 +40,11 @@ install := TARGET = install clean := TARGET = clean clobber := TARGET = clobber _msg := TARGET = _msg -lint := TARGET = lint .KEEP_STATE: -all clean clobber install _msg lint: $(SUBDIRS) +all clean clobber install _msg: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libinstzones/Makefile.com b/usr/src/lib/libinstzones/Makefile.com index 2fa0b68803..5b41d4858e 100644 --- a/usr/src/lib/libinstzones/Makefile.com +++ b/usr/src/lib/libinstzones/Makefile.com @@ -29,7 +29,7 @@ LIBRARY= libinstzones.a VERS= .1 OBJECTS = \ - zones_args.o \ + zones_args.o \ zones_exec.o \ zones_locks.o \ zones_paths.o \ @@ -50,9 +50,7 @@ CLEANFILES += $(MSGFILES) # openssl forces us to ignore dubious pointer casts, thanks to its clever # use of macros for stack management. -LINTFLAGS= -umx -errtags \ -erroff=E_BAD_PTR_CAST_ALIGN,E_BAD_PTR_CAST -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-clobbered @@ -61,7 +59,7 @@ CERRWARN += -_gcc=-Wno-address # not linted SMATCH=off -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) DYNFLAGS += $(ZLAZYLOAD) @@ -79,7 +77,6 @@ $(POFILE): $(MSGFILES) _msg: $(MSGDOMAINPOFILE) -lint: lintcheck # include library targets include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libinstzones/amd64/Makefile b/usr/src/lib/libinstzones/amd64/Makefile index 5d3fa158a8..a281d41133 100644 --- a/usr/src/lib/libinstzones/amd64/Makefile +++ b/usr/src/lib/libinstzones/amd64/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libinstzones/i386/Makefile b/usr/src/lib/libinstzones/i386/Makefile index c86be4377c..d19fa69829 100644 --- a/usr/src/lib/libinstzones/i386/Makefile +++ b/usr/src/lib/libinstzones/i386/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libinstzones/sparc/Makefile b/usr/src/lib/libinstzones/sparc/Makefile index c86be4377c..d19fa69829 100644 --- a/usr/src/lib/libinstzones/sparc/Makefile +++ b/usr/src/lib/libinstzones/sparc/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libinstzones/sparcv9/Makefile b/usr/src/lib/libinstzones/sparcv9/Makefile index 5d3fa158a8..a281d41133 100644 --- a/usr/src/lib/libinstzones/sparcv9/Makefile +++ b/usr/src/lib/libinstzones/sparcv9/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libintl/Makefile b/usr/src/lib/libintl/Makefile index 6cb7a4fa8a..ef1592a4a5 100644 --- a/usr/src/lib/libintl/Makefile +++ b/usr/src/lib/libintl/Makefile @@ -36,7 +36,6 @@ install := TARGET= install all clean clobber install: $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libintl/Makefile.com b/usr/src/lib/libintl/Makefile.com index 78ac289513..74ef9c8572 100644 --- a/usr/src/lib/libintl/Makefile.com +++ b/usr/src/lib/libintl/Makefile.com @@ -28,5 +28,4 @@ VERS = .1 include $(SRC)/lib/Makefile.rootfs -LIBS += $(LINTLIB) DYNFLAGS += -F libc.so.1 diff --git a/usr/src/lib/libintl/amd64/Makefile b/usr/src/lib/libintl/amd64/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libintl/amd64/Makefile +++ b/usr/src/lib/libintl/amd64/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libintl/i386/Makefile b/usr/src/lib/libintl/i386/Makefile index 4e4e8c02a9..682e5560ca 100644 --- a/usr/src/lib/libintl/i386/Makefile +++ b/usr/src/lib/libintl/i386/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libintl/sparc/Makefile b/usr/src/lib/libintl/sparc/Makefile index 4e4e8c02a9..682e5560ca 100644 --- a/usr/src/lib/libintl/sparc/Makefile +++ b/usr/src/lib/libintl/sparc/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libintl/sparcv9/Makefile b/usr/src/lib/libintl/sparcv9/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libintl/sparcv9/Makefile +++ b/usr/src/lib/libintl/sparcv9/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libipadm/Makefile b/usr/src/lib/libipadm/Makefile index 4e407d7fc4..d0077cc3b4 100644 --- a/usr/src/lib/libipadm/Makefile +++ b/usr/src/lib/libipadm/Makefile @@ -38,11 +38,10 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libipadm/Makefile.com b/usr/src/lib/libipadm/Makefile.com index 40665eed6d..80c052fffd 100644 --- a/usr/src/lib/libipadm/Makefile.com +++ b/usr/src/lib/libipadm/Makefile.com @@ -34,12 +34,11 @@ include ../../Makefile.lib # install this library in the root filesystem include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -linetutil -lsocket -ldlpi -lnvpair -ldhcpagent \ -ldladm -lsecdb -ldhcputil SRCDIR = ../common -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-switch @@ -53,6 +52,5 @@ SMATCH=off all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libipadm/i386/Makefile b/usr/src/lib/libipadm/i386/Makefile index 4d9d4abd5b..b213f0e697 100644 --- a/usr/src/lib/libipadm/i386/Makefile +++ b/usr/src/lib/libipadm/i386/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libipadm/sparc/Makefile b/usr/src/lib/libipadm/sparc/Makefile index 8069eadad1..b8e57100de 100644 --- a/usr/src/lib/libipadm/sparc/Makefile +++ b/usr/src/lib/libipadm/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libipd/Makefile b/usr/src/lib/libipd/Makefile index feab972218..e8f7f19a17 100644 --- a/usr/src/lib/libipd/Makefile +++ b/usr/src/lib/libipd/Makefile @@ -24,13 +24,12 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) -install_h: $(ROOTHDRS) +install_h: $(ROOTHDRS) check: $(CHECKHDRS) diff --git a/usr/src/lib/libipd/Makefile.com b/usr/src/lib/libipd/Makefile.com index f118aa6cc3..b624bf2791 100644 --- a/usr/src/lib/libipd/Makefile.com +++ b/usr/src/lib/libipd/Makefile.com @@ -21,7 +21,7 @@ OBJECTS = libipd.o include ../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc CPPFLAGS += -I../common @@ -31,6 +31,5 @@ SRCDIR = ../common all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libipd/amd64/Makefile b/usr/src/lib/libipd/amd64/Makefile index 0ff7206916..73da5cf74e 100644 --- a/usr/src/lib/libipd/amd64/Makefile +++ b/usr/src/lib/libipd/amd64/Makefile @@ -16,4 +16,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libipd/i386/Makefile b/usr/src/lib/libipd/i386/Makefile index 6a668fb98f..76738e2f70 100644 --- a/usr/src/lib/libipd/i386/Makefile +++ b/usr/src/lib/libipd/i386/Makefile @@ -15,4 +15,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libipd/sparc/Makefile b/usr/src/lib/libipd/sparc/Makefile index 6a668fb98f..76738e2f70 100644 --- a/usr/src/lib/libipd/sparc/Makefile +++ b/usr/src/lib/libipd/sparc/Makefile @@ -15,4 +15,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libipd/sparcv9/Makefile b/usr/src/lib/libipd/sparcv9/Makefile index 0ff7206916..73da5cf74e 100644 --- a/usr/src/lib/libipd/sparcv9/Makefile +++ b/usr/src/lib/libipd/sparcv9/Makefile @@ -16,4 +16,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libipmi/Makefile b/usr/src/lib/libipmi/Makefile index 598fabe120..54f26362c3 100644 --- a/usr/src/lib/libipmi/Makefile +++ b/usr/src/lib/libipmi/Makefile @@ -22,13 +22,11 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# + # # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" include ../Makefile.lib @@ -43,11 +41,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libipmi/i386/Makefile b/usr/src/lib/libipmi/i386/Makefile index 741cbcaecd..2845cd3c2d 100644 --- a/usr/src/lib/libipmi/i386/Makefile +++ b/usr/src/lib/libipmi/i386/Makefile @@ -22,8 +22,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libipmi/sparc/Makefile b/usr/src/lib/libipmi/sparc/Makefile index 741cbcaecd..2845cd3c2d 100644 --- a/usr/src/lib/libipmi/sparc/Makefile +++ b/usr/src/lib/libipmi/sparc/Makefile @@ -22,8 +22,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libipmp/Makefile b/usr/src/lib/libipmp/Makefile index 5d52f304dc..d15db5b218 100644 --- a/usr/src/lib/libipmp/Makefile +++ b/usr/src/lib/libipmp/Makefile @@ -33,15 +33,14 @@ POFILE = libipmp.po MSGFILES = common/ipmp.c XGETFLAGS = -a -all := TARGET = all +all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libipmp/Makefile.com b/usr/src/lib/libipmp/Makefile.com index 99865edb1b..08b1ca5dc3 100644 --- a/usr/src/lib/libipmp/Makefile.com +++ b/usr/src/lib/libipmp/Makefile.com @@ -31,11 +31,10 @@ OBJECTS = ipmp_admin.o ipmp_query.o ipmp_mpathd.o ipmp.o include ../../Makefile.lib include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -linetutil -lsocket -lc SRCDIR = ../common -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CPPFLAGS += -D_REENTRANT -I$(SRCDIR) @@ -48,6 +47,5 @@ pics/ipmp_query.o := SMOFF = check_free all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libipmp/i386/Makefile b/usr/src/lib/libipmp/i386/Makefile index 0c05212571..7421a75150 100644 --- a/usr/src/lib/libipmp/i386/Makefile +++ b/usr/src/lib/libipmp/i386/Makefile @@ -23,9 +23,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libipmp/sparc/Makefile b/usr/src/lib/libipmp/sparc/Makefile index 0c05212571..7421a75150 100644 --- a/usr/src/lib/libipmp/sparc/Makefile +++ b/usr/src/lib/libipmp/sparc/Makefile @@ -23,9 +23,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libipp/Makefile b/usr/src/lib/libipp/Makefile index 5675f84f5f..852bf20185 100644 --- a/usr/src/lib/libipp/Makefile +++ b/usr/src/lib/libipp/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -35,15 +33,14 @@ $(BUILD64)SUBDIRS += $(MACH64) HDRS= libipp.h HDRDIR= . -all := TARGET= all +all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libipp/Makefile.com b/usr/src/lib/libipp/Makefile.com index 94a44ec24e..d48a0fa64e 100644 --- a/usr/src/lib/libipp/Makefile.com +++ b/usr/src/lib/libipp/Makefile.com @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY = libipp.a VERS = .1 @@ -33,8 +31,7 @@ OBJECTS = libipp.o # include library definitions include ../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) +LIBS = $(DYNLIB) LDLIBS += -lc -lnvpair CFLAGS += $(CCVERBOSE) @@ -44,6 +41,5 @@ CPPFLAGS += -D_REENTRANT all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libipp/i386/Makefile b/usr/src/lib/libipp/i386/Makefile index 59a6807ec4..975ee65d2b 100644 --- a/usr/src/lib/libipp/i386/Makefile +++ b/usr/src/lib/libipp/i386/Makefile @@ -23,10 +23,7 @@ # Copyright 2001-2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libipp/i386/Makefile include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libipp/sparc/Makefile b/usr/src/lib/libipp/sparc/Makefile index d3f8ae47e6..975ee65d2b 100644 --- a/usr/src/lib/libipp/sparc/Makefile +++ b/usr/src/lib/libipp/sparc/Makefile @@ -23,10 +23,7 @@ # Copyright 2001-2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libipp/sparc/Makefile include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libipsecutil/Makefile b/usr/src/lib/libipsecutil/Makefile index 465f690273..0d42ac0480 100644 --- a/usr/src/lib/libipsecutil/Makefile +++ b/usr/src/lib/libipsecutil/Makefile @@ -30,11 +30,10 @@ HDRDIR = common SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) -all := TARGET = all +all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint # # Definitions for message catalog @@ -43,7 +42,7 @@ MSGFILES = `$(GREP) -l gettext common/*.[ch]` POFILE = libipsecutil.po .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(POFILE): pofile_MSGFILES diff --git a/usr/src/lib/libipsecutil/Makefile.com b/usr/src/lib/libipsecutil/Makefile.com index 33ff1b99d4..4f0e7db2eb 100644 --- a/usr/src/lib/libipsecutil/Makefile.com +++ b/usr/src/lib/libipsecutil/Makefile.com @@ -29,16 +29,14 @@ OBJECTS = ipsec_util.o algs.o include ../../Makefile.lib -LIBS += $(DYNLIB) $(LINTLIB) +LIBS += $(DYNLIB) SRCDIR = ../common BERDIR = $(SRC)/lib/libkmf/ber_der/inc -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) LDLIBS += -ltecla -lsocket -lnsl -lc -lkmf -lkmfberder LAZYLIBS = $(ZLAZYLOAD) -ltsol $(ZNOLAZYLOAD) -lint := LAZYLIBS = -ltsol LDLIBS += $(LAZYLIBS) CFLAGS += $(CCVERBOSE) @@ -53,6 +51,5 @@ SMOFF += shift_to_zero all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libipsecutil/i386/Makefile b/usr/src/lib/libipsecutil/i386/Makefile index a1e37fa4b9..76ba53fdaa 100644 --- a/usr/src/lib/libipsecutil/i386/Makefile +++ b/usr/src/lib/libipsecutil/i386/Makefile @@ -24,4 +24,4 @@ # include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libipsecutil/sparc/Makefile b/usr/src/lib/libipsecutil/sparc/Makefile index a1e37fa4b9..76ba53fdaa 100644 --- a/usr/src/lib/libipsecutil/sparc/Makefile +++ b/usr/src/lib/libipsecutil/sparc/Makefile @@ -24,4 +24,4 @@ # include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libiscsit/Makefile b/usr/src/lib/libiscsit/Makefile index e4dc297543..85dc28ffed 100644 --- a/usr/src/lib/libiscsit/Makefile +++ b/usr/src/lib/libiscsit/Makefile @@ -32,7 +32,6 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint HDRS= libiscsit.h @@ -41,7 +40,7 @@ ROOTHDRS= $(ROOTHDRDIR)/libiscsit.h .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(ROOTHDRDIR)/%: common/% $(INS.file) diff --git a/usr/src/lib/libiscsit/Makefile.com b/usr/src/lib/libiscsit/Makefile.com index 007a52fb76..5cac35ff40 100644 --- a/usr/src/lib/libiscsit/Makefile.com +++ b/usr/src/lib/libiscsit/Makefile.com @@ -33,14 +33,13 @@ OBJECTS= $(OBJS_COMMON) $(ISCSIT_OBJS_SHARED) $(ISCSI_OBJS_SHARED) include ../../Makefile.lib -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) SRCDIR = ../common INCS += -I$(SRCDIR) CSTD= $(CSTD_GNU99) -C99LMODE= -Xc99=%all LDLIBS += -lc -lnvpair -lstmf -luuid -lscf CPPFLAGS += $(INCS) -D_REENTRANT CERRWARN += -_gcc=-Wno-parentheses @@ -48,13 +47,11 @@ CERRWARN += -_gcc=-Wno-parentheses SRCS= $(OBJS_COMMON:%.o=$(SRCDIR)/%.c) \ $(ISCSIT_OBJS_SHARED:%.o=$(SRC)/common/iscsit/%.c) \ $(ISCSI_OBJS_SHARED:%.o=$(SRC)/common/iscsi/%.c) -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) .KEEP_STATE: all: $(LIBS) -lint: lintcheck pics/%.o: ../../../common/iscsit/%.c $(COMPILE.c) -o $@ $< diff --git a/usr/src/lib/libiscsit/amd64/Makefile b/usr/src/lib/libiscsit/amd64/Makefile index 821cbc8a82..0dba37b85a 100644 --- a/usr/src/lib/libiscsit/amd64/Makefile +++ b/usr/src/lib/libiscsit/amd64/Makefile @@ -29,4 +29,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libiscsit/i386/Makefile b/usr/src/lib/libiscsit/i386/Makefile index 95a52ca13f..4f51c80a6e 100644 --- a/usr/src/lib/libiscsit/i386/Makefile +++ b/usr/src/lib/libiscsit/i386/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libiscsit/sparc/Makefile b/usr/src/lib/libiscsit/sparc/Makefile index ef68abede6..13c0a6c291 100644 --- a/usr/src/lib/libiscsit/sparc/Makefile +++ b/usr/src/lib/libiscsit/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libjedec/Makefile b/usr/src/lib/libjedec/Makefile index a2cb880270..e255fae45f 100644 --- a/usr/src/lib/libjedec/Makefile +++ b/usr/src/lib/libjedec/Makefile @@ -24,11 +24,10 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber lint: $(SUBDIRS) +all clean clobber: $(SUBDIRS) install: $(SUBDIRS) install_h diff --git a/usr/src/lib/libjedec/amd64/Makefile b/usr/src/lib/libjedec/amd64/Makefile index 22d2fd32db..72d6eb9e37 100644 --- a/usr/src/lib/libjedec/amd64/Makefile +++ b/usr/src/lib/libjedec/amd64/Makefile @@ -16,4 +16,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libjedec/i386/Makefile b/usr/src/lib/libjedec/i386/Makefile index 591d0b719d..b8f458fffb 100644 --- a/usr/src/lib/libjedec/i386/Makefile +++ b/usr/src/lib/libjedec/i386/Makefile @@ -15,4 +15,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libjedec/sparc/Makefile b/usr/src/lib/libjedec/sparc/Makefile index 591d0b719d..b8f458fffb 100644 --- a/usr/src/lib/libjedec/sparc/Makefile +++ b/usr/src/lib/libjedec/sparc/Makefile @@ -15,4 +15,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libjedec/sparcv9/Makefile b/usr/src/lib/libjedec/sparcv9/Makefile index 22d2fd32db..72d6eb9e37 100644 --- a/usr/src/lib/libjedec/sparcv9/Makefile +++ b/usr/src/lib/libjedec/sparcv9/Makefile @@ -16,4 +16,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libkmf/Makefile b/usr/src/lib/libkmf/Makefile index affc5be991..244cf752b8 100644 --- a/usr/src/lib/libkmf/Makefile +++ b/usr/src/lib/libkmf/Makefile @@ -36,12 +36,11 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint install_h := TARGET= install_h all install: install_h $(SUBDIRS) THIRDPARTYLICENSE -clean clobber lint: $(SUBDIRS) +clean clobber: $(SUBDIRS) install_h: $(ROOTHDRDIR) $(ROOTHDRS) diff --git a/usr/src/lib/libkmf/ber_der/Makefile b/usr/src/lib/libkmf/ber_der/Makefile index d81be42e84..726b7fc534 100644 --- a/usr/src/lib/libkmf/ber_der/Makefile +++ b/usr/src/lib/libkmf/ber_der/Makefile @@ -21,8 +21,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/Makefile.lib @@ -35,11 +33,10 @@ check := TARGET= check clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libkmf/ber_der/Makefile.com b/usr/src/lib/libkmf/ber_der/Makefile.com index 72576bb97e..9ea1636738 100644 --- a/usr/src/lib/libkmf/ber_der/Makefile.com +++ b/usr/src/lib/libkmf/ber_der/Makefile.com @@ -38,9 +38,8 @@ include $(SRC)/lib/Makefile.rootfs SRCDIR= ../common INCDIR= ../inc -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) -xCC CFLAGS64 += $(CCVERBOSE) -xCC @@ -59,6 +58,5 @@ SMATCH=off all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libkmf/libkmf/Makefile b/usr/src/lib/libkmf/libkmf/Makefile index ebc53eefb3..284daac9fa 100644 --- a/usr/src/lib/libkmf/libkmf/Makefile +++ b/usr/src/lib/libkmf/libkmf/Makefile @@ -21,9 +21,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libkmf/libkmf/Makefile include $(SRC)/lib/Makefile.lib @@ -36,11 +33,10 @@ check := TARGET= check clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libkmf/mappers/Makefile b/usr/src/lib/libkmf/mappers/Makefile index fc05374b03..1c9534f993 100644 --- a/usr/src/lib/libkmf/mappers/Makefile +++ b/usr/src/lib/libkmf/mappers/Makefile @@ -33,9 +33,8 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libkmf/mappers/kmf_mapper_cn/Makefile b/usr/src/lib/libkmf/mappers/kmf_mapper_cn/Makefile index def3eb4fa7..6940a580be 100644 --- a/usr/src/lib/libkmf/mappers/kmf_mapper_cn/Makefile +++ b/usr/src/lib/libkmf/mappers/kmf_mapper_cn/Makefile @@ -33,11 +33,10 @@ check := TARGET= check clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libkmf/mappers/kmf_mapper_cn/Makefile.com b/usr/src/lib/libkmf/mappers/kmf_mapper_cn/Makefile.com index 17ec57c991..9e95a8981d 100644 --- a/usr/src/lib/libkmf/mappers/kmf_mapper_cn/Makefile.com +++ b/usr/src/lib/libkmf/mappers/kmf_mapper_cn/Makefile.com @@ -40,7 +40,6 @@ SRCS = $(OBJECTS:%.o=$(SRCDIR)/%.c) CFLAGS += $(CCVERBOSE) CPPFLAGS += -I../../../include -I$(INCDIR) -LINTFLAGS64 += -errchk=longptr64 PICS = $(OBJECTS:%=pics/%) @@ -53,9 +52,8 @@ ROOTLIBDIR64 = $(ROOTFS_LIBDIR)/crypto/$(MACH64) LIBS = $(DYNLIB) -all: $(LIBS) $(LINTLIB) +all: $(LIBS) -lint: lintcheck FRC: diff --git a/usr/src/lib/libkmf/plugins/Makefile b/usr/src/lib/libkmf/plugins/Makefile index 5b27f7e6da..7b288d65ac 100644 --- a/usr/src/lib/libkmf/plugins/Makefile +++ b/usr/src/lib/libkmf/plugins/Makefile @@ -21,7 +21,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # KMF Prototype Makefile # @@ -36,9 +36,8 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libkmf/plugins/kmf_nss/Makefile b/usr/src/lib/libkmf/plugins/kmf_nss/Makefile index 5c60729ece..130c1e2af4 100644 --- a/usr/src/lib/libkmf/plugins/kmf_nss/Makefile +++ b/usr/src/lib/libkmf/plugins/kmf_nss/Makefile @@ -21,8 +21,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/Makefile.lib @@ -35,11 +33,10 @@ check := TARGET= check clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com index 4a7fbbc270..0dc1ca1389 100644 --- a/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com +++ b/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com @@ -51,8 +51,6 @@ CPPFLAGS += -D_REENTRANT $(KMFINC) $(NSSINC) \ PICS= $(OBJECTS:%=pics/%) -LINTFLAGS += -erroff=E_STATIC_UNUSED -LINTFLAGS64 += -erroff=E_STATIC_UNUSED CERRWARN += -_gcc=-Wno-unused-label CERRWARN += -_gcc=-Wno-unused-value @@ -61,9 +59,6 @@ CERRWARN += $(CNOWARN_UNINIT) # not linted SMATCH=off -lint:= NSSLIBS = $(BERLIB) -lint:= NSSLIBS64 = $(BERLIB64) - LDLIBS32 += $(NSSLIBS) LIBS = $(DYNLIB) @@ -73,9 +68,8 @@ ROOTLIBDIR64= $(ROOTFS_LIBDIR)/crypto/$(MACH64) .KEEP_STATE: -all: $(LIBS) $(LINTLIB) +all: $(LIBS) -lint: lintcheck FRC: diff --git a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile index ba73e41d2e..0de4bac843 100644 --- a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile +++ b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile @@ -21,8 +21,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/Makefile.lib @@ -34,11 +32,10 @@ check := TARGET= check clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile b/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile index b65a323ef5..130c1e2af4 100644 --- a/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile +++ b/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile @@ -21,8 +21,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# + include $(SRC)/lib/Makefile.lib SUBDIRS= $(MACH) @@ -34,11 +33,10 @@ check := TARGET= check clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com index d8bdbec7f7..31c367be63 100644 --- a/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com +++ b/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com @@ -50,7 +50,6 @@ SRCS = \ CFLAGS += $(CCVERBOSE) CPPFLAGS += -D_REENTRANT $(KMFINC) -I$(INCDIR) \ -I$(ADJUNCT_PROTO)/usr/include/libxml2 -I$(BIGNUMDIR) -LINTFLAGS64 += -errchk=longptr64 CERRWARN += -_gcc=-Wno-unused-label @@ -68,9 +67,8 @@ ROOTLIBDIR64= $(ROOTFS_LIBDIR)/crypto/$(MACH64) LIBS = $(DYNLIB) -all: $(LIBS) $(LINTLIB) +all: $(LIBS) -lint: lintcheck FRC: diff --git a/usr/src/lib/libkstat/Makefile b/usr/src/lib/libkstat/Makefile index c47983f30a..bcd94996c4 100644 --- a/usr/src/lib/libkstat/Makefile +++ b/usr/src/lib/libkstat/Makefile @@ -35,11 +35,10 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg package := TARGET= package -LIBRARY= libkstat.a +LIBRARY= libkstat.a TEXT_DOMAIN= SUNW_OST_OSLIB XGETFLAGS= -a POFILE= $(LIBRARY:.a=.po) @@ -50,7 +49,7 @@ GREP= grep .KEEP_STATE: -all clean clobber delete install lint package: $(SUBDIRS) +all clean clobber delete install package: $(SUBDIRS) # definitions for install_h target HDRS= kstat.h diff --git a/usr/src/lib/libkstat/Makefile.com b/usr/src/lib/libkstat/Makefile.com index aacfa928bf..6e9d04bb6e 100644 --- a/usr/src/lib/libkstat/Makefile.com +++ b/usr/src/lib/libkstat/Makefile.com @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY= libkstat.a VERS= .1 @@ -38,9 +36,7 @@ include ../../Makefile.rootfs SRCDIR = ../common -LIBS = $(DYNLIB) $(LINTLIB) - -LINTSRC= $(LINTLIB:%.ln=%) +LIBS = $(DYNLIB) CPPFLAGS += -I.. CFLAGS += $(CCVERBOSE) @@ -48,7 +44,6 @@ LDLIBS += -lc .KEEP_STATE: -lint: lintcheck # include library targets include ../../Makefile.targ @@ -58,7 +53,3 @@ pics/%.o: ../common/%.c $(POST_PROCESS_O) pics/kstat.o: ../kstat.h - -# install rule for lint library target -$(ROOTLINTDIR)/%: ../common/% - $(INS.file) diff --git a/usr/src/lib/libkstat/amd64/Makefile b/usr/src/lib/libkstat/amd64/Makefile index d50a21bdb0..01c18f35a7 100644 --- a/usr/src/lib/libkstat/amd64/Makefile +++ b/usr/src/lib/libkstat/amd64/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -32,4 +32,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libkstat/i386/Makefile b/usr/src/lib/libkstat/i386/Makefile index 2a944b0b43..8537c30eda 100644 --- a/usr/src/lib/libkstat/i386/Makefile +++ b/usr/src/lib/libkstat/i386/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -31,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libkstat/sparc/Makefile b/usr/src/lib/libkstat/sparc/Makefile index 2a944b0b43..8537c30eda 100644 --- a/usr/src/lib/libkstat/sparc/Makefile +++ b/usr/src/lib/libkstat/sparc/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -31,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libkstat/sparcv9/Makefile b/usr/src/lib/libkstat/sparcv9/Makefile index d50a21bdb0..01c18f35a7 100644 --- a/usr/src/lib/libkstat/sparcv9/Makefile +++ b/usr/src/lib/libkstat/sparcv9/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -32,4 +32,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libkvm/Makefile b/usr/src/lib/libkvm/Makefile index b4629602bf..4118b2516d 100644 --- a/usr/src/lib/libkvm/Makefile +++ b/usr/src/lib/libkvm/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -37,12 +35,11 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint test := TARGET= test .KEEP_STATE: -all install clean clobber lint test: $(SUBDIRS) +all install clean clobber test: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libkvm/Makefile.com b/usr/src/lib/libkvm/Makefile.com index b89bde5d03..fc36e58925 100644 --- a/usr/src/lib/libkvm/Makefile.com +++ b/usr/src/lib/libkvm/Makefile.com @@ -34,11 +34,7 @@ include ../../Makefile.lib SRCDIR = ../common -LIBS = $(DYNLIB) $(LINTLIB) - -$(LINTLIB):= SRCS=../common/llib-lkvm - -LINTSRC= $(LINTLIB:%.ln=%) +LIBS = $(DYNLIB) CFLAGS += $(CCVERBOSE) DYNFLAGS32 += -Wl,-f,/usr/platform/\$$PLATFORM/lib/$(DYNLIBPSR) @@ -55,7 +51,6 @@ CLOBBERFILES += test test.o .KEEP_STATE: -lint: lintcheck test: ../common/test.c $(COMPILE.c) ../common/test.c @@ -67,7 +62,3 @@ include ../../Makefile.targ objs/%.o pics/%.o: ../common/%.c ../kvm.h $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) - -# install rule for lint library target -$(ROOTLINTDIR)/%: ../common/% - $(INS.file) diff --git a/usr/src/lib/libkvm/amd64/Makefile b/usr/src/lib/libkvm/amd64/Makefile index 634b49163c..ca9e151394 100644 --- a/usr/src/lib/libkvm/amd64/Makefile +++ b/usr/src/lib/libkvm/amd64/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 @@ -34,4 +32,4 @@ DYNFLAGS += $(DYNFLAGS64) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libkvm/i386/Makefile b/usr/src/lib/libkvm/i386/Makefile index 6768df622e..93f4c54e6a 100644 --- a/usr/src/lib/libkvm/i386/Makefile +++ b/usr/src/lib/libkvm/i386/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -33,4 +31,4 @@ DYNFLAGS += $(DYNFLAGS32) all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libkvm/sparc/Makefile b/usr/src/lib/libkvm/sparc/Makefile index 6768df622e..93f4c54e6a 100644 --- a/usr/src/lib/libkvm/sparc/Makefile +++ b/usr/src/lib/libkvm/sparc/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -33,4 +31,4 @@ DYNFLAGS += $(DYNFLAGS32) all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libkvm/sparcv9/Makefile b/usr/src/lib/libkvm/sparcv9/Makefile index 634b49163c..ca9e151394 100644 --- a/usr/src/lib/libkvm/sparcv9/Makefile +++ b/usr/src/lib/libkvm/sparcv9/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 @@ -34,4 +32,4 @@ DYNFLAGS += $(DYNFLAGS64) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libldap5/Makefile b/usr/src/lib/libldap5/Makefile index e5de491a1f..6b31341a04 100644 --- a/usr/src/lib/libldap5/Makefile +++ b/usr/src/lib/libldap5/Makefile @@ -32,7 +32,6 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg LIBRARY= libldap.a @@ -47,10 +46,6 @@ all clean install: $(SUBDIRS) clobber: $(SUBDIRS) $(RM) $(CLOBBERFILES) -lint: - @ $(ECHO) "usr/src/lib/libldap5 is third-party code that" - @ $(ECHO) "will never be made lint-clean: skipping" - # install rule for install_h target $(ROOTHDRDIR)/%: % $(INS.file) diff --git a/usr/src/lib/libldap5/Makefile.com b/usr/src/lib/libldap5/Makefile.com index d7da0b4f09..80f9ba0ae2 100644 --- a/usr/src/lib/libldap5/Makefile.com +++ b/usr/src/lib/libldap5/Makefile.com @@ -30,7 +30,7 @@ VERS= .5 # Definition of all the objects macros # The LDAP specific objects -BEROBJS= bprint.o decode.o encode.o io.o +BEROBJS= bprint.o decode.o encode.o io.o LDAPOBJS= abandon.o add.o bind.o cache.o charray.o \ charset.o compare.o compat.o control.o countvalues.o \ @@ -60,7 +60,7 @@ include ../../Makefile.lib NSS_LIBS= -lnspr4 -lplc4 -lnss3 -lssl3 NSS_HDRS= $(ADJUNCT_PROTO)/usr/include/mps NSS_LDPATH= /usr/lib/mps -NSS_LDPATH64= $(NSS_LDPATH)/64 +NSS_LDPATH64= $(NSS_LDPATH)/64 LDAP_FLAGS= -DSVR4 -DSYSV -D__svr4 -D__svr4__ -DSOLARIS \ @@ -81,26 +81,11 @@ SRCS= $(BEROBJS:%.o=../sources/ldap/ber/%.c) \ $(PRLDAPOBJS:%.o=../sources/ldap/prldap/%.c) \ $(UTILOBJS:%.o=../sources/ldap/util/%.c) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) DYNFLAGS += $(ZNODELETE) CPPFLAGS= $(COM_INC) $(CPPFLAGS.master) -# definitions for lint - -$(LINTLIB):= SRCS=../sources/ldap/common/llib-lldap -$(LINTLIB):= LINTFLAGS=-nvx -$(LINTLIB):= TARGET_ARCH= - -LINTOUT= lint.out - -LINTSRC= $(LINTLIB:%.ln=%) -ROOTLINTDIR= $(ROOTLIBDIR) -ROOTLINT= $(LINTSRC:%=$(ROOTLINTDIR)/%) - - -CLEANFILES += $(LINTOUT) $(LINTLIB) - # Local Libldap definitions LOCFLAGS += $(XSTRCONST) -D_REENTRANT @@ -150,7 +135,3 @@ pics/%.o: ../sources/ldap/prldap/%.c pics/%.o: ../sources/ldap/util/%.c $(COMPILE.c) $(LDAP_FLAGS) $(COM_INC) -w -o $@ $< $(POST_PROCESS_O) - -# install rule for lint library target -$(ROOTLINTDIR)/%: ../sources/ldap/common/% - $(INS.file) diff --git a/usr/src/lib/libldap5/i386/Makefile b/usr/src/lib/libldap5/i386/Makefile index 500155684a..bb427431d1 100644 --- a/usr/src/lib/libldap5/i386/Makefile +++ b/usr/src/lib/libldap5/i386/Makefile @@ -14,6 +14,6 @@ DYNFLAGS += -R$(NSS_LDPATH) all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) FRC: diff --git a/usr/src/lib/libldap5/sparc/Makefile b/usr/src/lib/libldap5/sparc/Makefile index b650c81920..d15f2dd969 100644 --- a/usr/src/lib/libldap5/sparc/Makefile +++ b/usr/src/lib/libldap5/sparc/Makefile @@ -15,4 +15,4 @@ DYNFLAGS += -R$(NSS_LDPATH) all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/liblgrp/Makefile b/usr/src/lib/liblgrp/Makefile index bb2e2dda77..c467a48622 100644 --- a/usr/src/lib/liblgrp/Makefile +++ b/usr/src/lib/liblgrp/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -31,22 +29,21 @@ SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) # conditional assignments -all := TARGET= all +all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint test := TARGET= test # definitions for install_h target -HDRS= +HDRS= ROOTHDRDIR= $(ROOT)/usr/include/sys ROOTHDRS= $(HDRS:%=$(ROOTHDRDIR)/%) CHECKHDRS= $(HDRS:%.h=%.check) .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) # install rule for install_h target diff --git a/usr/src/lib/liblgrp/Makefile.com b/usr/src/lib/liblgrp/Makefile.com index b19521f398..08d62b5ec2 100644 --- a/usr/src/lib/liblgrp/Makefile.com +++ b/usr/src/lib/liblgrp/Makefile.com @@ -22,8 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY= liblgrp.a VERS= .1 @@ -35,20 +33,14 @@ include ../../Makefile.lib SRCDIR= ../common -LIBS = $(DYNLIB) $(LINTLIB) - -LINTSRC = $(LINTLIB:%.ln=%) +LIBS = $(DYNLIB) CFLAGS += $(CCVERBOSE) LDLIBS += -lc -$(LINTLIB) := SRCS = ../common/llib-llgrp - .KEEP_STATE: all : $(LIBS) -lint : lintcheck - # include library targets include ../../Makefile.targ diff --git a/usr/src/lib/liblgrp/i386/Makefile b/usr/src/lib/liblgrp/i386/Makefile index 572078e11d..e9b9787650 100644 --- a/usr/src/lib/liblgrp/i386/Makefile +++ b/usr/src/lib/liblgrp/i386/Makefile @@ -23,8 +23,6 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -32,4 +30,4 @@ all: $(LIBS) .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/liblgrp/sparc/Makefile b/usr/src/lib/liblgrp/sparc/Makefile index b459d5bbab..a34e785c23 100644 --- a/usr/src/lib/liblgrp/sparc/Makefile +++ b/usr/src/lib/liblgrp/sparc/Makefile @@ -23,8 +23,6 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -32,4 +30,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/liblgrp/sparcv9/Makefile b/usr/src/lib/liblgrp/sparcv9/Makefile index b7d6e41b37..d8a750f524 100644 --- a/usr/src/lib/liblgrp/sparcv9/Makefile +++ b/usr/src/lib/liblgrp/sparcv9/Makefile @@ -23,8 +23,6 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 @@ -33,4 +31,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/liblm/Makefile b/usr/src/lib/liblm/Makefile index 5271fa9189..f4d4e770ca 100644 --- a/usr/src/lib/liblm/Makefile +++ b/usr/src/lib/liblm/Makefile @@ -34,11 +34,10 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg package := TARGET= package -LIBRARY= liblm.a +LIBRARY= liblm.a TEXT_DOMAIN= SUNW_OST_OSLIB XGETFLAGS= -a POFILE= $(LIBRARY:.a=.po) @@ -49,7 +48,7 @@ GREP= grep .KEEP_STATE: -all clean clobber delete install lint package: $(SUBDIRS) +all clean clobber delete install package: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/liblm/Makefile.com b/usr/src/lib/liblm/Makefile.com index 2dd2f08bb7..1aa0de3b96 100644 --- a/usr/src/lib/liblm/Makefile.com +++ b/usr/src/lib/liblm/Makefile.com @@ -22,8 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY= liblm.a VERS= .1 @@ -46,7 +44,6 @@ LDLIBS += -lc all: $(LIBS) -lint: lintcheck # include library targets include ../../Makefile.targ diff --git a/usr/src/lib/libm/Makefile b/usr/src/lib/libm/Makefile index 99e533aca2..ede79030eb 100644 --- a/usr/src/lib/libm/Makefile +++ b/usr/src/lib/libm/Makefile @@ -19,20 +19,19 @@ VERS= .2 # include common library definitions include $(SRC)/lib/Makefile.lib -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint .KEEP_STATE: .PARALLEL: $(SUBDIRS) -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; VERSION='$(VERSION)' $(MAKE) $(TARGET) diff --git a/usr/src/lib/libm/Makefile.com b/usr/src/lib/libm/Makefile.com index 804d12f1e2..217d7a360a 100644 --- a/usr/src/lib/libm/Makefile.com +++ b/usr/src/lib/libm/Makefile.com @@ -390,7 +390,7 @@ ROBJS = \ # LSARC/2003/658 adds isnanf/isnanl # -SOBJS_sparc = \ +SOBJS_sparc = \ copysign.o \ exp.o \ fabs.o \ @@ -496,20 +496,11 @@ complexOBJS = \ OBJECTS = $(COBJS) $(ROBJS) $(QOBJS) $(SOBJS) $(m9xOBJS) $(complexOBJS) include $(SRC)/lib/Makefile.lib -include $(LIBMDIR)/Makefile.libm.com +include $(LIBMDIR)/Makefile.libm.com include $(SRC)/lib/Makefile.rootfs SRCDIR = ../common/ -LIBS = $(DYNLIB) $(LINTLIB) - -LINTERROFF = -erroff=E_FUNC_SET_NOT_USED -LINTERROFF += -erroff=E_FUNC_RET_ALWAYS_IGNOR2 -LINTERROFF += -erroff=E_FUNC_RET_MAYBE_IGNORED2 -LINTERROFF += -erroff=E_IMPL_CONV_RETURN -LINTERROFF += -erroff=E_NAME_MULTIPLY_DEF2 -LINTFLAGS += $(LINTERROFF) -LINTFLAGS64 += $(LINTERROFF) -LINTFLAGS64 += -errchk=longptr64 +LIBS = $(DYNLIB) CFLAGS += $(C_BIGPICFLAGS) CFLAGS64 += $(C_BIGPICFLAGS) @@ -928,7 +919,7 @@ SRCS_C_sparc = \ ../common/C/sincos.c \ ../common/C/tan.c -SRCS_i386_i386 = \ +SRCS_i386_i386 = \ ../common/C/__libx_errno.c SRCS_sparc_sparc = \ @@ -1023,5 +1014,4 @@ SRCS = \ all: $(LIBS) -lint: lintcheck diff --git a/usr/src/lib/libm/Makefile.libm.com b/usr/src/lib/libm/Makefile.libm.com index dc7a353d97..5d404bd423 100644 --- a/usr/src/lib/libm/Makefile.libm.com +++ b/usr/src/lib/libm/Makefile.libm.com @@ -68,11 +68,10 @@ CFLAGS64 += -_gcc=-fno-strict-overflow CFLAGS += -_smatch=off CFLAGS64 += -_smatch=off -$(DYNLIB) := LDLIBS += -lc +$(DYNLIB) := LDLIBS += -lc -$(LINTLIB) := SRCS = $(LIBMSRC)/$(LINTSRC) -CLEANFILES += pics/*.s pics/*.S +CLEANFILES += pics/*.s pics/*.S FPDEF_amd64 = -DARCH_amd64 FPDEF_sparc = -DCG89 -DARCH_v8plus -DFPADD_TRAPS_INCOMPLETE_ON_NAN @@ -89,7 +88,7 @@ XARCH = $(XARCH_$(TARGET_ARCH)) ASOPT_sparc = -xarch=$(XARCH) $(AS_PICFLAGS) ASOPT_sparcv9 = -xarch=$(XARCH) $(AS_PICFLAGS) -ASOPT_i386 = +ASOPT_i386 = ASOPT_amd64 = -xarch=$(XARCH) $(AS_PICFLAGS) ASOPT = $(ASOPT_$(TARGET_ARCH)) diff --git a/usr/src/lib/libm/amd64/Makefile b/usr/src/lib/libm/amd64/Makefile index c67cf5c91d..2e245b6732 100644 --- a/usr/src/lib/libm/amd64/Makefile +++ b/usr/src/lib/libm/amd64/Makefile @@ -17,6 +17,6 @@ TARGET_ARCH= amd64 include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ diff --git a/usr/src/lib/libm/i386/Makefile b/usr/src/lib/libm/i386/Makefile index 0a710fb63a..89754fc049 100644 --- a/usr/src/lib/libm/i386/Makefile +++ b/usr/src/lib/libm/i386/Makefile @@ -23,6 +23,6 @@ include ../Makefile.com CFLAGS += -_gcc=-ffloat-store $(OBJS_M9XSSE) := CFLAGS += -xarch=sse2 -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/lib/libm/sparc/Makefile b/usr/src/lib/libm/sparc/Makefile index ddb6f2cc98..5c5fc318b8 100644 --- a/usr/src/lib/libm/sparc/Makefile +++ b/usr/src/lib/libm/sparc/Makefile @@ -18,6 +18,6 @@ include ../Makefile.com CHIP = ultra -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/lib/libm/sparcv9/Makefile b/usr/src/lib/libm/sparcv9/Makefile index 91181acd63..ec82c4d735 100644 --- a/usr/src/lib/libm/sparcv9/Makefile +++ b/usr/src/lib/libm/sparcv9/Makefile @@ -20,6 +20,6 @@ include $(SRC)/lib/Makefile.lib.64 CHIP = ultra -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ diff --git a/usr/src/lib/libm1/Makefile b/usr/src/lib/libm1/Makefile index cb351e34cb..28518c2175 100644 --- a/usr/src/lib/libm1/Makefile +++ b/usr/src/lib/libm1/Makefile @@ -19,20 +19,19 @@ VERS= .1 # include common library definitions include $(SRC)/lib/Makefile.lib -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint .KEEP_STATE: .PARALLEL: $(SUBDIRS) -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; VERSION='$(VERSION)' $(MAKE) $(TARGET) diff --git a/usr/src/lib/libm1/Makefile.com b/usr/src/lib/libm1/Makefile.com index c97b92c957..5672bea95b 100644 --- a/usr/src/lib/libm1/Makefile.com +++ b/usr/src/lib/libm1/Makefile.com @@ -14,8 +14,8 @@ # -LIBRARY = libm.a -VERS = .1 +LIBRARY = libm.a +VERS = .1 LIBMDIR = $(SRC)/lib/libm @@ -23,19 +23,19 @@ OBJECTS = libmv1.o include $(SRC)/lib/Makefile.lib include $(SRC)/lib/Makefile.rootfs -include $(LIBMDIR)/Makefile.libm.com +include $(LIBMDIR)/Makefile.libm.com -LIBS = $(DYNLIB) +LIBS = $(DYNLIB) SRCS = $(OBJECTS:%.o=../common/%.c) SRCDIR = ../common/ CPPFLAGS += -DLIBM_BUILD MAPFILEDIR = ../common/ -DYNFLAGS += -zignore -Wl,-F'libm.so.2' -LINTFLAGS64 += -errchk=longptr64 +DYNFLAGS += -zignore -Wl,-F'libm.so.2' + +COMPATLINKS = usr/lib/$(DYNLIB) +COMPATLINKS64 = usr/lib/$(MACH64)/$(DYNLIB) .KEEP_STATE: all: $(LIBS) - -lint: lintcheck diff --git a/usr/src/lib/libm1/amd64/Makefile b/usr/src/lib/libm1/amd64/Makefile index 21fab0dd1c..00367a883c 100644 --- a/usr/src/lib/libm1/amd64/Makefile +++ b/usr/src/lib/libm1/amd64/Makefile @@ -18,6 +18,6 @@ TARGET_ARCH= amd64 include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBS64) +install: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libm1/i386/Makefile b/usr/src/lib/libm1/i386/Makefile index 3d2c71860a..3b1f60dcde 100644 --- a/usr/src/lib/libm1/i386/Makefile +++ b/usr/src/lib/libm1/i386/Makefile @@ -16,6 +16,6 @@ TARGET_ARCH= i386 include ../Makefile.com -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libm1/sparc/Makefile b/usr/src/lib/libm1/sparc/Makefile index 686bb12ef2..867aeaa331 100644 --- a/usr/src/lib/libm1/sparc/Makefile +++ b/usr/src/lib/libm1/sparc/Makefile @@ -17,6 +17,6 @@ TARGET_ARCH= sparc include ../Makefile.com -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libm1/sparcv9/Makefile b/usr/src/lib/libm1/sparcv9/Makefile index 4899efe7b7..cf688d8ba6 100644 --- a/usr/src/lib/libm1/sparcv9/Makefile +++ b/usr/src/lib/libm1/sparcv9/Makefile @@ -18,6 +18,6 @@ TARGET_ARCH= sparcv9 include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBS64) +install: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libmail/Makefile b/usr/src/lib/libmail/Makefile index cc83d1296c..b1f249b754 100644 --- a/usr/src/lib/libmail/Makefile +++ b/usr/src/lib/libmail/Makefile @@ -34,11 +34,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg package := TARGET= package -LIBRARY= libmail.a +LIBRARY= libmail.a TEXT_DOMAIN= SUNW_OST_OSLIB XGETFLAGS= -a POFILE= $(LIBRARY:.a=.po) @@ -48,7 +47,7 @@ SED= sed .KEEP_STATE: -all clean clobber install lint package: $(SUBDIRS) +all clean clobber install package: $(SUBDIRS) # definitions for install_h target HDRS= maillock.h libmail.h s_string.h diff --git a/usr/src/lib/libmail/Makefile.com b/usr/src/lib/libmail/Makefile.com index 4c384da5c2..5358c12bf8 100644 --- a/usr/src/lib/libmail/Makefile.com +++ b/usr/src/lib/libmail/Makefile.com @@ -22,16 +22,14 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY= libmail.a VERS= .1 -OBJECTS= abspath.o casncmp.o copystream.o delempty.o \ +OBJECTS= abspath.o casncmp.o copystream.o delempty.o \ getdomain.o maillock.o notifyu.o popenvp.o \ s_string.o setup_exec.o strmove.o skipspace.o \ - substr.o systemvp.o trimnl.o xgetenv.o + substr.o systemvp.o trimnl.o xgetenv.o include ../../Makefile.lib @@ -39,11 +37,7 @@ SRCDIR = ../common MAPFILES += $(MAPFILE32) -LIBS = $(DYNLIB) $(LINTLIB) - -$(LINTLIB):= SRCS = ../common/llib-lmail - -LINTSRC= $(LINTLIB:%.ln=%) +LIBS = $(DYNLIB) CPPFLAGS = -I../inc -I../../common/inc $(CPPFLAGS.master) CFLAGS += $(CCVERBOSE) @@ -53,7 +47,6 @@ LDLIBS += -lc all: $(LIBS) -lint: lintcheck include ../../Makefile.targ @@ -62,11 +55,3 @@ pics/%.o: ../common/%.c $(POST_PROCESS_O) pics/%.o: ../inc/%.h - -# install rule for lint library target -$(ROOTLINTDIR)/%: ../common/% - $(INS.file) - -# install rule for 64 bit lint library target -$(ROOTLINTDIR64)/%: ../common/% - $(INS.file) diff --git a/usr/src/lib/libmail/i386/Makefile b/usr/src/lib/libmail/i386/Makefile index b2ea017616..fe215697a5 100644 --- a/usr/src/lib/libmail/i386/Makefile +++ b/usr/src/lib/libmail/i386/Makefile @@ -24,4 +24,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libmail/sparc/Makefile b/usr/src/lib/libmail/sparc/Makefile index b2ea017616..fe215697a5 100644 --- a/usr/src/lib/libmail/sparc/Makefile +++ b/usr/src/lib/libmail/sparc/Makefile @@ -24,4 +24,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libmalloc/Makefile b/usr/src/lib/libmalloc/Makefile index 6918eb42d4..ed60dde730 100644 --- a/usr/src/lib/libmalloc/Makefile +++ b/usr/src/lib/libmalloc/Makefile @@ -34,11 +34,10 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg package := TARGET= package -LIBRARY= libmalloc.a +LIBRARY= libmalloc.a TEXT_DOMAIN= SUNW_OST_OSLIB XGETFLAGS= -a POFILE= $(LIBRARY:.a=.po) @@ -49,7 +48,7 @@ GREP= grep .KEEP_STATE: -all clean clobber delete install lint package: $(SUBDIRS) +all clean clobber delete install package: $(SUBDIRS) # definitions for install_h target HDRS= ../common/mallint.h diff --git a/usr/src/lib/libmalloc/Makefile.com b/usr/src/lib/libmalloc/Makefile.com index a32dbd13e0..f7f9942f8d 100644 --- a/usr/src/lib/libmalloc/Makefile.com +++ b/usr/src/lib/libmalloc/Makefile.com @@ -22,33 +22,34 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY= libmalloc.a VERS= .1 -OBJECTS= malloc.o +OBJECTS= malloc.o # include library definitions include ../../Makefile.lib SRCDIR = ../common -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) -LINTSRC= $(LINTLIB:%.ln=%) -LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN -LINTFLAGS64 += -erroff=E_BAD_PTR_CAST_ALIGN CFLAGS += $(CCVERBOSE) CPPFLAGS += -I../../common/inc -D_REENTRANT DYNFLAGS += $(ZINTERPOSE) LDLIBS += -lc +COMPATLINKS= usr/ccs/lib/libmalloc.so +COMPATLINKS64= usr/ccs/lib/$(MACH64)/libmalloc.so + +$(ROOT)/usr/ccs/lib/libmalloc.so := COMPATLINKTARGET=../../lib/libmalloc.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libmalloc.so:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/libmalloc.so.1 + .KEEP_STATE: -lint: lintcheck # include library targets include ../../Makefile.targ @@ -56,7 +57,3 @@ include ../../Makefile.targ pics/%.o: ../common/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) - -# install rule for lint library target -$(ROOTLINTDIR)/%: ../common/% - $(INS.file) diff --git a/usr/src/lib/libmalloc/amd64/Makefile b/usr/src/lib/libmalloc/amd64/Makefile index d50a21bdb0..01c18f35a7 100644 --- a/usr/src/lib/libmalloc/amd64/Makefile +++ b/usr/src/lib/libmalloc/amd64/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -32,4 +32,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libmalloc/i386/Makefile b/usr/src/lib/libmalloc/i386/Makefile index 87b5005f59..3d6e266f97 100644 --- a/usr/src/lib/libmalloc/i386/Makefile +++ b/usr/src/lib/libmalloc/i386/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -31,4 +29,5 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libmalloc/sparc/Makefile b/usr/src/lib/libmalloc/sparc/Makefile index 87b5005f59..3d6e266f97 100644 --- a/usr/src/lib/libmalloc/sparc/Makefile +++ b/usr/src/lib/libmalloc/sparc/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -31,4 +29,5 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libmalloc/sparcv9/Makefile b/usr/src/lib/libmalloc/sparcv9/Makefile index d50a21bdb0..01c18f35a7 100644 --- a/usr/src/lib/libmalloc/sparcv9/Makefile +++ b/usr/src/lib/libmalloc/sparcv9/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -32,4 +32,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libmapid/Makefile b/usr/src/lib/libmapid/Makefile index 77403556e8..f96a48a22b 100644 --- a/usr/src/lib/libmapid/Makefile +++ b/usr/src/lib/libmapid/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/Makefile.lib @@ -36,11 +34,10 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber lint install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libmapid/Makefile.com b/usr/src/lib/libmapid/Makefile.com index 3384c98518..4e1f79bb11 100644 --- a/usr/src/lib/libmapid/Makefile.com +++ b/usr/src/lib/libmapid/Makefile.com @@ -33,7 +33,7 @@ OBJECTS = $(LIBOBJS) $(OTHOBJS) include $(SRC)/lib/Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) # # This library will be installed w/all other nfs @@ -46,8 +46,6 @@ ROOTLIBDIR = $(ROOT)/usr/lib/nfs # SRCDIR = ../common LIBSRCS = $(LIBOBJS:%.o=$(SRCDIR)/%.c) -$(LINTLIB) := SRCS = $(LINTSRC:%=$(SRCDIR)/%) -lintcheck := SRCS = $(LIBSRCS) LDLIBS += -lresolv -lc -lscf @@ -66,7 +64,6 @@ all: $(LIBS) install: $(ROOTLIBDIR) all -lint: $(LINTLIB) lintcheck pics/%.o: $(SMF_DIR)/%.c $(COMPILE.c) -o $@ $< diff --git a/usr/src/lib/libmapid/i386/Makefile b/usr/src/lib/libmapid/i386/Makefile index 978c1eba69..3dadaa46b2 100644 --- a/usr/src/lib/libmapid/i386/Makefile +++ b/usr/src/lib/libmapid/i386/Makefile @@ -22,10 +22,8 @@ # Copyright 2006 Sun Microsystems, Inc. # All rights reserved. Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libmapid/sparc/Makefile b/usr/src/lib/libmapid/sparc/Makefile index 978c1eba69..585562da16 100644 --- a/usr/src/lib/libmapid/sparc/Makefile +++ b/usr/src/lib/libmapid/sparc/Makefile @@ -22,10 +22,9 @@ # Copyright 2006 Sun Microsystems, Inc. # All rights reserved. Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# + include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libmapmalloc/Makefile b/usr/src/lib/libmapmalloc/Makefile index 4493f15bae..def5e11d9f 100644 --- a/usr/src/lib/libmapmalloc/Makefile +++ b/usr/src/lib/libmapmalloc/Makefile @@ -35,11 +35,10 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg package := TARGET= package -LIBRARY= libmapmalloc.a +LIBRARY= libmapmalloc.a TEXT_DOMAIN= SUNW_OST_OSLIB XGETFLAGS= -a POFILE= $(LIBRARY:.a=.po) @@ -50,7 +49,7 @@ GREP= grep .KEEP_STATE: -all clean clobber delete install lint package: $(SUBDIRS) +all clean clobber delete install package: $(SUBDIRS) # definitions for install_h target HDRS= diff --git a/usr/src/lib/libmapmalloc/Makefile.com b/usr/src/lib/libmapmalloc/Makefile.com index 0f3d54d38f..c99ca4e791 100644 --- a/usr/src/lib/libmapmalloc/Makefile.com +++ b/usr/src/lib/libmapmalloc/Makefile.com @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY= libmapmalloc.a VERS= .1 @@ -38,21 +36,15 @@ include ../../Makefile.lib SRCDIR = ../common -LIBS = $(DYNLIB) $(LINTLIB) - -LINTSRC= $(LINTLIB:%.ln=%) +LIBS = $(DYNLIB) CFLAGS += $(CCVERBOSE) CPPFLAGS += -I../../common/inc -D_REENTRANT DYNFLAGS += $(ZINTERPOSE) LDLIBS += -lc -$(LINTLIB) lint := LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN -$(LINTLIB) lint := LINTFLAGS64 += -erroff=E_BAD_PTR_CAST_ALIGN - .KEEP_STATE: -lint: lintcheck # include library targets include ../../Makefile.targ @@ -60,7 +52,3 @@ include ../../Makefile.targ pics/%.o: ../common/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) - -# install rule for lint library target -$(ROOTLINTDIR)/%: ../common/% - $(INS.file) diff --git a/usr/src/lib/libmapmalloc/amd64/Makefile b/usr/src/lib/libmapmalloc/amd64/Makefile index 70e24a9a5d..add8308228 100644 --- a/usr/src/lib/libmapmalloc/amd64/Makefile +++ b/usr/src/lib/libmapmalloc/amd64/Makefile @@ -22,13 +22,11 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) .KEEP_STATE: diff --git a/usr/src/lib/libmapmalloc/i386/Makefile b/usr/src/lib/libmapmalloc/i386/Makefile index 2a944b0b43..d6eed917a9 100644 --- a/usr/src/lib/libmapmalloc/i386/Makefile +++ b/usr/src/lib/libmapmalloc/i386/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -31,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libmapmalloc/sparc/Makefile b/usr/src/lib/libmapmalloc/sparc/Makefile index 2a944b0b43..d6eed917a9 100644 --- a/usr/src/lib/libmapmalloc/sparc/Makefile +++ b/usr/src/lib/libmapmalloc/sparc/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -31,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libmapmalloc/sparcv9/Makefile b/usr/src/lib/libmapmalloc/sparcv9/Makefile index 70e24a9a5d..add8308228 100644 --- a/usr/src/lib/libmapmalloc/sparcv9/Makefile +++ b/usr/src/lib/libmapmalloc/sparcv9/Makefile @@ -22,13 +22,11 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) .KEEP_STATE: diff --git a/usr/src/lib/libmd/Makefile b/usr/src/lib/libmd/Makefile index 137586aef6..08430f5e3b 100644 --- a/usr/src/lib/libmd/Makefile +++ b/usr/src/lib/libmd/Makefile @@ -37,13 +37,12 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: .PARALLEL: $(SUBDIRS) -all clean clobber install lint: \ +all clean clobber install: \ $(CAPDIR) .WAIT $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libmd/Makefile.com b/usr/src/lib/libmd/Makefile.com index 0fad27dcc7..2d7ec1758d 100644 --- a/usr/src/lib/libmd/Makefile.com +++ b/usr/src/lib/libmd/Makefile.com @@ -25,7 +25,7 @@ # Copyright (c) 2018, Joyent, Inc. # -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCS = $(COMDIR)/edonr/edonr.c \ $(COMDIR)/md4/md4.c \ $(COMDIR)/md5/md5.c \ @@ -45,4 +45,3 @@ LDLIBS += -lc SMOFF += 64bit_shift -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) diff --git a/usr/src/lib/libmd/amd64/Makefile b/usr/src/lib/libmd/amd64/Makefile index 1f8143966f..aab8d061a9 100644 --- a/usr/src/lib/libmd/amd64/Makefile +++ b/usr/src/lib/libmd/amd64/Makefile @@ -59,9 +59,7 @@ AS_CPPFLAGS += -D_ASM all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) - -lint: lintcheck +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) pics/%.o: %.s $(COMPILE.s) -o $@ ${@F:.o=.s} diff --git a/usr/src/lib/libmd/capabilities/Makefile b/usr/src/lib/libmd/capabilities/Makefile index 51c8921240..610eb49683 100644 --- a/usr/src/lib/libmd/capabilities/Makefile +++ b/usr/src/lib/libmd/capabilities/Makefile @@ -41,7 +41,6 @@ install := TARGET= install all clean clobber install: \ $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libmd/capabilities/sun4u/Makefile b/usr/src/lib/libmd/capabilities/sun4u/Makefile index 77aed04fa7..dddbce3b10 100644 --- a/usr/src/lib/libmd/capabilities/sun4u/Makefile +++ b/usr/src/lib/libmd/capabilities/sun4u/Makefile @@ -39,7 +39,6 @@ install := TARGET= install all clean clobber install: \ $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libmd/capabilities/sun4v/Makefile b/usr/src/lib/libmd/capabilities/sun4v/Makefile index 77aed04fa7..dddbce3b10 100644 --- a/usr/src/lib/libmd/capabilities/sun4v/Makefile +++ b/usr/src/lib/libmd/capabilities/sun4v/Makefile @@ -39,7 +39,6 @@ install := TARGET= install all clean clobber install: \ $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libmd/i386/Makefile b/usr/src/lib/libmd/i386/Makefile index d7827814d6..c8e385093a 100644 --- a/usr/src/lib/libmd/i386/Makefile +++ b/usr/src/lib/libmd/i386/Makefile @@ -38,8 +38,7 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) -lint: lintcheck include ../Makefile.targ diff --git a/usr/src/lib/libmd/sparc/Makefile b/usr/src/lib/libmd/sparc/Makefile index 9283791fe3..ee6bfb5ac5 100644 --- a/usr/src/lib/libmd/sparc/Makefile +++ b/usr/src/lib/libmd/sparc/Makefile @@ -45,8 +45,7 @@ pics/edonr.o := CERRWARN += $(CNOWARN_UNINIT) all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) -lint: lintcheck include ../Makefile.targ diff --git a/usr/src/lib/libmd/sparcv9/Makefile b/usr/src/lib/libmd/sparcv9/Makefile index a57dcf95f8..828180e233 100644 --- a/usr/src/lib/libmd/sparcv9/Makefile +++ b/usr/src/lib/libmd/sparcv9/Makefile @@ -35,15 +35,14 @@ include $(SRC)/lib/Makefile.lib.64 include ../Makefile.com # Symbol capabilities objects are added for sun4u and sun4v. -EXTPICS = ../capabilities/sun4u/sparcv9/pics/symcap.o \ +EXTPICS = ../capabilities/sun4u/sparcv9/pics/symcap.o \ ../capabilities/sun4v/sparcv9/pics/symcap.o .KEEP_STATE: all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) -lint: lintcheck include ../Makefile.targ diff --git a/usr/src/lib/libmd5/Makefile b/usr/src/lib/libmd5/Makefile index 6cb7a4fa8a..ef1592a4a5 100644 --- a/usr/src/lib/libmd5/Makefile +++ b/usr/src/lib/libmd5/Makefile @@ -36,7 +36,6 @@ install := TARGET= install all clean clobber install: $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libmd5/Makefile.com b/usr/src/lib/libmd5/Makefile.com index 856d8d9cce..c995addbe1 100644 --- a/usr/src/lib/libmd5/Makefile.com +++ b/usr/src/lib/libmd5/Makefile.com @@ -28,5 +28,4 @@ VERS = .1 include $(SRC)/lib/Makefile.rootfs -LIBS += $(LINTLIB) -DYNFLAGS += -F libmd.so.1 +DYNFLAGS += -F libmd.so.1 diff --git a/usr/src/lib/libmd5/amd64/Makefile b/usr/src/lib/libmd5/amd64/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libmd5/amd64/Makefile +++ b/usr/src/lib/libmd5/amd64/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libmd5/i386/Makefile b/usr/src/lib/libmd5/i386/Makefile index 4e4e8c02a9..682e5560ca 100644 --- a/usr/src/lib/libmd5/i386/Makefile +++ b/usr/src/lib/libmd5/i386/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libmd5/sparc/Makefile b/usr/src/lib/libmd5/sparc/Makefile index 4e4e8c02a9..682e5560ca 100644 --- a/usr/src/lib/libmd5/sparc/Makefile +++ b/usr/src/lib/libmd5/sparc/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libmd5/sparcv9/Makefile b/usr/src/lib/libmd5/sparcv9/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libmd5/sparcv9/Makefile +++ b/usr/src/lib/libmd5/sparcv9/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libmlrpc/Makefile b/usr/src/lib/libmlrpc/Makefile index ae458ebc7a..14929ce79c 100644 --- a/usr/src/lib/libmlrpc/Makefile +++ b/usr/src/lib/libmlrpc/Makefile @@ -41,11 +41,10 @@ all := TARGET = all install := TARGET = install clean := TARGET = clean clobber := TARGET = clobber -lint := TARGET = lint .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) install_h: $(ROOTHDRDIR) $(ROOTHDRS) diff --git a/usr/src/lib/libmlrpc/Makefile.com b/usr/src/lib/libmlrpc/Makefile.com index 1a2ecb4ddd..700a8c8968 100644 --- a/usr/src/lib/libmlrpc/Makefile.com +++ b/usr/src/lib/libmlrpc/Makefile.com @@ -47,13 +47,12 @@ CLEANFILES += $(NDLLIST:%=%_ndr.c) include ../../Makefile.lib -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) LDLIBS += -lsmbfs -luuid -lc SRCDIR= ../common SRCS= $(OBJS_COMMON:%.o=$(SRCDIR)/%.c) -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) NDLDIR = $(SRCDIR) @@ -63,7 +62,6 @@ CPPFLAGS += $(INCS) -D_REENTRANT all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libmlrpc/amd64/Makefile b/usr/src/lib/libmlrpc/amd64/Makefile index 087f0e1107..c423d1ea18 100644 --- a/usr/src/lib/libmlrpc/amd64/Makefile +++ b/usr/src/lib/libmlrpc/amd64/Makefile @@ -28,4 +28,4 @@ MACH_LDLIBS += -L$(ROOT)/usr/lib/smbsrv/$(MACH64) include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libmlrpc/i386/Makefile b/usr/src/lib/libmlrpc/i386/Makefile index 6589e9941a..2845cd3c2d 100644 --- a/usr/src/lib/libmlrpc/i386/Makefile +++ b/usr/src/lib/libmlrpc/i386/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libmlrpc/sparc/Makefile b/usr/src/lib/libmlrpc/sparc/Makefile index 6589e9941a..2845cd3c2d 100644 --- a/usr/src/lib/libmlrpc/sparc/Makefile +++ b/usr/src/lib/libmlrpc/sparc/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libmlrpc/sparcv9/Makefile b/usr/src/lib/libmlrpc/sparcv9/Makefile index 087f0e1107..c423d1ea18 100644 --- a/usr/src/lib/libmlrpc/sparcv9/Makefile +++ b/usr/src/lib/libmlrpc/sparcv9/Makefile @@ -28,4 +28,4 @@ MACH_LDLIBS += -L$(ROOT)/usr/lib/smbsrv/$(MACH64) include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libmp/Makefile b/usr/src/lib/libmp/Makefile index f4e1d98996..0f651e4eda 100644 --- a/usr/src/lib/libmp/Makefile +++ b/usr/src/lib/libmp/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.master include ../Makefile.lib @@ -36,12 +34,11 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint test := TARGET= test .KEEP_STATE: -all clean clobber install lint test: $(SUBDIRS) +all clean clobber install test: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libmp/Makefile.com b/usr/src/lib/libmp/Makefile.com index e2123569a9..3c71277267 100644 --- a/usr/src/lib/libmp/Makefile.com +++ b/usr/src/lib/libmp/Makefile.com @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY= libmp.a VERS= .2 @@ -36,6 +34,9 @@ include ../../Makefile.lib # install this library in the root filesystem include ../../Makefile.rootfs +COMPATLINKS += usr/lib/libmp.so.1 +$(ROOT)/usr/lib/libmp.so.1 := COMPATLINKTARGET=../../lib/libmp.so.1 + SRCDIR = ../common OMAPFILE = ../common/mapfile_1-vers @@ -47,7 +48,6 @@ LDLIBS += -lc .KEEP_STATE: -lint: lintcheck # # Include library targets diff --git a/usr/src/lib/libmp/amd64/Makefile b/usr/src/lib/libmp/amd64/Makefile index fc9ec9e40a..40902c4fa9 100644 --- a/usr/src/lib/libmp/amd64/Makefile +++ b/usr/src/lib/libmp/amd64/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -34,4 +34,4 @@ LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libmp/i386/Makefile b/usr/src/lib/libmp/i386/Makefile index ee90826c9b..c51c018c88 100644 --- a/usr/src/lib/libmp/i386/Makefile +++ b/usr/src/lib/libmp/i386/Makefile @@ -22,7 +22,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # OLIBRARY = libmp.so.1 @@ -51,4 +51,5 @@ pics/pics_mp.o: all: $(LIBS) $(OLIBRARY) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLIBDIR)/$(OLIBRARY) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLIBDIR)/$(OLIBRARY) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libmp/sparc/Makefile b/usr/src/lib/libmp/sparc/Makefile index 9c62a2b7ac..8bb9a77528 100644 --- a/usr/src/lib/libmp/sparc/Makefile +++ b/usr/src/lib/libmp/sparc/Makefile @@ -22,7 +22,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # OLIBRARY = libmp.so.1 @@ -51,4 +51,5 @@ pics/pics_mp.o: all: $(LIBS) $(OLIBRARY) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLIBDIR)/$(OLIBRARY) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLIBDIR)/$(OLIBRARY) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libmp/sparcv9/Makefile b/usr/src/lib/libmp/sparcv9/Makefile index fc9ec9e40a..40902c4fa9 100644 --- a/usr/src/lib/libmp/sparcv9/Makefile +++ b/usr/src/lib/libmp/sparcv9/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -34,4 +34,4 @@ LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libmtmalloc/Makefile b/usr/src/lib/libmtmalloc/Makefile index aa5cccd34b..65dc0f351a 100644 --- a/usr/src/lib/libmtmalloc/Makefile +++ b/usr/src/lib/libmtmalloc/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -46,12 +44,11 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint install_h := TARGET= install_h .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libmtmalloc/Makefile.com b/usr/src/lib/libmtmalloc/Makefile.com index ef87819122..e859cee11d 100644 --- a/usr/src/lib/libmtmalloc/Makefile.com +++ b/usr/src/lib/libmtmalloc/Makefile.com @@ -33,16 +33,12 @@ include ../../Makefile.lib SRCDIR = ../common SRCS = ../common/mtmalloc.c -LINTSRC = $(LINTLIB:%.ln=%) -LIBS = $(DYNLIB) $(LINTLIB) -LDLIBS += -lc -CFLAGS += $(CCVERBOSE) $(C_PICFLAGS) +LIBS = $(DYNLIB) +LDLIBS += -lc +CFLAGS += $(CCVERBOSE) $(C_PICFLAGS) CPPFLAGS += -I../common -I../../common/inc -D_REENTRANT -DYNFLAGS += $(ZINTERPOSE) - -$(LINTLIB) lint := LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN -$(LINTLIB) lint := LINTFLAGS64 += -erroff=E_BAD_PTR_CAST_ALIGN +DYNFLAGS += $(ZINTERPOSE) CERRWARN += $(CNOWARN_UNINIT) @@ -50,7 +46,6 @@ CERRWARN += $(CNOWARN_UNINIT) all: $(LIBS) -lint: lintcheck # include library targets include ../../Makefile.targ diff --git a/usr/src/lib/libmvec/Makefile b/usr/src/lib/libmvec/Makefile index 2a5ce644c0..1699b9e3e5 100644 --- a/usr/src/lib/libmvec/Makefile +++ b/usr/src/lib/libmvec/Makefile @@ -27,20 +27,19 @@ COMPS_amd64 = COMPS_sparcv9 = sparcv9_sparcv9+vis sparcv9_sparcv9+vis2 COMPONENTS64 = $(COMPS_$(MACH64)) -SUBDIRS = $(MACH) $(COMPONENTS) +SUBDIRS = $(MACH) $(COMPONENTS) $(BUILD64)SUBDIRS += $(MACH64) $(COMPONENTS64) all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint .KEEP_STATE: .PARALLEL: $(SUBDIRS) -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; VERSION='$(VERSION)' $(MAKE) $(TARGET) diff --git a/usr/src/lib/libmvec/Makefile.com b/usr/src/lib/libmvec/Makefile.com index 6498f511e4..c83d925502 100644 --- a/usr/src/lib/libmvec/Makefile.com +++ b/usr/src/lib/libmvec/Makefile.com @@ -161,19 +161,6 @@ LIBS = $(DYNLIB) SRCDIR = ../common/ DYNFLAGS += $(ZIGNORE) -LINTERROFF = -erroff=E_FP_DIVISION_BY_ZERO -LINTERROFF += -erroff=E_FP_INVALID -LINTERROFF += -erroff=E_BAD_PTR_CAST_ALIGN -LINTERROFF += -erroff=E_ASSIGMENT_CAUSE_LOSS_PREC -LINTERROFF += -erroff=E_FUNC_SET_NOT_USED - -LINTFLAGS += $(LINTERROFF) -LINTFLAGS64 += $(LINTERROFF) -LINTFLAGS64 += -errchk=longptr64 - -CLAGS += $(LINTERROFF) -CFLAGS64 += $(LINTERROFF) - FLTRPATH_sparc = $$ORIGIN/cpu/$$ISALIST/libmvec_isa.so.1 FLTRPATH_sparcv9 = $$ORIGIN/../cpu/$$ISALIST/sparcv9/libmvec_isa.so.1 FLTRPATH_i386 = $$ORIGIN/libmvec/$$HWCAP @@ -272,7 +259,6 @@ SRCS_mvec = \ all: $(LIBS) -lint: lintcheck pics/%.o: ../$(TARGET_ARCH)/src/%.S $(COMPILE.s) -o $@ $< diff --git a/usr/src/lib/libmvec/amd64/Makefile b/usr/src/lib/libmvec/amd64/Makefile index c7f904a08c..3629bc7829 100644 --- a/usr/src/lib/libmvec/amd64/Makefile +++ b/usr/src/lib/libmvec/amd64/Makefile @@ -15,8 +15,8 @@ TARGET_ARCH = amd64 -LIBRARY = libmvec.a -VERS = .1 +LIBRARY = libmvec.a +VERS = .1 OBJECTS = $(mvecOBJS) @@ -25,6 +25,6 @@ include $(SRC)/lib/Makefile.lib.64 SRCS = $(SRCS_mvec) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include $(SRC)/lib/libm/Makefile.targ diff --git a/usr/src/lib/libmvec/i386/Makefile b/usr/src/lib/libmvec/i386/Makefile index f99f809c60..0fa671af18 100644 --- a/usr/src/lib/libmvec/i386/Makefile +++ b/usr/src/lib/libmvec/i386/Makefile @@ -15,8 +15,8 @@ TARGET_ARCH= i386 -LIBRARY = libmvec.a -VERS = .1 +LIBRARY = libmvec.a +VERS = .1 OBJECTS = $(mvecOBJS) @@ -24,6 +24,6 @@ include ../Makefile.com SRCS = $(SRCS_mvec) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include $(SRC)/lib/libm/Makefile.targ diff --git a/usr/src/lib/libmvec/sparc/Makefile b/usr/src/lib/libmvec/sparc/Makefile index 39df5d8353..d0f5a55218 100644 --- a/usr/src/lib/libmvec/sparc/Makefile +++ b/usr/src/lib/libmvec/sparc/Makefile @@ -15,8 +15,8 @@ TARGET_ARCH= sparc -LIBRARY = libmvec.a -VERS = .1 +LIBRARY = libmvec.a +VERS = .1 OBJECTS = $(mvecOBJS) @@ -25,6 +25,6 @@ include ../Makefile.com CHIP = ultra SRCS = $(SRCS_mvec) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libmvec/sparcv9/Makefile b/usr/src/lib/libmvec/sparcv9/Makefile index e649b04b32..06f87dc853 100644 --- a/usr/src/lib/libmvec/sparcv9/Makefile +++ b/usr/src/lib/libmvec/sparcv9/Makefile @@ -15,8 +15,8 @@ TARGET_ARCH = sparcv9 -LIBRARY = libmvec.a -VERS = .1 +LIBRARY = libmvec.a +VERS = .1 OBJECTS = $(mvecOBJS) @@ -27,6 +27,6 @@ CHIP = ultra SRCS = $(SRCS_mvec) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include $(SRC)/lib/libm/Makefile.targ diff --git a/usr/src/lib/libndmp/Makefile b/usr/src/lib/libndmp/Makefile index 3eab679789..fb35cb97a5 100644 --- a/usr/src/lib/libndmp/Makefile +++ b/usr/src/lib/libndmp/Makefile @@ -11,10 +11,10 @@ # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: -# - Redistributions of source code must retain the above copyright +# - Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # -# - Redistributions in binary form must reproduce the above copyright +# - Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. @@ -50,11 +50,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) check: $(CHECKHDRS) diff --git a/usr/src/lib/libndmp/Makefile.com b/usr/src/lib/libndmp/Makefile.com index 39609c3e7e..2e7e38b2b9 100644 --- a/usr/src/lib/libndmp/Makefile.com +++ b/usr/src/lib/libndmp/Makefile.com @@ -11,10 +11,10 @@ # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: -# - Redistributions of source code must retain the above copyright +# - Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # -# - Redistributions in binary form must reproduce the above copyright +# - Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. @@ -47,8 +47,7 @@ INCS += -I$(SRCDIR) INCS += -I$(SRC)/cmd/ndmpd/include CSTD= $(CSTD_GNU99) -C99LMODE= -Xc99=%all -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) LDLIBS += -lc -lscf CPPFLAGS += $(INCS) -D_REENTRANT @@ -56,12 +55,10 @@ CERRWARN += -_gcc=-Wno-char-subscripts CERRWARN += $(CNOWARN_UNINIT) SRCS= $(OBJECTS:%.o=$(SRCDIR)/%.c) -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) .KEEP_STATE: all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libndmp/i386/Makefile b/usr/src/lib/libndmp/i386/Makefile index b71b63efc2..907d64febf 100644 --- a/usr/src/lib/libndmp/i386/Makefile +++ b/usr/src/lib/libndmp/i386/Makefile @@ -11,10 +11,10 @@ # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: -# - Redistributions of source code must retain the above copyright +# - Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # -# - Redistributions in binary form must reproduce the above copyright +# - Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. @@ -38,4 +38,4 @@ # include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libndmp/sparc/Makefile b/usr/src/lib/libndmp/sparc/Makefile index b71b63efc2..907d64febf 100644 --- a/usr/src/lib/libndmp/sparc/Makefile +++ b/usr/src/lib/libndmp/sparc/Makefile @@ -11,10 +11,10 @@ # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: -# - Redistributions of source code must retain the above copyright +# - Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # -# - Redistributions in binary form must reproduce the above copyright +# - Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. @@ -38,4 +38,4 @@ # include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libnls/Makefile b/usr/src/lib/libnls/Makefile index f6f092cbee..4be6bfef0a 100644 --- a/usr/src/lib/libnls/Makefile +++ b/usr/src/lib/libnls/Makefile @@ -34,11 +34,10 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg package := TARGET= package -LIBRARY= libnls.a +LIBRARY= libnls.a TEXT_DOMAIN= SUNW_OST_OSLIB XGETFLAGS= -a POFILE= $(LIBRARY:.a=.po) @@ -49,7 +48,7 @@ GREP= grep .KEEP_STATE: -all clean clobber delete install lint package: $(SUBDIRS) +all clean clobber delete install package: $(SUBDIRS) # install rule for install_h target $(ROOTHDRDIR)/%: % @@ -58,7 +57,7 @@ $(ROOTHDRDIR)/%: % install_h: $(ROOTHDRS) check: $(CHECKHDRS) - + $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libnls/Makefile.com b/usr/src/lib/libnls/Makefile.com index ad699dfca7..6494eb2e80 100644 --- a/usr/src/lib/libnls/Makefile.com +++ b/usr/src/lib/libnls/Makefile.com @@ -33,9 +33,7 @@ include ../../Makefile.lib SRCDIR = ../common -LIBS = $(DYNLIB) $(LINTLIB) - -LINTSRC= $(LINTLIB:%.ln=%) +LIBS = $(DYNLIB) CFLAGS += $(CCVERBOSE) LDLIBS += -lnsl -lc @@ -44,7 +42,6 @@ CERRWARN += -_gcc=-Wno-unused-variable .KEEP_STATE: -lint: lintcheck # include library targets include ../../Makefile.targ @@ -52,7 +49,3 @@ include ../../Makefile.targ pics/%.o: ../common/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) - -# install rule for lint library target -$(ROOTLINTDIR)/%: ../common/% - $(INS.file) diff --git a/usr/src/lib/libnls/amd64/Makefile b/usr/src/lib/libnls/amd64/Makefile index e24ef38245..58854901e8 100644 --- a/usr/src/lib/libnls/amd64/Makefile +++ b/usr/src/lib/libnls/amd64/Makefile @@ -22,13 +22,11 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) .KEEP_STATE: diff --git a/usr/src/lib/libnls/i386/Makefile b/usr/src/lib/libnls/i386/Makefile index 2a944b0b43..d6eed917a9 100644 --- a/usr/src/lib/libnls/i386/Makefile +++ b/usr/src/lib/libnls/i386/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -31,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libnls/sparc/Makefile b/usr/src/lib/libnls/sparc/Makefile index 2a944b0b43..d6eed917a9 100644 --- a/usr/src/lib/libnls/sparc/Makefile +++ b/usr/src/lib/libnls/sparc/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -31,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libnls/sparcv9/Makefile b/usr/src/lib/libnls/sparcv9/Makefile index e24ef38245..58854901e8 100644 --- a/usr/src/lib/libnls/sparcv9/Makefile +++ b/usr/src/lib/libnls/sparcv9/Makefile @@ -22,13 +22,11 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) .KEEP_STATE: diff --git a/usr/src/lib/libnsl/Makefile b/usr/src/lib/libnsl/Makefile index 923f8dad40..52ea34b8fb 100644 --- a/usr/src/lib/libnsl/Makefile +++ b/usr/src/lib/libnsl/Makefile @@ -73,7 +73,6 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg package := TARGET= package @@ -92,7 +91,7 @@ install_h: $(ROOTHDRS) # nss.h isn't delivered; no reason to check check: -clean clobber delete lint package: $(SUBDIRS) +clean clobber delete package: $(SUBDIRS) $(PROTOCOL_DIR): $(INS.dir) @@ -118,7 +117,7 @@ $(PROTOCOL_DIR)/%.x: $(PROTOCOL_UTS_SRCDIR)/%.x # # Derived header files # -nis/gen/nis_clnt.h: $(PROTOCOL_DIR)/nis.x $(PROTOCOL_DIR)/nis_object.x +nis/gen/nis_clnt.h: $(PROTOCOL_DIR)/nis.x $(PROTOCOL_DIR)/nis_object.x $(RPCGEN) -C -h $(PROTOCOL_DIR)/nis.x > nis_clnt-gen.h $(SED) -n -e '/EDIT_START/,$$ p' < nis_clnt-gen.h |\ $(SED) -e 's/_3_svc/_svc/' |\ diff --git a/usr/src/lib/libnsl/Makefile.com b/usr/src/lib/libnsl/Makefile.com index e3ba39ddc9..12b5904994 100644 --- a/usr/src/lib/libnsl/Makefile.com +++ b/usr/src/lib/libnsl/Makefile.com @@ -164,7 +164,7 @@ include ../../Makefile.lib # install this library in the root filesystem include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR= ../common @@ -208,19 +208,14 @@ CERRWARN += -_gcc=-Wno-clobbered SMATCH=off LIBMP = -lmp -lint := LIBMP = LDLIBS += $(LIBMP) -lmd -lc DYNFLAGS += $(ZNODELETE) -$(LINTLIB):= SRCS=$(SRCDIR)/$(LINTSRC) -LINTFLAGS += -m -DPORTMAP -LINTFLAGS64 += -m -DPORTMAP .KEEP_STATE: all: $(LIBS) -# Don't lint WRAPPERS as they are explicitly unclean SRCS= $(DES:%.o=../des/%.c) \ $(DIAL:%.o=../dial/%.c) \ $(IPSEC:%.o=../ipsec/%.c) \ @@ -234,8 +229,6 @@ SRCS= $(DES:%.o=../des/%.c) \ $(NIS_GEN:%.o=../nis/gen/%.c) \ $(COMMON:%.o=../common/%.c) -lint: - @$(LINT.c) $(SRCS) $(LDLIBS) # include library targets include ../../Makefile.targ diff --git a/usr/src/lib/libnsl/amd64/Makefile b/usr/src/lib/libnsl/amd64/Makefile index ed0a7167be..88032f0441 100644 --- a/usr/src/lib/libnsl/amd64/Makefile +++ b/usr/src/lib/libnsl/amd64/Makefile @@ -23,7 +23,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -35,4 +35,4 @@ include ../../Makefile.lib.64 amd64_C_PICFLAGS = $(amd64_C_BIGPICFLAGS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libnsl/i386/Makefile b/usr/src/lib/libnsl/i386/Makefile index 5591ea9a22..655acde2a7 100644 --- a/usr/src/lib/libnsl/i386/Makefile +++ b/usr/src/lib/libnsl/i386/Makefile @@ -23,9 +23,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libnsl/sparc/Makefile b/usr/src/lib/libnsl/sparc/Makefile index 5591ea9a22..655acde2a7 100644 --- a/usr/src/lib/libnsl/sparc/Makefile +++ b/usr/src/lib/libnsl/sparc/Makefile @@ -23,9 +23,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libnsl/sparcv9/Makefile b/usr/src/lib/libnsl/sparcv9/Makefile index 249857bc50..d26d0a9514 100644 --- a/usr/src/lib/libnsl/sparcv9/Makefile +++ b/usr/src/lib/libnsl/sparcv9/Makefile @@ -33,4 +33,4 @@ include ../../Makefile.lib.64 sparcv9_C_PICFLAGS = $(sparcv9_C_BIGPICFLAGS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libnvpair/Makefile b/usr/src/lib/libnvpair/Makefile index 1dc8b802b0..920b1e36fa 100644 --- a/usr/src/lib/libnvpair/Makefile +++ b/usr/src/lib/libnvpair/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -35,7 +33,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint test := TARGET= test # definitions for install_h target @@ -46,7 +43,7 @@ CHECKHDRS= $(HDRS:%.h=%.check) .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) # install rule for install_h target diff --git a/usr/src/lib/libnvpair/Makefile.com b/usr/src/lib/libnvpair/Makefile.com index 3a58a7e630..367a6ad657 100644 --- a/usr/src/lib/libnvpair/Makefile.com +++ b/usr/src/lib/libnvpair/Makefile.com @@ -50,22 +50,11 @@ SRCS= ../libnvpair.c \ # Libraries added to the next line must be present in miniroot # LDLIBS += -lc -lnsl -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) # turn off ptr-cast warnings -LINTFLAGS64 += -erroff=E_BAD_PTR_CAST_ALIGN # turn off warning caused by lint bug: not understanding SCNi8 "hhi" -LINTFLAGS += -erroff=E_BAD_FORMAT_STR2 -LINTFLAGS += -erroff=E_INVALID_TOKEN_IN_DEFINE_MACRO -LINTFLAGS += -erroff=E_RET_INT_IMPLICITLY -LINTFLAGS += -erroff=E_FUNC_USED_VAR_ARG2 -LINTFLAGS += -erroff=E_CONSTANT_CONDITION -LINTFLAGS64 += -erroff=E_BAD_FORMAT_STR2 -LINTFLAGS64 += -erroff=E_INVALID_TOKEN_IN_DEFINE_MACRO -LINTFLAGS64 += -erroff=E_RET_INT_IMPLICITLY -LINTFLAGS64 += -erroff=E_FUNC_USED_VAR_ARG2 -LINTFLAGS64 += -erroff=E_CONSTANT_CONDITION CERRWARN += -_gcc=-Wno-type-limits CERRWARN += -_gcc=-Wno-parentheses @@ -75,15 +64,12 @@ CFLAGS += $(CCVERBOSE) CPPFLAGS += -D_REENTRANT CSTD= $(CSTD_GNU99) -C99LMODE= -Xc99=%all -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) .KEEP_STATE: all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libnvpair/amd64/Makefile b/usr/src/lib/libnvpair/amd64/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/libnvpair/amd64/Makefile +++ b/usr/src/lib/libnvpair/amd64/Makefile @@ -23,10 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libnvpair/i386/Makefile b/usr/src/lib/libnvpair/i386/Makefile index af76f5ab90..59045395eb 100644 --- a/usr/src/lib/libnvpair/i386/Makefile +++ b/usr/src/lib/libnvpair/i386/Makefile @@ -23,9 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libnvpair/sparc/Makefile b/usr/src/lib/libnvpair/sparc/Makefile index af76f5ab90..59045395eb 100644 --- a/usr/src/lib/libnvpair/sparc/Makefile +++ b/usr/src/lib/libnvpair/sparc/Makefile @@ -23,9 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libnvpair/sparcv9/Makefile b/usr/src/lib/libnvpair/sparcv9/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/libnvpair/sparcv9/Makefile +++ b/usr/src/lib/libnvpair/sparcv9/Makefile @@ -23,10 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libnwam/Makefile b/usr/src/lib/libnwam/Makefile index 9257f62f25..8fe46ff93f 100644 --- a/usr/src/lib/libnwam/Makefile +++ b/usr/src/lib/libnwam/Makefile @@ -42,11 +42,10 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libnwam/Makefile.com b/usr/src/lib/libnwam/Makefile.com index d793239a44..e192a7ce4a 100644 --- a/usr/src/lib/libnwam/Makefile.com +++ b/usr/src/lib/libnwam/Makefile.com @@ -44,12 +44,11 @@ OBJECTS= libnwam_audit.o \ include ../../Makefile.lib include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lbsm -lc -ldladm -lnvpair -lscf -lsecdb -lsocket \ -lipadm SRCDIR = ../common -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(SRCDIR) -D_REENTRANT @@ -64,6 +63,5 @@ SMATCH=off all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libnwam/i386/Makefile b/usr/src/lib/libnwam/i386/Makefile index 8069eadad1..b8e57100de 100644 --- a/usr/src/lib/libnwam/i386/Makefile +++ b/usr/src/lib/libnwam/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libnwam/sparc/Makefile b/usr/src/lib/libnwam/sparc/Makefile index 743c659a64..a05434e506 100644 --- a/usr/src/lib/libnwam/sparc/Makefile +++ b/usr/src/lib/libnwam/sparc/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libofmt/Makefile b/usr/src/lib/libofmt/Makefile index 21bb7cdea8..efcf230a25 100644 --- a/usr/src/lib/libofmt/Makefile +++ b/usr/src/lib/libofmt/Makefile @@ -28,11 +28,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libofmt/Makefile.com b/usr/src/lib/libofmt/Makefile.com index 04a627f9e0..76fd04e9d4 100644 --- a/usr/src/lib/libofmt/Makefile.com +++ b/usr/src/lib/libofmt/Makefile.com @@ -24,10 +24,9 @@ include $(SRC)/lib/Makefile.rootfs SRCDIR= ../common -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) SRCS= $(SRCDIR)/ofmt.c -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) LDLIBS += -lc SMOFF += kmalloc_wrong_size @@ -36,6 +35,5 @@ SMOFF += kmalloc_wrong_size all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libofmt/i386/Makefile b/usr/src/lib/libofmt/i386/Makefile index d00779a2ee..63df8b8463 100644 --- a/usr/src/lib/libofmt/i386/Makefile +++ b/usr/src/lib/libofmt/i386/Makefile @@ -15,4 +15,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libofmt/sparc/Makefile b/usr/src/lib/libofmt/sparc/Makefile index d00779a2ee..63df8b8463 100644 --- a/usr/src/lib/libofmt/sparc/Makefile +++ b/usr/src/lib/libofmt/sparc/Makefile @@ -15,4 +15,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libpam/Makefile b/usr/src/lib/libpam/Makefile index e653cc877b..dd941725dd 100644 --- a/usr/src/lib/libpam/Makefile +++ b/usr/src/lib/libpam/Makefile @@ -45,11 +45,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libpam/Makefile.com b/usr/src/lib/libpam/Makefile.com index d96ba001ee..518b224040 100644 --- a/usr/src/lib/libpam/Makefile.com +++ b/usr/src/lib/libpam/Makefile.com @@ -32,8 +32,7 @@ include ../../Makefile.rootfs TEXT_DOMAIN= SUNW_OST_SYSOSPAM -LIBS= $(DYNLIB) $(LINTLIB) -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) +LIBS= $(DYNLIB) LDLIBS += -lc CFLAGS += $(CCVERBOSE) @@ -45,6 +44,5 @@ CERRWARN += $(CNOWARN_UNINIT) all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libpam/amd64/Makefile b/usr/src/lib/libpam/amd64/Makefile index 8f7590c2ef..8f9bf5b7c3 100644 --- a/usr/src/lib/libpam/amd64/Makefile +++ b/usr/src/lib/libpam/amd64/Makefile @@ -23,10 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libpam/i386/Makefile b/usr/src/lib/libpam/i386/Makefile index 1cc697f600..16c9d09c13 100644 --- a/usr/src/lib/libpam/i386/Makefile +++ b/usr/src/lib/libpam/i386/Makefile @@ -23,10 +23,7 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# usr/src/lib/libpam/i386/Makefile -# -# ident "%Z%%M% %I% %E% SMI" include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libpam/sparc/Makefile b/usr/src/lib/libpam/sparc/Makefile index 07b65bae20..00586b6ffb 100644 --- a/usr/src/lib/libpam/sparc/Makefile +++ b/usr/src/lib/libpam/sparc/Makefile @@ -23,10 +23,7 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# usr/src/lib/libpam/sparc/Makefile -# -# ident "%Z%%M% %I% %E% SMI" include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libpam/sparcv9/Makefile b/usr/src/lib/libpam/sparcv9/Makefile index 401952a7f8..8e700da449 100644 --- a/usr/src/lib/libpam/sparcv9/Makefile +++ b/usr/src/lib/libpam/sparcv9/Makefile @@ -25,9 +25,9 @@ # # lib/libpam/sparcv9/Makefile # -# ident "%Z%%M% %I% %E% SMI" + include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libpcidb/Makefile b/usr/src/lib/libpcidb/Makefile index d42b570fd1..1cdd0b59dc 100644 --- a/usr/src/lib/libpcidb/Makefile +++ b/usr/src/lib/libpcidb/Makefile @@ -28,18 +28,17 @@ include ../Makefile.lib HDRS = pcidb.h HDRDIR = common -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install: install_h $(SUBDIRS) diff --git a/usr/src/lib/libpcidb/Makefile.com b/usr/src/lib/libpcidb/Makefile.com index 3b8b66204d..43a327423b 100644 --- a/usr/src/lib/libpcidb/Makefile.com +++ b/usr/src/lib/libpcidb/Makefile.com @@ -28,18 +28,16 @@ OBJECTS = pcidb.o include ../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common LDLIBS += -lc -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) .KEEP_STATE: all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libpcidb/amd64/Makefile b/usr/src/lib/libpcidb/amd64/Makefile index 5e4664f0e5..42ea1fb43a 100644 --- a/usr/src/lib/libpcidb/amd64/Makefile +++ b/usr/src/lib/libpcidb/amd64/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libpcidb/i386/Makefile b/usr/src/lib/libpcidb/i386/Makefile index 22624a1da8..0561a5d2f6 100644 --- a/usr/src/lib/libpcidb/i386/Makefile +++ b/usr/src/lib/libpcidb/i386/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libpcidb/sparc/Makefile b/usr/src/lib/libpcidb/sparc/Makefile index 22624a1da8..0561a5d2f6 100644 --- a/usr/src/lib/libpcidb/sparc/Makefile +++ b/usr/src/lib/libpcidb/sparc/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libpcidb/sparcv9/Makefile b/usr/src/lib/libpcidb/sparcv9/Makefile index 5e4664f0e5..42ea1fb43a 100644 --- a/usr/src/lib/libpcidb/sparcv9/Makefile +++ b/usr/src/lib/libpcidb/sparcv9/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libpcp/Makefile b/usr/src/lib/libpcp/Makefile index 3c086c2988..69fdd91379 100644 --- a/usr/src/lib/libpcp/Makefile +++ b/usr/src/lib/libpcp/Makefile @@ -23,22 +23,17 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libpcp/Makefile - -SUBDIRS= $(MACH) +SUBDIRS= $(MACH) all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint : $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libpcp/Makefile.com b/usr/src/lib/libpcp/Makefile.com index 65ba8001d7..976167f887 100644 --- a/usr/src/lib/libpcp/Makefile.com +++ b/usr/src/lib/libpcp/Makefile.com @@ -45,7 +45,7 @@ LINKED_LIBPCP_DIR = \ LINKED_LIBPCP1_DIR = \ $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib/libpcp.so.1) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) CFLAGS += $(CCVERBOSE) CERRWARN += $(CNOWARN_UNINIT) LDLIBS += -lc -lumem -ldevinfo @@ -60,6 +60,5 @@ INS.slink7= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/libpcp.so $@ # all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libpctx/Makefile b/usr/src/lib/libpctx/Makefile index 9c0caadfb2..956bffa8e1 100644 --- a/usr/src/lib/libpctx/Makefile +++ b/usr/src/lib/libpctx/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/Makefile.lib @@ -40,11 +38,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libpctx/i386/Makefile b/usr/src/lib/libpctx/i386/Makefile index 2bc63b7fb2..18584b4da1 100644 --- a/usr/src/lib/libpctx/i386/Makefile +++ b/usr/src/lib/libpctx/i386/Makefile @@ -23,10 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libpctx/i386/Makefile include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libpctx/sparc/Makefile b/usr/src/lib/libpctx/sparc/Makefile index b0eb79de8f..18584b4da1 100644 --- a/usr/src/lib/libpctx/sparc/Makefile +++ b/usr/src/lib/libpctx/sparc/Makefile @@ -23,10 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libpctx/sparc/Makefile include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libpicl/Makefile b/usr/src/lib/libpicl/Makefile index c35ebf5ea0..0debd2d27d 100644 --- a/usr/src/lib/libpicl/Makefile +++ b/usr/src/lib/libpicl/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/Makefile.lib @@ -31,11 +29,10 @@ SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) # conditional assignments -all := TARGET= all +all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg # definitions for install_h target @@ -46,7 +43,7 @@ CHECKHDRS= $(HDRS:%.h=%.check) .KEEP_STATE: -all install clean clobber lint _msg: $(SUBDIRS) +all install clean clobber _msg: $(SUBDIRS) # install rule for install_h target diff --git a/usr/src/lib/libpicl/Makefile.com b/usr/src/lib/libpicl/Makefile.com index 3246d227e8..667fa7b82b 100644 --- a/usr/src/lib/libpicl/Makefile.com +++ b/usr/src/lib/libpicl/Makefile.com @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY= libpicl.a VERS= .1 @@ -31,9 +29,8 @@ OBJECTS= picl.o include $(SRC)/lib/Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CPPFLAGS += -I.. -D_REENTRANT CFLAGS += $(CCVERBOSE) @@ -45,7 +42,6 @@ POFILE = picl.po all: $(LIBS) -lint: lintcheck %.po: ../%.c $(CP) $< $<.i diff --git a/usr/src/lib/libpicl/i386/Makefile b/usr/src/lib/libpicl/i386/Makefile index af76f5ab90..18584b4da1 100644 --- a/usr/src/lib/libpicl/i386/Makefile +++ b/usr/src/lib/libpicl/i386/Makefile @@ -23,9 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libpicl/sparc/Makefile b/usr/src/lib/libpicl/sparc/Makefile index af76f5ab90..18584b4da1 100644 --- a/usr/src/lib/libpicl/sparc/Makefile +++ b/usr/src/lib/libpicl/sparc/Makefile @@ -23,9 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libpicltree/Makefile b/usr/src/lib/libpicltree/Makefile index 79d59401c1..4a58addce0 100644 --- a/usr/src/lib/libpicltree/Makefile +++ b/usr/src/lib/libpicltree/Makefile @@ -22,19 +22,16 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/Makefile.lib SUBDIRS = $(MACH) # conditional assignments -all := TARGET= all +all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint test := TARGET= test # definitions for install_h target @@ -45,7 +42,7 @@ CHECKHDRS= $(HDRS:%.h=%.check) .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) # install rule for install_h target diff --git a/usr/src/lib/libpicltree/Makefile.com b/usr/src/lib/libpicltree/Makefile.com index 9fe3266a50..14f87bd573 100644 --- a/usr/src/lib/libpicltree/Makefile.com +++ b/usr/src/lib/libpicltree/Makefile.com @@ -30,9 +30,8 @@ OBJECTS= picltree.o include $(SRC)/lib/Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CPPFLAGS += -D_REENTRANT -I.. -I../../libpicl -I$(SRC)/cmd/picl/plugins/inc CFLAGS += $(CCVERBOSE) @@ -46,6 +45,5 @@ SMATCH=off all : $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libpicltree/i386/Makefile b/usr/src/lib/libpicltree/i386/Makefile index af76f5ab90..18584b4da1 100644 --- a/usr/src/lib/libpicltree/i386/Makefile +++ b/usr/src/lib/libpicltree/i386/Makefile @@ -23,9 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libpicltree/sparc/Makefile b/usr/src/lib/libpicltree/sparc/Makefile index af76f5ab90..18584b4da1 100644 --- a/usr/src/lib/libpicltree/sparc/Makefile +++ b/usr/src/lib/libpicltree/sparc/Makefile @@ -23,9 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libpkg/Makefile b/usr/src/lib/libpkg/Makefile index 391b02ac28..e616711396 100644 --- a/usr/src/lib/libpkg/Makefile +++ b/usr/src/lib/libpkg/Makefile @@ -23,19 +23,18 @@ # Use is subject to license terms. # -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) all := TARGET = all install := TARGET = install clean := TARGET = clean clobber := TARGET = clobber _msg := TARGET = _msg -lint := TARGET = lint .KEEP_STATE: -all clean clobber install _msg lint: $(SUBDIRS) +all clean clobber install _msg: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libpkg/Makefile.com b/usr/src/lib/libpkg/Makefile.com index 227b3833d8..3776c70241 100644 --- a/usr/src/lib/libpkg/Makefile.com +++ b/usr/src/lib/libpkg/Makefile.com @@ -55,10 +55,9 @@ POFILE = libpkg.po MSGFILES = $(OBJECTS:%.o=../common/%.i) CLEANFILES += $(MSGFILES) -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -lscf -ladm @@ -83,7 +82,6 @@ $(POFILE): $(MSGFILES) _msg: $(MSGDOMAINPOFILE) -lint: lintcheck # include library targets include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libpkg/i386/Makefile b/usr/src/lib/libpkg/i386/Makefile index c86be4377c..d19fa69829 100644 --- a/usr/src/lib/libpkg/i386/Makefile +++ b/usr/src/lib/libpkg/i386/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libpkg/sparc/Makefile b/usr/src/lib/libpkg/sparc/Makefile index c86be4377c..d19fa69829 100644 --- a/usr/src/lib/libpkg/sparc/Makefile +++ b/usr/src/lib/libpkg/sparc/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libpool/Makefile b/usr/src/lib/libpool/Makefile index 83e995e15e..e846e65642 100644 --- a/usr/src/lib/libpool/Makefile +++ b/usr/src/lib/libpool/Makefile @@ -34,7 +34,6 @@ clobber := TARGET = clobber debug := TARGET = debug delete := TARGET = delete install := TARGET = install -lint := TARGET = lint # # Definitions for header files @@ -69,7 +68,7 @@ $(XMLDIR)/%: % .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(POFILE): pofile_MSGFILES diff --git a/usr/src/lib/libpool/amd64/Makefile b/usr/src/lib/libpool/amd64/Makefile index dd68231e26..010d484a50 100644 --- a/usr/src/lib/libpool/amd64/Makefile +++ b/usr/src/lib/libpool/amd64/Makefile @@ -23,10 +23,8 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libpool/i386/Makefile b/usr/src/lib/libpool/i386/Makefile index 7ce8809f98..1c3d6f6f01 100644 --- a/usr/src/lib/libpool/i386/Makefile +++ b/usr/src/lib/libpool/i386/Makefile @@ -23,11 +23,7 @@ # Copyright (c) 2001 by Sun Microsystems, Inc. # All rights reserved. # -#ident "%Z%%M% %I% %E% SMI" -# -# libpool/i386/Makefile -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libpool/sparc/Makefile b/usr/src/lib/libpool/sparc/Makefile index ef0dab25ca..e6f3c7b241 100644 --- a/usr/src/lib/libpool/sparc/Makefile +++ b/usr/src/lib/libpool/sparc/Makefile @@ -23,16 +23,11 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/libpool/sparc/Makefile -# include ../Makefile.com # # Turn off bad ptr-cast lint warnings, since we do them all the time # -LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libpool/sparcv9/Makefile b/usr/src/lib/libpool/sparcv9/Makefile index 8810f474f8..ba430ddac7 100644 --- a/usr/src/lib/libpool/sparcv9/Makefile +++ b/usr/src/lib/libpool/sparcv9/Makefile @@ -23,12 +23,8 @@ # Copyright (c) 2001 by Sun Microsystems, Inc. # All rights reserved. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libpool/sparcv9/Makefile -# include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libpp/Makefile b/usr/src/lib/libpp/Makefile index 30cbb5e49f..f5ebfd574b 100644 --- a/usr/src/lib/libpp/Makefile +++ b/usr/src/lib/libpp/Makefile @@ -34,14 +34,13 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint -_msg := TARGET= _msg +_msg := TARGET= _msg .KEEP_STATE: -all clean clobber install lint _msg: $(SUBDIRS) +all clean clobber install _msg: $(SUBDIRS) -LIBRARY= libpp.a +LIBRARY= libpp.a HDRS= \ pp.h \ diff --git a/usr/src/lib/libpp/Makefile.com b/usr/src/lib/libpp/Makefile.com index 0ea3146862..b42419ce01 100644 --- a/usr/src/lib/libpp/Makefile.com +++ b/usr/src/lib/libpp/Makefile.com @@ -66,13 +66,12 @@ MAPFILES= ../mapfile-vers # Set common AST build flags (e.g. C99/XPG6, needed to support the math stuff) include ../../../Makefile.ast -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += \ -last \ -lc -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) SRCDIR = ../common @@ -108,14 +107,14 @@ CERRWARN += -_gcc=-Wno-unused-value # "pplex() parse error: turning off implications after 60 seconds" SMATCH = off -pics/ppcall.o := CERRWARN += -erroff=E_INTEGER_OVERFLOW_DETECTED -pics/ppcontrol.o := CERRWARN += -erroff=E_INTEGER_OVERFLOW_DETECTED +pics/ppcall.o := CERRWARN += -erroff=E_INTEGER_OVERFLOW_DETECTED +pics/ppcontrol.o := CERRWARN += -erroff=E_INTEGER_OVERFLOW_DETECTED pics/ppcpp.o := CERRWARN += -erroff=E_INTEGER_OVERFLOW_DETECTED pics/ppexpr.o := CERRWARN += -erroff=E_INTEGER_OVERFLOW_DETECTED pics/pplex.o := CERRWARN += -erroff=E_INTEGER_OVERFLOW_DETECTED -pics/ppop.o := CERRWARN += -erroff=E_INTEGER_OVERFLOW_DETECTED -pics/ppsearch.o := CERRWARN += -erroff=E_INTEGER_OVERFLOW_DETECTED -pics/ppsearch.o := CERRWARN += -_gcc=-Wno-sequence-point +pics/ppop.o := CERRWARN += -erroff=E_INTEGER_OVERFLOW_DETECTED +pics/ppsearch.o := CERRWARN += -erroff=E_INTEGER_OVERFLOW_DETECTED +pics/ppsearch.o := CERRWARN += -_gcc=-Wno-sequence-point pics/pplex.o := CERRWARN += -_gcc=-Wno-implicit-fallthrough pics/ppcpp.o := CERRWARN += -_gcc=-Wno-implicit-fallthrough pics/ppproto.o := CERRWARN += -_gcc=-Wno-implicit-fallthrough @@ -124,12 +123,4 @@ pics/ppproto.o := CERRWARN += -_gcc=-Wno-implicit-fallthrough all: $(LIBS) -# -# libpp is not lint-clean yet; fake up a target. (You can use -# "make lintcheck" to actually run lint; please send all lint fixes -# upstream (to AT&T) so the next update will pull them into ON.) -# -lint: - @ print "usr/src/lib/libpp is not lint-clean: skipping" - include ../../Makefile.targ diff --git a/usr/src/lib/libpp/i386/Makefile b/usr/src/lib/libpp/i386/Makefile index 34cbd52eb3..0620d7d10f 100644 --- a/usr/src/lib/libpp/i386/Makefile +++ b/usr/src/lib/libpp/i386/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libpp/sparc/Makefile b/usr/src/lib/libpp/sparc/Makefile index 79cb51eae6..6c35d1fc88 100644 --- a/usr/src/lib/libpp/sparc/Makefile +++ b/usr/src/lib/libpp/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libpri/Makefile b/usr/src/lib/libpri/Makefile index b5fe8834e5..b7f59a2ed2 100644 --- a/usr/src/lib/libpri/Makefile +++ b/usr/src/lib/libpri/Makefile @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -32,24 +30,23 @@ HDRDIR = common ROOTHDRDIR = $(ROOT)/usr/platform/sun4v/include/sys -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber lint: $(SUBDIRS) +all clean clobber: $(SUBDIRS) check: $(CHECKHDRS) install: all .WAIT $(SUBDIRS) -install_h: $(ROOTHDRS) +install_h: $(ROOTHDRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libpri/Makefile.com b/usr/src/lib/libpri/Makefile.com index e320501b53..8cdd66f095 100644 --- a/usr/src/lib/libpri/Makefile.com +++ b/usr/src/lib/libpri/Makefile.com @@ -31,7 +31,7 @@ OBJECTS = $(LIBSRCS:%.c=%.o) include ../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common SRCS = $(LIBSRCS:%.c=$(SRCDIR)/%.c) @@ -42,19 +42,13 @@ CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS) LDLIBS += -lc -LINTFLAGS = -msux -LINTFLAGS64 = -msux -m64 -$(LINTLIB) := SRCS = $(LINTSRC:%=$(SRCDIR)/%) -$(LINTLIB) := LINTFLAGS = -nsvx -I$(ROOT)/usr/platform/sun4v/include -$(LINTLIB) := LINTFLAGS64 = -nsvx -m64 \ -I$(ROOT)/usr/platform/sun4v/include .KEEP_STATE: all: $(LIBS) -lint: $(LINTLIB) lintcheck pics/%.o: $(SRCDIR)/%.c $(COMPILE.c) -o $@ $< diff --git a/usr/src/lib/libpri/sparc/Makefile b/usr/src/lib/libpri/sparc/Makefile index f91f0270e9..2845cd3c2d 100644 --- a/usr/src/lib/libpri/sparc/Makefile +++ b/usr/src/lib/libpri/sparc/Makefile @@ -22,9 +22,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libpri/sparcv9/Makefile b/usr/src/lib/libpri/sparcv9/Makefile index a9d4d275db..9889ba1f77 100644 --- a/usr/src/lib/libpri/sparcv9/Makefile +++ b/usr/src/lib/libpri/sparcv9/Makefile @@ -22,10 +22,8 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libproc/amd64/Makefile b/usr/src/lib/libproc/amd64/Makefile index 84965cdd48..2d6bf59aa3 100644 --- a/usr/src/lib/libproc/amd64/Makefile +++ b/usr/src/lib/libproc/amd64/Makefile @@ -32,4 +32,4 @@ include ../../Makefile.lib.64 CPPFLAGS += -D_SYSCALL32 LDLIBS += -lsaveargs -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libproc/i386/Makefile b/usr/src/lib/libproc/i386/Makefile index af76f5ab90..59045395eb 100644 --- a/usr/src/lib/libproc/i386/Makefile +++ b/usr/src/lib/libproc/i386/Makefile @@ -23,9 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libproc/sparc/Makefile b/usr/src/lib/libproc/sparc/Makefile index c56fff345b..59045395eb 100644 --- a/usr/src/lib/libproc/sparc/Makefile +++ b/usr/src/lib/libproc/sparc/Makefile @@ -23,9 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libproc/sparcv9/Makefile b/usr/src/lib/libproc/sparcv9/Makefile index 1d1381a640..4e969f17a0 100644 --- a/usr/src/lib/libproc/sparcv9/Makefile +++ b/usr/src/lib/libproc/sparcv9/Makefile @@ -31,4 +31,4 @@ include ../../Makefile.lib.64 CPPFLAGS += -D_SYSCALL32 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libproject/Makefile b/usr/src/lib/libproject/Makefile index 2776f9bc2a..95c9786558 100644 --- a/usr/src/lib/libproject/Makefile +++ b/usr/src/lib/libproject/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -34,11 +32,10 @@ all:= TARGET= all clean:= TARGET= clean clobber:= TARGET= clobber install:= TARGET= install -lint:= TARGET= lint .KEEP_STATE: -all clean clobber delete install lint package: $(SUBDIRS) +all clean clobber delete install package: $(SUBDIRS) _msg: diff --git a/usr/src/lib/libproject/Makefile.com b/usr/src/lib/libproject/Makefile.com index 333dc5fcf7..bc203548c0 100644 --- a/usr/src/lib/libproject/Makefile.com +++ b/usr/src/lib/libproject/Makefile.com @@ -36,15 +36,7 @@ include ../../Makefile.lib SRCDIR = ../common -LIBS = $(DYNLIB) $(LINTLIB) - -LINTOUT = lint.out - -LINTSRC = $(LINTLIB:%.ln=%) -ROOTLINTDIR = $(ROOTLIBDIR) -ROOTLINT = $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES += $(LINTOUT) $(LINTLIB) +LIBS = $(DYNLIB) CPPFLAGS += -D_REENTRANT CFLAGS += $(CCVERBOSE) @@ -52,13 +44,11 @@ CERRWARN += -_gcc=-Wno-parentheses CERRWARN += $(CNOWARN_UNINIT) LDLIBS += -lc -lsecdb -lproc -lpool -$(LINTLIB) := SRCS = ../common/llib-lproject .KEEP_STATE: all: $(LIBS) -lint: lintcheck # include library targets include ../../Makefile.targ @@ -66,7 +56,3 @@ include ../../Makefile.targ pics/%.o: ../common/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) - -# install rule for lint library target -$(ROOTLINTDIR)/%: ../common/% - $(INS.file) diff --git a/usr/src/lib/libproject/amd64/Makefile b/usr/src/lib/libproject/amd64/Makefile index 72daafe13a..e83ea671a3 100644 --- a/usr/src/lib/libproject/amd64/Makefile +++ b/usr/src/lib/libproject/amd64/Makefile @@ -22,12 +22,10 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libproject/i386/Makefile b/usr/src/lib/libproject/i386/Makefile index 50cbcb01b9..fdba8b0416 100644 --- a/usr/src/lib/libproject/i386/Makefile +++ b/usr/src/lib/libproject/i386/Makefile @@ -22,11 +22,9 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libproject/sparc/Makefile b/usr/src/lib/libproject/sparc/Makefile index 50cbcb01b9..fdba8b0416 100644 --- a/usr/src/lib/libproject/sparc/Makefile +++ b/usr/src/lib/libproject/sparc/Makefile @@ -22,11 +22,9 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libproject/sparcv9/Makefile b/usr/src/lib/libproject/sparcv9/Makefile index 72daafe13a..e83ea671a3 100644 --- a/usr/src/lib/libproject/sparcv9/Makefile +++ b/usr/src/lib/libproject/sparcv9/Makefile @@ -22,12 +22,10 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libprtdiag/Makefile b/usr/src/lib/libprtdiag/Makefile index 6a1f2a7e69..ccfc9fed9d 100644 --- a/usr/src/lib/libprtdiag/Makefile +++ b/usr/src/lib/libprtdiag/Makefile @@ -23,10 +23,6 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libprtdiag/Makefile -# include $(SRC)/lib/Makefile.lib @@ -36,12 +32,11 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all install clean clobber lint _msg : $(SUBDIRS) +all install clean clobber _msg: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libprtdiag/Makefile.com b/usr/src/lib/libprtdiag/Makefile.com index 406fcfc96f..9542ceed94 100644 --- a/usr/src/lib/libprtdiag/Makefile.com +++ b/usr/src/lib/libprtdiag/Makefile.com @@ -29,7 +29,7 @@ # confuse make # CLASS = 32 -UTSBASE = $(SRC)/uts +UTSBASE = $(SRC)/uts LIBRARY = libprtdiag.a VERS = .1 @@ -37,7 +37,7 @@ VERS = .1 include $(SRC)/lib/Makefile.lib include $(SRC)/Makefile.psm -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) IFLAGS = -I ../../inc -I $(USR_PSM_INCL_DIR) IFLAGS += -I $(SRC)/cmd/picl/plugins/inc IFLAGS += -I $(UTSBASE)/sun4u @@ -56,8 +56,6 @@ DYNFLAGS += -Wl,-f/usr/platform/\$$PLATFORM/lib/$(DYNLIBPSR) MAPFILES = SRCDIR = ../../common -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -USR_PSMLINT= $(LINTSRC:%=$(USR_PSM_LIB_DIR)/%) # # install rule diff --git a/usr/src/lib/libprtdiag/sparc/Makefile b/usr/src/lib/libprtdiag/sparc/Makefile index 71383e8afa..559f94d289 100644 --- a/usr/src/lib/libprtdiag/sparc/Makefile +++ b/usr/src/lib/libprtdiag/sparc/Makefile @@ -23,22 +23,18 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# lib/libprtdiag/sparc/Makefile -# -#ident "%Z%%M% %I% %E% SMI" -# + SUBDIRS= sun4u sun4v all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all install clean clobber lint _msg : $(SUBDIRS) +all install clean clobber _msg: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libprtdiag/sparc/sun4u/Makefile b/usr/src/lib/libprtdiag/sparc/sun4u/Makefile index a0ed81ff8d..53716929ca 100644 --- a/usr/src/lib/libprtdiag/sparc/sun4u/Makefile +++ b/usr/src/lib/libprtdiag/sparc/sun4u/Makefile @@ -53,9 +53,8 @@ GREP= grep all: $(LIBS) -install: all $(USR_PSM_LIBS) $(USR_PSMLINT) +install: all $(USR_PSM_LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libprtdiag/sparc/sun4v/Makefile b/usr/src/lib/libprtdiag/sparc/sun4v/Makefile index 67d4763704..0dd124f313 100644 --- a/usr/src/lib/libprtdiag/sparc/sun4v/Makefile +++ b/usr/src/lib/libprtdiag/sparc/sun4v/Makefile @@ -54,7 +54,6 @@ all: $(LIBS) install: all $(USR_PSM_LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libprtdiag_psr/Makefile b/usr/src/lib/libprtdiag_psr/Makefile index d52784045d..ca93f05471 100644 --- a/usr/src/lib/libprtdiag_psr/Makefile +++ b/usr/src/lib/libprtdiag_psr/Makefile @@ -23,26 +23,22 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libprtdiag_psr/Makefile include $(SRC)/Makefile.master -SUBDIRS= $(MACH) +SUBDIRS= $(MACH) all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint package := TARGET= package _msg := TARGET= _msg .KEEP_STATE: -all clean clobber delete install lint package _msg: $(SUBDIRS) +all clean clobber delete install package _msg: $(SUBDIRS) $(MACH) $(MACH64): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libprtdiag_psr/sparc/Makefile b/usr/src/lib/libprtdiag_psr/sparc/Makefile index 5ca9074498..84fdc20ebf 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/Makefile @@ -23,14 +23,12 @@ # Use is subject to license terms. # Copyright 2020 Peter Tribble. # -# lib/libprtdiag_psr/sparc/Makefile PRTDIAG_PLATFORMS= desktop tazmo javelin serengeti \ littleneck daktari cherrystone \ lw8 ontario schumacher opl montoya monza all := TARGET= all -lint := TARGET= lint clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install @@ -38,7 +36,7 @@ _msg := TARGET= _msg .KEEP_STATE: -all lint clean clobber install _msg : $(PRTDIAG_PLATFORMS) +all clean clobber install _msg: $(PRTDIAG_PLATFORMS) $(PRTDIAG_PLATFORMS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libprtdiag_psr/sparc/Makefile.com b/usr/src/lib/libprtdiag_psr/sparc/Makefile.com index d3f93b3e06..87d15f16a8 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/Makefile.com +++ b/usr/src/lib/libprtdiag_psr/sparc/Makefile.com @@ -67,7 +67,6 @@ INS.slink6= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/libprtdiag_psr.so.1 $@ all: $(LIBS) -lint: lintcheck # include library targets include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libprtdiag_psr/sparc/cherrystone/Makefile b/usr/src/lib/libprtdiag_psr/sparc/cherrystone/Makefile index eb842af94d..133eddf3f0 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/cherrystone/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/cherrystone/Makefile @@ -37,7 +37,6 @@ IFLAGS += -I$(UTSBASE)/sun4u LDLIBS += -lpicl -LINTFLAGS += $(IFLAGS) # # links in /usr/platform diff --git a/usr/src/lib/libprtdiag_psr/sparc/daktari/Makefile b/usr/src/lib/libprtdiag_psr/sparc/daktari/Makefile index adac196b93..349689bba7 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/daktari/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/daktari/Makefile @@ -35,7 +35,6 @@ IFLAGS += -I$(USR_PLAT_DIR)/sun4u/include -I ../../../libprtdiag/inc IFLAGS += -I $(SRC)/cmd/picl/plugins/sun4u/psvc/psvcobj LDLIBS += -lpicl -LINTFLAGS += $(IFLAGS) # # links in /usr/platform diff --git a/usr/src/lib/libprtdiag_psr/sparc/desktop/Makefile b/usr/src/lib/libprtdiag_psr/sparc/desktop/Makefile index 713cc7d570..29763cd3d0 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/desktop/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/desktop/Makefile @@ -23,14 +23,10 @@ # Copyright (c) 2000 by Sun Microsystems, Inc. # All rights reserved. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libprtdiag_psr/sparc/desktop/Makefile PRTDIAG_DIRS= nonpicl picl all := TARGET= all -lint := TARGET= lint clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install @@ -38,7 +34,7 @@ _msg := TARGET= _msg .KEEP_STATE: -all lint clean clobber install _msg : $(PRTDIAG_DIRS) +all clean clobber install _msg: $(PRTDIAG_DIRS) $(PRTDIAG_DIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libprtdiag_psr/sparc/desktop/nonpicl/Makefile b/usr/src/lib/libprtdiag_psr/sparc/desktop/nonpicl/Makefile index b447b1ba00..4fda9aa997 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/desktop/nonpicl/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/desktop/nonpicl/Makefile @@ -37,21 +37,19 @@ include $(SRC)/lib/libprtdiag_psr/sparc/Makefile.com SRCS= $(OBJECTS:%.o=../common/%.c) IFLAGS += -I$(USR_PLAT_DIR)/sun4u/include -I ../../../../libprtdiag/inc -LINTFLAGS += $(IFLAGS) # -# desktop platform library should install into -# SUNW,Ultra-2. All other desktop platforms can -# link to /usr/platform/SUNW,Ultra-2/lib/libprtdiag_psr.so +# desktop platform library should install into SUNW,Ultra-2. All other desktop +# platforms can link to /usr/platform/SUNW,Ultra-2/lib/libprtdiag_psr.so # PLATFORM=SUNW,Ultra-2 # -# For all other sun4u platforms NOT delivered by ON (ie. delivered -# by SME or external hardware vendors) we add a default library in -# /usr/platform/sun4u/lib so that prtdiag will default to using -# the desktop library for any of these platforms. (this will be a -# link to ../../SUNW,Ultra-2/lib +# For all other sun4u platforms NOT delivered by ON (ie. delivered by SME or +# external hardware vendors) we add a default library in +# /usr/platform/sun4u/lib so that prtdiag will default to using the desktop +# library for any of these platforms. (this will be a link to +# ../../SUNW,Ultra-2/lib # DEF_PLATFORM=sun4u USR_DEF_PSM_LIB_DIR=$(USR_PLAT_DIR)/$(DEF_PLATFORM)/lib diff --git a/usr/src/lib/libprtdiag_psr/sparc/desktop/picl/Makefile b/usr/src/lib/libprtdiag_psr/sparc/desktop/picl/Makefile index e9c653d7d7..9767ab9336 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/desktop/picl/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/desktop/picl/Makefile @@ -41,7 +41,6 @@ LDLIBS += -lpicl IFLAGS += -I$(USR_PLAT_DIR)/sun4u/include -I ../../../../libprtdiag/inc IFLAGS += -I$(SRC)/cmd/picl/plugins/inc -LINTFLAGS += $(IFLAGS) # # links in /usr/platform diff --git a/usr/src/lib/libprtdiag_psr/sparc/javelin/Makefile b/usr/src/lib/libprtdiag_psr/sparc/javelin/Makefile index 3b65b1c4be..a675de5898 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/javelin/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/javelin/Makefile @@ -31,7 +31,6 @@ PLATFORM_OBJECTS= javelin.o include ../Makefile.com IFLAGS += -I$(USR_PLAT_DIR)/sun4u/include -I ../../../libprtdiag/inc -LINTFLAGS += $(IFLAGS) LDLIBS += -lkstat # diff --git a/usr/src/lib/libprtdiag_psr/sparc/littleneck/Makefile b/usr/src/lib/libprtdiag_psr/sparc/littleneck/Makefile index 938709691a..267ad48201 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/littleneck/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/littleneck/Makefile @@ -36,7 +36,6 @@ IFLAGS += -I$(UTSBASE)/sun4u LDLIBS += -lpicl -LINTFLAGS += $(IFLAGS) # # Workgroup Server platform library should install into diff --git a/usr/src/lib/libprtdiag_psr/sparc/lw8/Makefile b/usr/src/lib/libprtdiag_psr/sparc/lw8/Makefile index b11de316ea..6ddc90fd5a 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/lw8/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/lw8/Makefile @@ -23,14 +23,10 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libprtdiag_psr/sparc/lw8/Makefile PRTDIAG_DIRS= picl all := TARGET= all -lint := TARGET= lint clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install @@ -38,7 +34,7 @@ _msg := TARGET= _msg .KEEP_STATE: -all lint clean clobber install _msg : $(PRTDIAG_DIRS) +all clean clobber install _msg: $(PRTDIAG_DIRS) $(PRTDIAG_DIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libprtdiag_psr/sparc/lw8/picl/Makefile b/usr/src/lib/libprtdiag_psr/sparc/lw8/picl/Makefile index e88bc2180c..c9aedffdb4 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/lw8/picl/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/lw8/picl/Makefile @@ -41,7 +41,6 @@ LDLIBS += -lpicl IFLAGS += -I$(USR_PLAT_DIR)/sun4u/include -I ../../../../libprtdiag/inc IFLAGS += -I$(SRC)/cmd/picl/plugins/inc -LINTFLAGS += $(IFLAGS) PLATFORM= SUNW,Netra-T12 @@ -51,7 +50,7 @@ $(USR_PLAT_DIR)/$(PLATFORM)/lib/libprtdiag_psr.so.1 := FILEMODE= 0755 PLATLIBS= $(PLATFORM:%=$(USR_PLAT_DIR)/%/lib/) -install: all $(PLATLIBS) $(USR_PSM_LIBS) +install: all $(PLATLIBS) $(USR_PSM_LIBS) # # install rules for SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1 diff --git a/usr/src/lib/libprtdiag_psr/sparc/montoya/Makefile b/usr/src/lib/libprtdiag_psr/sparc/montoya/Makefile index 424ef58118..f4d803ccee 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/montoya/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/montoya/Makefile @@ -40,7 +40,6 @@ IFLAGS += -I ../../../libprtdiag/inc IFLAGS += -I$(SRC)/cmd/picl/plugins/inc LDLIBS += -lpicl -LINTFLAGS += $(IFLAGS) PLATFORM=SUNW,Netra-CP3060 diff --git a/usr/src/lib/libprtdiag_psr/sparc/monza/Makefile b/usr/src/lib/libprtdiag_psr/sparc/monza/Makefile index 772dbd462b..2b940c10a2 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/monza/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/monza/Makefile @@ -39,7 +39,6 @@ IFLAGS += -I ../../../libprtdiag/inc IFLAGS += -I$(SRC)/cmd/picl/plugins/inc LDLIBS += -lpicl -LINTFLAGS += $(IFLAGS) PLATFORM=SUNW,Netra-CP3260 diff --git a/usr/src/lib/libprtdiag_psr/sparc/ontario/Makefile b/usr/src/lib/libprtdiag_psr/sparc/ontario/Makefile index 062a657321..830d4837ff 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/ontario/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/ontario/Makefile @@ -34,7 +34,7 @@ include ../Makefile.com # # links in /usr/platform # -LINKED_PLATFORMS = SUNW,Sun-Blade-T6300 +LINKED_PLATFORMS = SUNW,Sun-Blade-T6300 LINKED_DIRS = $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%) LINKED_LIB_DIRS = $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib) @@ -50,7 +50,6 @@ IFLAGS += -I ../../../libprtdiag/inc IFLAGS += -I$(SRC)/cmd/picl/plugins/inc LDLIBS += -lpicl -LINTFLAGS += $(IFLAGS) PLATFORM=SUNW,Sun-Fire-T200 diff --git a/usr/src/lib/libprtdiag_psr/sparc/opl/Makefile b/usr/src/lib/libprtdiag_psr/sparc/opl/Makefile index 0927dae05b..1de18e8f8a 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/opl/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/opl/Makefile @@ -34,7 +34,6 @@ IFLAGS += -I$(USR_PLAT_DIR)/sun4u/include -I ../../../libprtdiag/inc IFLAGS += -I$(SRC)/uts/common/ -I$(SRC)/cmd/picl/plugins/inc LDLIBS += -lpicl -lkstat -LINTFLAGS += $(IFLAGS) #IMPLEMENTED_PLATFORM = SUNW,OPL-Enterprise #PLATFORM=$(IMPLEMENTED_PLATFORM) diff --git a/usr/src/lib/libprtdiag_psr/sparc/schumacher/Makefile b/usr/src/lib/libprtdiag_psr/sparc/schumacher/Makefile index 60290b9370..a7dac3fd5b 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/schumacher/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/schumacher/Makefile @@ -23,14 +23,10 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libprtdiag_psr/sparc/schumacher/Makefile PRTDIAG_DIRS= picl all := TARGET= all -lint := TARGET= lint clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install @@ -38,7 +34,7 @@ _msg := TARGET= _msg .KEEP_STATE: -all lint clean clobber install _msg : $(PRTDIAG_DIRS) +all clean clobber install _msg: $(PRTDIAG_DIRS) $(PRTDIAG_DIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libprtdiag_psr/sparc/schumacher/picl/Makefile b/usr/src/lib/libprtdiag_psr/sparc/schumacher/picl/Makefile index dfdb093e46..4231a0d243 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/schumacher/picl/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/schumacher/picl/Makefile @@ -40,7 +40,6 @@ LDLIBS += -lpicl IFLAGS += -I$(USR_PLAT_DIR)/sun4u/include -I ../../../../libprtdiag/inc IFLAGS += -I$(SRC)/cmd/picl/plugins/inc -LINTFLAGS += $(IFLAGS) PLATFORM= SUNW,Netra-CP3010 diff --git a/usr/src/lib/libprtdiag_psr/sparc/serengeti/Makefile b/usr/src/lib/libprtdiag_psr/sparc/serengeti/Makefile index 273b56f5d3..3415766fef 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/serengeti/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/serengeti/Makefile @@ -33,7 +33,6 @@ include ../Makefile.com IFLAGS += -I$(USR_PLAT_DIR)/sun4u/include -I ../../../libprtdiag/inc IFLAGS += -I$(UTSBASE)/sun4u/serengeti IFLAGS += -I$(UTSBASE)/sun4u -LINTFLAGS += $(IFLAGS) LDLIBS += -lcfgadm diff --git a/usr/src/lib/libprtdiag_psr/sparc/tazmo/Makefile b/usr/src/lib/libprtdiag_psr/sparc/tazmo/Makefile index b05844393b..421528e57e 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/tazmo/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/tazmo/Makefile @@ -31,7 +31,6 @@ PLATFORM_OBJECTS= tazmo.o include ../Makefile.com IFLAGS += -I$(USR_PLAT_DIR)/sun4u/include -I ../../../libprtdiag/inc -LINTFLAGS += $(IFLAGS) LDLIBS += -lkstat # diff --git a/usr/src/lib/libpthread/Makefile b/usr/src/lib/libpthread/Makefile index 6cb7a4fa8a..ef1592a4a5 100644 --- a/usr/src/lib/libpthread/Makefile +++ b/usr/src/lib/libpthread/Makefile @@ -36,7 +36,6 @@ install := TARGET= install all clean clobber install: $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libpthread/Makefile.com b/usr/src/lib/libpthread/Makefile.com index cd435324e8..a6d291711c 100644 --- a/usr/src/lib/libpthread/Makefile.com +++ b/usr/src/lib/libpthread/Makefile.com @@ -27,5 +27,4 @@ VERS = .1 include $(SRC)/lib/Makefile.rootfs -LIBS += $(LINTLIB) DYNFLAGS += -F libc.so.1 diff --git a/usr/src/lib/libpthread/amd64/Makefile b/usr/src/lib/libpthread/amd64/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libpthread/amd64/Makefile +++ b/usr/src/lib/libpthread/amd64/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libpthread/i386/Makefile b/usr/src/lib/libpthread/i386/Makefile index 4e4e8c02a9..682e5560ca 100644 --- a/usr/src/lib/libpthread/i386/Makefile +++ b/usr/src/lib/libpthread/i386/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libpthread/sparc/Makefile b/usr/src/lib/libpthread/sparc/Makefile index 4e4e8c02a9..682e5560ca 100644 --- a/usr/src/lib/libpthread/sparc/Makefile +++ b/usr/src/lib/libpthread/sparc/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libpthread/sparcv9/Makefile b/usr/src/lib/libpthread/sparcv9/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libpthread/sparcv9/Makefile +++ b/usr/src/lib/libpthread/sparcv9/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libraidcfg/Makefile b/usr/src/lib/libraidcfg/Makefile index c264499eb8..542051b1c8 100644 --- a/usr/src/lib/libraidcfg/Makefile +++ b/usr/src/lib/libraidcfg/Makefile @@ -23,10 +23,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/libraidcfg/Makefile -# include $(SRC)/lib/Makefile.lib @@ -43,11 +39,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libraidcfg/Makefile.com b/usr/src/lib/libraidcfg/Makefile.com index b3643c2d6b..8decd78160 100644 --- a/usr/src/lib/libraidcfg/Makefile.com +++ b/usr/src/lib/libraidcfg/Makefile.com @@ -31,11 +31,10 @@ OBJECTS = raidcfg.o include ../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -ldevinfo -lc SRCDIR = ../common -$(LINTLIB):= SRCS = $(LINTSRC:%=$(SRCDIR)/%) CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-type-limits @@ -49,6 +48,5 @@ all: $(LIBS) SECLEVEL = standard -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libraidcfg/i386/Makefile b/usr/src/lib/libraidcfg/i386/Makefile index f8ddafac61..315cf36360 100644 --- a/usr/src/lib/libraidcfg/i386/Makefile +++ b/usr/src/lib/libraidcfg/i386/Makefile @@ -23,9 +23,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libraidcfg/sparc/Makefile b/usr/src/lib/libraidcfg/sparc/Makefile index f8ddafac61..315cf36360 100644 --- a/usr/src/lib/libraidcfg/sparc/Makefile +++ b/usr/src/lib/libraidcfg/sparc/Makefile @@ -23,9 +23,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/librcm/Makefile b/usr/src/lib/librcm/Makefile index 1640557189..46c7443d51 100644 --- a/usr/src/lib/librcm/Makefile +++ b/usr/src/lib/librcm/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -31,11 +29,10 @@ SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) # conditional assignments -all := TARGET= all +all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint test := TARGET= test # definitions for install_h target @@ -46,7 +43,7 @@ CHECKHDRS= $(HDRS:%.h=%.check) .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) # install rule for install_h target diff --git a/usr/src/lib/librcm/Makefile.com b/usr/src/lib/librcm/Makefile.com index cecf34f9fc..991c03c434 100644 --- a/usr/src/lib/librcm/Makefile.com +++ b/usr/src/lib/librcm/Makefile.com @@ -32,9 +32,8 @@ include ../../Makefile.lib # install this library in the root filesystem include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -lnvpair -$(LINTLIB) := SRCS = ../llib-lrcm CFLAGS += $(CCVERBOSE) @@ -44,6 +43,5 @@ CERRWARN += -_gcc=-Wno-parentheses all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/librcm/amd64/Makefile b/usr/src/lib/librcm/amd64/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/librcm/amd64/Makefile +++ b/usr/src/lib/librcm/amd64/Makefile @@ -23,10 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/librcm/i386/Makefile b/usr/src/lib/librcm/i386/Makefile index af76f5ab90..59045395eb 100644 --- a/usr/src/lib/librcm/i386/Makefile +++ b/usr/src/lib/librcm/i386/Makefile @@ -23,9 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/librcm/sparc/Makefile b/usr/src/lib/librcm/sparc/Makefile index af76f5ab90..59045395eb 100644 --- a/usr/src/lib/librcm/sparc/Makefile +++ b/usr/src/lib/librcm/sparc/Makefile @@ -23,9 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/librcm/sparcv9/Makefile b/usr/src/lib/librcm/sparcv9/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/librcm/sparcv9/Makefile +++ b/usr/src/lib/librcm/sparcv9/Makefile @@ -23,10 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libreparse/Makefile b/usr/src/lib/libreparse/Makefile index 1f0e0b4647..5a2c4f2892 100644 --- a/usr/src/lib/libreparse/Makefile +++ b/usr/src/lib/libreparse/Makefile @@ -37,11 +37,10 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libreparse/Makefile.com b/usr/src/lib/libreparse/Makefile.com index ca913755fe..d1f306d27f 100644 --- a/usr/src/lib/libreparse/Makefile.com +++ b/usr/src/lib/libreparse/Makefile.com @@ -36,19 +36,17 @@ include ../../Makefile.lib SRCDIR = ../common SRCS = $(LOCOBJS:%.o=$(SRCDIR)/%.c) $(COMOBJS:%.o=$(COMDIR)/%.c) -LIBS = $(DYNLIB) $(LINTLIB) -LDLIBS += -lc -lnvpair +LIBS = $(DYNLIB) +LDLIBS += -lc -lnvpair CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(COMDIR) -D_FILE_OFFSET_BITS=64 -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) .KEEP_STATE: all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libreparse/amd64/Makefile b/usr/src/lib/libreparse/amd64/Makefile index 036c13779e..8680082937 100644 --- a/usr/src/lib/libreparse/amd64/Makefile +++ b/usr/src/lib/libreparse/amd64/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libreparse/i386/Makefile b/usr/src/lib/libreparse/i386/Makefile index c86be4377c..d19fa69829 100644 --- a/usr/src/lib/libreparse/i386/Makefile +++ b/usr/src/lib/libreparse/i386/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libreparse/sparc/Makefile b/usr/src/lib/libreparse/sparc/Makefile index c86be4377c..d19fa69829 100644 --- a/usr/src/lib/libreparse/sparc/Makefile +++ b/usr/src/lib/libreparse/sparc/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libreparse/sparcv9/Makefile b/usr/src/lib/libreparse/sparcv9/Makefile index 036c13779e..8680082937 100644 --- a/usr/src/lib/libreparse/sparcv9/Makefile +++ b/usr/src/lib/libreparse/sparcv9/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libresolv/Makefile b/usr/src/lib/libresolv/Makefile index 890a36db45..d74c41ecfb 100644 --- a/usr/src/lib/libresolv/Makefile +++ b/usr/src/lib/libresolv/Makefile @@ -66,15 +66,16 @@ SMATCH=off ROOTDYNLIBS= $(DYNLIB:%=$(ROOTLIBDIR)/%) +COMPATLINKS= usr/lib/$(DYNLIB) + .KEEP_STATE: LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTDYNLIBS) +install: all $(ROOTDYNLIBS) $(ROOTCOMPATLINKS) -lint: lintcheck # include library targets include ../Makefile.targ diff --git a/usr/src/lib/libresolv2/Makefile b/usr/src/lib/libresolv2/Makefile index 2e9e919762..2433a55436 100644 --- a/usr/src/lib/libresolv2/Makefile +++ b/usr/src/lib/libresolv2/Makefile @@ -47,10 +47,9 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg -LIBRARY= libresolv.a +LIBRARY= libresolv.a TEXT_DOMAIN= SUNW_OST_OSLIB XGETFLAGS= -a POFILE= $(LIBRARY:.a=.po) @@ -61,7 +60,7 @@ GREP= grep .KEEP_STATE: -all clean clobber lint: $(SUBDIRS) +all clean clobber: $(SUBDIRS) install: $(SUBDIRS) $(ROOTMANIFEST) $(ROOTSVCMETHOD) @@ -71,11 +70,11 @@ $(MANIFESTDIR): $(INS.dir) $(MANIFESTDIR)/%: % - $(INS.file) + $(INS.file) $(ROOTSVCMETHOD): $(SVCMETHODDIR) $(SVCMETHODDIR): - $(INS.dir) + $(INS.dir) $(SVCMETHODDIR)/%: % $(INS.file) diff --git a/usr/src/lib/libresolv2/Makefile.com b/usr/src/lib/libresolv2/Makefile.com index 35e1eca77c..febdc71e86 100644 --- a/usr/src/lib/libresolv2/Makefile.com +++ b/usr/src/lib/libresolv2/Makefile.com @@ -27,7 +27,7 @@ LIBRARY= libresolv.a VERS= .2 -BSDOBJS= putenv.o strcasecmp.o strsep.o \ +BSDOBJS= putenv.o strcasecmp.o strsep.o \ ftruncate.o readv.o strdup.o strtoul.o \ gettimeofday.o setenv.o strerror.o utimes.o \ mktemp.o setitimer.o strpbrk.o writev.o @@ -36,30 +36,30 @@ DSTOBJS= dst_api.o support.o hmac_link.o # inet_addr, inet_pton, inet_ntop, and inet_ntoa removed due to overlap with # libnsl -INETOBJS= inet_net_pton.o inet_neta.o inet_lnaof.o \ - inet_netof.o nsap_addr.o inet_makeaddr.o \ +INETOBJS= inet_net_pton.o inet_neta.o inet_lnaof.o \ + inet_netof.o nsap_addr.o inet_makeaddr.o \ inet_network.o inet_net_ntop.o inet_cidr_ntop.o \ - inet_cidr_pton.o inet_data.o + inet_cidr_pton.o inet_data.o # build only the IRS objects that the ISC libbind's make would -IRSTHROBJS= gethostent_r.o getnetent_r.o getnetgrent_r.o \ +IRSTHROBJS= gethostent_r.o getnetent_r.o getnetgrent_r.o \ getprotoent_r.o getservent_r.o IRSOBJS= ${IRSTHROBJS} \ dns.o dns_ho.o dns_nw.o dns_pr.o \ dns_sv.o gai_strerror.o gen.o gen_ho.o \ gen_ng.o gen_nw.o gen_pr.o gen_sv.o \ getaddrinfo.o gethostent.o getnameinfo.o getnetent.o \ - getnetgrent.o getprotoent.o getservent.o hesiod.o \ - irp.o irp_ho.o irp_ng.o irp_nw.o \ + getnetgrent.o getprotoent.o getservent.o hesiod.o \ + irp.o irp_ho.o irp_ng.o irp_nw.o \ irp_pr.o irp_sv.o irpmarshall.o irs_data.o \ lcl.o lcl_ho.o lcl_ng.o lcl_nw.o \ - lcl_pr.o lcl_sv.o nis.o nul_ng.o \ + lcl_pr.o lcl_sv.o nis.o nul_ng.o \ util.o ISCOBJS= assertions.o base64.o bitncmp.o ctl_clnt.o \ - ctl_p.o ctl_srvr.o ev_connects.o ev_files.o \ + ctl_p.o ctl_srvr.o ev_connects.o ev_files.o \ ev_streams.o ev_timers.o ev_waits.o eventlib.o \ - heap.o hex.o logging.o memcluster.o \ + heap.o hex.o logging.o memcluster.o \ movefile.o tree.o NAMESEROBJS= ns_date.o ns_name.o ns_netint.o ns_parse.o \ @@ -95,9 +95,8 @@ SRCS= $(BSDOBJS:%.o=../common/bsd/%.c) \ $(RESOLVOBJS:%.o=../common/resolv/%.c) \ $(SUNWOBJS:%.o=../common/sunw/%.c) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) -$(LINTLIB):= SRCS = ../common/llib-lresolv # Local Libresolv definitions @@ -123,7 +122,6 @@ LDLIBS += -lsocket -lnsl -lc -lmd all: $(LIBS) -lint: lintcheck # include library targets include ../../Makefile.targ @@ -159,7 +157,3 @@ pics/%.o: ../common/resolv/%.c pics/%.o: ../common/sunw/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) - -# install rule for lint library target -$(ROOTLINTDIR)/%: ../common/% - $(INS.file) diff --git a/usr/src/lib/libresolv2/amd64/Makefile b/usr/src/lib/libresolv2/amd64/Makefile index 2e8cdecf75..6782495649 100644 --- a/usr/src/lib/libresolv2/amd64/Makefile +++ b/usr/src/lib/libresolv2/amd64/Makefile @@ -22,10 +22,10 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libresolv2/i386/Makefile b/usr/src/lib/libresolv2/i386/Makefile index a333224278..cf2087e71e 100644 --- a/usr/src/lib/libresolv2/i386/Makefile +++ b/usr/src/lib/libresolv2/i386/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libresolv2/include/Makefile b/usr/src/lib/libresolv2/include/Makefile index b7271c0617..bdc41c7d19 100644 --- a/usr/src/lib/libresolv2/include/Makefile +++ b/usr/src/lib/libresolv2/include/Makefile @@ -36,7 +36,7 @@ install := TARGET= install .KEEP_STATE: -all lint: $(HDRS) +all: $(HDRS) install: all diff --git a/usr/src/lib/libresolv2/sparc/Makefile b/usr/src/lib/libresolv2/sparc/Makefile index a333224278..cf2087e71e 100644 --- a/usr/src/lib/libresolv2/sparc/Makefile +++ b/usr/src/lib/libresolv2/sparc/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libresolv2/sparcv9/Makefile b/usr/src/lib/libresolv2/sparcv9/Makefile index 2095629575..c88ec03a10 100644 --- a/usr/src/lib/libresolv2/sparcv9/Makefile +++ b/usr/src/lib/libresolv2/sparcv9/Makefile @@ -33,4 +33,4 @@ include ../../Makefile.lib.64 sparcv9_C_PICFLAGS = $(sparcv9_C_BIGPICFLAGS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/librestart/Makefile b/usr/src/lib/librestart/Makefile index b88c1c5b27..24cae23426 100644 --- a/usr/src/lib/librestart/Makefile +++ b/usr/src/lib/librestart/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -34,14 +32,13 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint HDRDIR = common HDRS = librestart.h librestart_priv.h .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/librestart/Makefile.com b/usr/src/lib/librestart/Makefile.com index f2a0fc8965..3d06282c5e 100644 --- a/usr/src/lib/librestart/Makefile.com +++ b/usr/src/lib/librestart/Makefile.com @@ -32,12 +32,11 @@ OBJECTS = \ include ../../Makefile.lib include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lpool -lproject -lsecdb -lnvpair -lsysevent -lscf -luutil -lc SRCDIR = ../common -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) -Wp,$(CSTD_GNU99) @@ -50,6 +49,5 @@ SMATCH=off all: -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/librestart/amd64/Makefile b/usr/src/lib/librestart/amd64/Makefile index cff4d36aaf..bc2bb82a5e 100644 --- a/usr/src/lib/librestart/amd64/Makefile +++ b/usr/src/lib/librestart/amd64/Makefile @@ -23,12 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/librestart/i386/Makefile b/usr/src/lib/librestart/i386/Makefile index 98a9cce666..90bed38cc2 100644 --- a/usr/src/lib/librestart/i386/Makefile +++ b/usr/src/lib/librestart/i386/Makefile @@ -23,11 +23,9 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/librestart/sparc/Makefile b/usr/src/lib/librestart/sparc/Makefile index 98a9cce666..90bed38cc2 100644 --- a/usr/src/lib/librestart/sparc/Makefile +++ b/usr/src/lib/librestart/sparc/Makefile @@ -23,11 +23,9 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/librestart/sparcv9/Makefile b/usr/src/lib/librestart/sparcv9/Makefile index d71bfe3051..f820b35e24 100644 --- a/usr/src/lib/librestart/sparcv9/Makefile +++ b/usr/src/lib/librestart/sparcv9/Makefile @@ -23,14 +23,12 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/librpcsvc/Makefile b/usr/src/lib/librpcsvc/Makefile index 1209096b72..e06fbcb570 100644 --- a/usr/src/lib/librpcsvc/Makefile +++ b/usr/src/lib/librpcsvc/Makefile @@ -51,7 +51,7 @@ CLEANFILES += $(DERIVED_FILES) include ../Makefile.lib # definitions for install_h target -HDRS= $(TXTS) +HDRS= $(TXTS) ROOTHDRDIR= $(ROOT)/usr/include/rpcsvc ROOTHDRS= $(HDRS:%=$(ROOTHDRDIR)/%) CHECKHDRS= $(HDRS:%.h=%.check) @@ -64,7 +64,6 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: @@ -76,7 +75,7 @@ install_h: $(DERIVED_FILES) $(ROOTHDRS) check: $(CHECKHDRS) -clean clobber lint: $(SUBDIRS) +clean clobber: $(SUBDIRS) # # Rules for building the derived files diff --git a/usr/src/lib/librpcsvc/Makefile.com b/usr/src/lib/librpcsvc/Makefile.com index d8c1a5e0fb..21152959c5 100644 --- a/usr/src/lib/librpcsvc/Makefile.com +++ b/usr/src/lib/librpcsvc/Makefile.com @@ -45,7 +45,7 @@ pics/%.o: ../common/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) CPPFLAGS += -DYP @@ -54,7 +54,6 @@ CERRWARN += -_gcc=-Wno-switch CERRWARN += $(CNOWARN_UNINIT) CERRWARN += -_gcc=-Wno-parentheses -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) LDLIBS += -lnsl -lc @@ -63,7 +62,6 @@ CPPFLAGS += -I.. .KEEP_STATE: -lint: lintcheck # include library targets include ../../Makefile.targ diff --git a/usr/src/lib/librpcsvc/amd64/Makefile b/usr/src/lib/librpcsvc/amd64/Makefile index 9ab764a959..a41aeec527 100644 --- a/usr/src/lib/librpcsvc/amd64/Makefile +++ b/usr/src/lib/librpcsvc/amd64/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -30,4 +30,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/librpcsvc/i386/Makefile b/usr/src/lib/librpcsvc/i386/Makefile index cc68d60f90..00998e3cfe 100644 --- a/usr/src/lib/librpcsvc/i386/Makefile +++ b/usr/src/lib/librpcsvc/i386/Makefile @@ -23,11 +23,9 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/librpcsvc/sparc/Makefile b/usr/src/lib/librpcsvc/sparc/Makefile index cc68d60f90..00998e3cfe 100644 --- a/usr/src/lib/librpcsvc/sparc/Makefile +++ b/usr/src/lib/librpcsvc/sparc/Makefile @@ -23,11 +23,9 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/librpcsvc/sparcv9/Makefile b/usr/src/lib/librpcsvc/sparcv9/Makefile index 9ab764a959..a41aeec527 100644 --- a/usr/src/lib/librpcsvc/sparcv9/Makefile +++ b/usr/src/lib/librpcsvc/sparcv9/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -30,4 +30,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/librsc/Makefile b/usr/src/lib/librsc/Makefile index 52b7a6ffec..4227a8ea71 100644 --- a/usr/src/lib/librsc/Makefile +++ b/usr/src/lib/librsc/Makefile @@ -23,21 +23,17 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/librsc/Makefile -SUBDIRS= $(MACH) +SUBDIRS= $(MACH) all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint : $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(MACH): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/librsc/Makefile.com b/usr/src/lib/librsc/Makefile.com index 29b7c98757..8e7fe95f6d 100644 --- a/usr/src/lib/librsc/Makefile.com +++ b/usr/src/lib/librsc/Makefile.com @@ -47,7 +47,7 @@ LINKED_LIBRSC1_DIR = \ MAPFILES = SRCDIR = common -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) CFLAGS += $(CCVERBOSE) LDLIBS += -lc PLATLIBS = $(USR_PLAT_DIR)/$(PLATFORM)/lib/ @@ -60,7 +60,6 @@ INS.slink7= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/librsc.so $@ # build/lint rules # all: $(LIBS) -lint: lintcheck # # install rules diff --git a/usr/src/lib/librsc/sparc/Makefile b/usr/src/lib/librsc/sparc/Makefile index a971eee1d6..2304ef3bf2 100644 --- a/usr/src/lib/librsc/sparc/Makefile +++ b/usr/src/lib/librsc/sparc/Makefile @@ -23,10 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/librsc/sparc/Makefile -# SUBDIRS = mpxu @@ -34,9 +30,8 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint -all clean clobber install lint : $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/librsm/Makefile b/usr/src/lib/librsm/Makefile index dddd826312..602a39450e 100644 --- a/usr/src/lib/librsm/Makefile +++ b/usr/src/lib/librsm/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -34,11 +32,10 @@ all:= TARGET= all clean:= TARGET= clean clobber:= TARGET= clobber install:= TARGET= install -lint:= TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) # definitions for install_h target HDRS= rsmapi.h diff --git a/usr/src/lib/librsm/Makefile.com b/usr/src/lib/librsm/Makefile.com index 1b4f118a20..86f423b6b5 100644 --- a/usr/src/lib/librsm/Makefile.com +++ b/usr/src/lib/librsm/Makefile.com @@ -61,7 +61,6 @@ LDLIBS += -lc all: $(LIBS) -lint: lintcheck # include library targets include ../../Makefile.targ diff --git a/usr/src/lib/librstp/Makefile b/usr/src/lib/librstp/Makefile index 65a9183879..614ee7619d 100644 --- a/usr/src/lib/librstp/Makefile +++ b/usr/src/lib/librstp/Makefile @@ -33,11 +33,10 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/librstp/Makefile.com b/usr/src/lib/librstp/Makefile.com index 82beb3a2a1..fea5a1ef89 100644 --- a/usr/src/lib/librstp/Makefile.com +++ b/usr/src/lib/librstp/Makefile.com @@ -33,12 +33,11 @@ OBJECTS = edge.o migrate.o p2p.o pcost.o port.o portinfo.o rolesel.o \ include ../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common SRCS = $(OBJECTS:%.o=$(SRCDIR)/%.c) -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) LDLIBS += -lc @@ -52,6 +51,5 @@ SMATCH=off all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/librstp/i386/Makefile b/usr/src/lib/librstp/i386/Makefile index 946d8867f9..3d0e9a879d 100644 --- a/usr/src/lib/librstp/i386/Makefile +++ b/usr/src/lib/librstp/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/librstp/sparc/Makefile b/usr/src/lib/librstp/sparc/Makefile index 07093c0afe..32b9ae6b80 100644 --- a/usr/src/lib/librstp/sparc/Makefile +++ b/usr/src/lib/librstp/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/librt/Makefile b/usr/src/lib/librt/Makefile index 6cb7a4fa8a..ef1592a4a5 100644 --- a/usr/src/lib/librt/Makefile +++ b/usr/src/lib/librt/Makefile @@ -36,7 +36,6 @@ install := TARGET= install all clean clobber install: $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/librt/Makefile.com b/usr/src/lib/librt/Makefile.com index e2ca43b66d..2472527a6e 100644 --- a/usr/src/lib/librt/Makefile.com +++ b/usr/src/lib/librt/Makefile.com @@ -27,5 +27,29 @@ VERS = .1 include $(SRC)/lib/Makefile.rootfs -LIBS += $(LINTLIB) DYNFLAGS += -F libc.so.1 + +COMPATLINKS += lib/libposix4.so.1 \ + lib/libposix4.so \ + usr/lib/libposix4.so.1 \ + usr/lib/libposix4.so + +COMPATLINKS64 += lib/$(MACH64)/libposix4.so.1 \ + lib/$(MACH64)/libposix4.so \ + usr/lib/$(MACH64)/libposix4.so.1 \ + usr/lib/$(MACH64)/libposix4.so + +$(ROOT)/lib/libposix4.so.1 := COMPATLINKTARGET=librt.so.1 +$(ROOT)/lib/libposix4.so := COMPATLINKTARGET=libposix4.so.1 +$(ROOT)/usr/lib/libposix4.so.1 := COMPATLINKTARGET=../../lib/librt.so.1 +$(ROOT)/usr/lib/libposix4.so := COMPATLINKTARGET=../../lib/librt.so.1 +$(ROOT)/lib/$(MACH64)/libposix4.so.1 := COMPATLINKTARGET=librt.so.1 +$(ROOT)/lib/$(MACH64)/libposix4.so := COMPATLINKTARGET=libposix4.so.1 +$(ROOT)/usr/lib/$(MACH64)/libposix4.so.1:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/librt.so.1 +$(ROOT)/usr/lib/$(MACH64)/libposix4.so:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/librt.so.1 +$(ROOT)/usr/lib/$(MACH64)/librt.so.1:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/librt.so.1 +$(ROOT)/usr/lib/$(MACH64)/librt.so:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/librt.so.1 diff --git a/usr/src/lib/librt/amd64/Makefile b/usr/src/lib/librt/amd64/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/librt/amd64/Makefile +++ b/usr/src/lib/librt/amd64/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/librt/i386/Makefile b/usr/src/lib/librt/i386/Makefile index 4e4e8c02a9..682e5560ca 100644 --- a/usr/src/lib/librt/i386/Makefile +++ b/usr/src/lib/librt/i386/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/librt/sparc/Makefile b/usr/src/lib/librt/sparc/Makefile index 4e4e8c02a9..682e5560ca 100644 --- a/usr/src/lib/librt/sparc/Makefile +++ b/usr/src/lib/librt/sparc/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/librt/sparcv9/Makefile b/usr/src/lib/librt/sparcv9/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/librt/sparcv9/Makefile +++ b/usr/src/lib/librt/sparcv9/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libsasl/Makefile b/usr/src/lib/libsasl/Makefile index 82ae0bd352..d7d3ba8eb2 100644 --- a/usr/src/lib/libsasl/Makefile +++ b/usr/src/lib/libsasl/Makefile @@ -38,7 +38,6 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint LIBRARY= libsasl.a POFILE= $(LIBRARY:.a=.po) @@ -53,7 +52,7 @@ MSGFILES= lib/canonusr.c lib/checkpw.c lib/client.c lib/common.c \ .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) all install: THIRDPARTYLICENSE diff --git a/usr/src/lib/libsasl/Makefile.com b/usr/src/lib/libsasl/Makefile.com index 6b6aa0e69f..fb21d7b8d0 100644 --- a/usr/src/lib/libsasl/Makefile.com +++ b/usr/src/lib/libsasl/Makefile.com @@ -37,12 +37,9 @@ OBJECTS= $(SASLOBJS) $(COMMONOBJS) include ../../Makefile.lib -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) SRCS= $(SASLOBJS:%.o=../lib/%.c) $(COMMONOBJS:%.o=$(PLUGDIR)/%.c) -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) LDLIBS += -lsocket -lc -lmd -LINTFLAGS += -DPIC -LINTFLAGS64 += -DPIC SRCDIR= ../lib PLUGDIR= ../plugin @@ -58,7 +55,6 @@ SMATCH=off all: $(LIBS) -lint: lintcheck pics/%.o: $(PLUGDIR)/%.c $(COMPILE.c) -o $@ $< diff --git a/usr/src/lib/libsasl/i386/Makefile b/usr/src/lib/libsasl/i386/Makefile index 2f30298de3..e9391566bb 100644 --- a/usr/src/lib/libsasl/i386/Makefile +++ b/usr/src/lib/libsasl/i386/Makefile @@ -2,10 +2,7 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/libsasl/i386/Makefile include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libsasl/sparc/Makefile b/usr/src/lib/libsasl/sparc/Makefile index 3ae9feb913..e9391566bb 100644 --- a/usr/src/lib/libsasl/sparc/Makefile +++ b/usr/src/lib/libsasl/sparc/Makefile @@ -2,10 +2,7 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/libsasl/sparc/Makefile include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libsaveargs/Makefile b/usr/src/lib/libsaveargs/Makefile index bbc26c7e7f..1df37b84eb 100644 --- a/usr/src/lib/libsaveargs/Makefile +++ b/usr/src/lib/libsaveargs/Makefile @@ -33,11 +33,10 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg package := TARGET= package -LIBRARY= libsaveargs.a +LIBRARY= libsaveargs.a # definitions for install_h target HDRS= saveargs.h @@ -53,7 +52,7 @@ $(ROOTHDRDIR)/%: common/% .KEEP_STATE: -all clean clobber delete install lint package: $(SUBDIRS) +all clean clobber delete install package: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libsaveargs/Makefile.com b/usr/src/lib/libsaveargs/Makefile.com index 883afb66c9..3f23249570 100644 --- a/usr/src/lib/libsaveargs/Makefile.com +++ b/usr/src/lib/libsaveargs/Makefile.com @@ -61,7 +61,7 @@ CLOBBERFILES_standalone = $(LINKTEST_OBJ) CLOBBERFILES += $(CLOBBERFILES_$(CURTYPE)) LIBS_standalone = $(STANDLIBRARY) -LIBS_library = $(DYNLIB) $(LINTLIB) +LIBS_library = $(DYNLIB) LIBS = $(LIBS_$(CURTYPE)) MAPFILES = $(COMDIR)/mapfile-vers @@ -75,7 +75,6 @@ ASFLAGS_standalone = -DDIS_STANDALONE ASFLAGS_library = ASFLAGS += -P $(ASFLAGS_$(CURTYPE)) -D_ASM -$(LINTLIB) := SRCS = $(COMDIR)/$(LINTSRC) # We want the thread-specific errno in the library, but we don't want it in # the standalone. $(DTS_ERRNO) is designed to add -D_TS_ERRNO to $(CPPFLAGS), diff --git a/usr/src/lib/libsaveargs/Makefile.targ b/usr/src/lib/libsaveargs/Makefile.targ index f90deed1db..73c8943c76 100644 --- a/usr/src/lib/libsaveargs/Makefile.targ +++ b/usr/src/lib/libsaveargs/Makefile.targ @@ -47,11 +47,6 @@ install.standalone.targ: all.standalone $(INSTALL_DEPS_standalone) all.library.targ: $(LIBS) all.standalone.targ: $(STANDLIBRARY) -lint: $(TYPES:%=lint.%) - -$(TYPES:%=lint.%): - @$(MAKE) lintcheck CURTYPE=$(@:lint.%=%) - $(STANDLIBRARY): $(OBJS) $(LINKTEST_OBJ) $(LD) $(BREDUCE) $(ZDEFS) $(LDFLAGS) -o $@.linktest $(OBJS) $(LINKTEST_OBJ) rm $@.linktest @@ -74,8 +69,3 @@ $(OBJS): objs objs/%.o pics/%.o: $(COMDIR)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) - -# install rule for lint library target -$(ROOTLINTDIR)/%: $(COMDIR)/% - $(INS.file) - diff --git a/usr/src/lib/libsaveargs/amd64/Makefile b/usr/src/lib/libsaveargs/amd64/Makefile index de0c2793f7..63cf163ffb 100644 --- a/usr/src/lib/libsaveargs/amd64/Makefile +++ b/usr/src/lib/libsaveargs/amd64/Makefile @@ -28,7 +28,7 @@ include ../../Makefile.lib.64 TYPES=library standalone -INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLINT64) $(ROOTLIBS64) +INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLIBS64) INSTALL_DEPS_standalone = $(ROOTLIBS64) include ../Makefile.targ diff --git a/usr/src/lib/libscf/amd64/Makefile b/usr/src/lib/libscf/amd64/Makefile index cff4d36aaf..bc2bb82a5e 100644 --- a/usr/src/lib/libscf/amd64/Makefile +++ b/usr/src/lib/libscf/amd64/Makefile @@ -23,12 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libscf/i386/Makefile b/usr/src/lib/libscf/i386/Makefile index 98a9cce666..90bed38cc2 100644 --- a/usr/src/lib/libscf/i386/Makefile +++ b/usr/src/lib/libscf/i386/Makefile @@ -23,11 +23,9 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libscf/sparc/Makefile b/usr/src/lib/libscf/sparc/Makefile index 98a9cce666..90bed38cc2 100644 --- a/usr/src/lib/libscf/sparc/Makefile +++ b/usr/src/lib/libscf/sparc/Makefile @@ -23,11 +23,9 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libscf/sparcv9/Makefile b/usr/src/lib/libscf/sparcv9/Makefile index d71bfe3051..f820b35e24 100644 --- a/usr/src/lib/libscf/sparcv9/Makefile +++ b/usr/src/lib/libscf/sparcv9/Makefile @@ -23,14 +23,12 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsched/Makefile b/usr/src/lib/libsched/Makefile index 6cb7a4fa8a..ef1592a4a5 100644 --- a/usr/src/lib/libsched/Makefile +++ b/usr/src/lib/libsched/Makefile @@ -36,7 +36,6 @@ install := TARGET= install all clean clobber install: $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libsched/Makefile.com b/usr/src/lib/libsched/Makefile.com index 44d5d8495e..ed7086a1fe 100644 --- a/usr/src/lib/libsched/Makefile.com +++ b/usr/src/lib/libsched/Makefile.com @@ -26,5 +26,4 @@ LIBRARY = libsched.a VERS = .1 -LIBS += $(LINTLIB) DYNFLAGS += -F libc.so.1 diff --git a/usr/src/lib/libsched/i386/Makefile b/usr/src/lib/libsched/i386/Makefile index 4e4e8c02a9..c318e6089b 100644 --- a/usr/src/lib/libsched/i386/Makefile +++ b/usr/src/lib/libsched/i386/Makefile @@ -26,6 +26,6 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libsched/sparc/Makefile b/usr/src/lib/libsched/sparc/Makefile index 4e4e8c02a9..c318e6089b 100644 --- a/usr/src/lib/libsched/sparc/Makefile +++ b/usr/src/lib/libsched/sparc/Makefile @@ -26,6 +26,6 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libsctp/Makefile b/usr/src/lib/libsctp/Makefile index 3bfcbd1888..0a569634db 100644 --- a/usr/src/lib/libsctp/Makefile +++ b/usr/src/lib/libsctp/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -34,11 +32,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libsctp/Makefile.com b/usr/src/lib/libsctp/Makefile.com index 689f18d5b3..bf743d9c41 100644 --- a/usr/src/lib/libsctp/Makefile.com +++ b/usr/src/lib/libsctp/Makefile.com @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY = libsctp.a VERS = .1 @@ -32,8 +30,7 @@ OBJECTS = sctp.o include ../../Makefile.lib SRCDIR = ../common -LIBS = $(DYNLIB) $(LINTLIB) -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) +LIBS = $(DYNLIB) LDLIBS += -lsocket -lc CFLAGS += $(CCVERBOSE) @@ -42,6 +39,5 @@ CFLAGS += $(CCVERBOSE) all: $(LIBS) -lint: $(LINTLIB) lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libsctp/amd64/Makefile b/usr/src/lib/libsctp/amd64/Makefile index dd68231e26..010d484a50 100644 --- a/usr/src/lib/libsctp/amd64/Makefile +++ b/usr/src/lib/libsctp/amd64/Makefile @@ -23,10 +23,8 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libsctp/i386/Makefile b/usr/src/lib/libsctp/i386/Makefile index af76f5ab90..18584b4da1 100644 --- a/usr/src/lib/libsctp/i386/Makefile +++ b/usr/src/lib/libsctp/i386/Makefile @@ -23,9 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libsctp/sparc/Makefile b/usr/src/lib/libsctp/sparc/Makefile index af76f5ab90..18584b4da1 100644 --- a/usr/src/lib/libsctp/sparc/Makefile +++ b/usr/src/lib/libsctp/sparc/Makefile @@ -23,9 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libsec/Makefile b/usr/src/lib/libsec/Makefile index c83d290f9d..1807da7cec 100644 --- a/usr/src/lib/libsec/Makefile +++ b/usr/src/lib/libsec/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -37,7 +35,6 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint MSGFILES= common/acltext.c common/aclutils.c common/aclmode.c \ common/aclsort.c common/aclcheck.c common/acl_lex.l \ @@ -47,7 +44,7 @@ POFILE= libsec.po .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(POFILE): pofile_MSGFILES diff --git a/usr/src/lib/libsec/Makefile.com b/usr/src/lib/libsec/Makefile.com index 47fcc11acb..f32d7f2b31 100644 --- a/usr/src/lib/libsec/Makefile.com +++ b/usr/src/lib/libsec/Makefile.com @@ -28,20 +28,19 @@ LIBRARY= libsec.a VERS= .1 YFLAGS = -d -v -b acl -LFLAGS = -t +LFLAGS = -t OBJS_SHARED= acl_common.o GENERATED_SRCS = acl.tab.o acl_lex.o OBJS_COMMON= aclcheck.o aclmode.o aclsort.o acltext.o aclutils.o OBJECTS= $(OBJS_COMMON) $(OBJS_SHARED) $(GENERATED_SRCS) CLEANFILES += acl_lex.c acl.tab.c acl.tab.h -LINTSRCS = $(OBJS_COMMON) # include library definitions include ../../Makefile.lib SRCDIR= ../common -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(SRCDIR) -I. -I../../../common/acl @@ -63,13 +62,11 @@ include ../../Makefile.rootfs SRCS= $(OBJS_COMMON:%.o=$(SRCDIR)/%.c) \ $(OBJS_SHARED:%.o=$(SRC)/common/acl/%.c) -$(LINTLIB):= SRCS= $(SRCDIR)/$(LINTSRC) .KEEP_STATE: all: $(LIBS) -lint: lintcheck pics/%.o: ../../../common/acl/%.c $(COMPILE.c) -o $@ $< diff --git a/usr/src/lib/libsec/amd64/Makefile b/usr/src/lib/libsec/amd64/Makefile index e24ef38245..fd6f777e6e 100644 --- a/usr/src/lib/libsec/amd64/Makefile +++ b/usr/src/lib/libsec/amd64/Makefile @@ -22,16 +22,14 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) .KEEP_STATE: all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsec/i386/Makefile b/usr/src/lib/libsec/i386/Makefile index 2a944b0b43..8537c30eda 100644 --- a/usr/src/lib/libsec/i386/Makefile +++ b/usr/src/lib/libsec/i386/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -31,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsec/sparc/Makefile b/usr/src/lib/libsec/sparc/Makefile index 2a944b0b43..8537c30eda 100644 --- a/usr/src/lib/libsec/sparc/Makefile +++ b/usr/src/lib/libsec/sparc/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -31,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsec/sparcv9/Makefile b/usr/src/lib/libsec/sparcv9/Makefile index e24ef38245..fd6f777e6e 100644 --- a/usr/src/lib/libsec/sparcv9/Makefile +++ b/usr/src/lib/libsec/sparcv9/Makefile @@ -22,16 +22,14 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) .KEEP_STATE: all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsecdb/Makefile b/usr/src/lib/libsecdb/Makefile index 4d492d42ae..9885f6f950 100644 --- a/usr/src/lib/libsecdb/Makefile +++ b/usr/src/lib/libsecdb/Makefile @@ -33,12 +33,11 @@ all:= TARGET= all clean:= TARGET= clean clobber:= TARGET= clobber install:= TARGET= install -lint:= TARGET= lint _msg:= TARGET= _msg .KEEP_STATE: -ROOTETC = $(ROOT)/etc +ROOTETC = $(ROOT)/etc ROOTETCSECURITY = $(ROOTETC)/security EFILES = user_attr @@ -72,7 +71,7 @@ CLASS_SCR_DIR = $(INSTALL_DIR)/scripts CLASS_SCR_FILES = $(SCRIPTS:%=$(CLASS_SCR_DIR)/%) $(CLASS_SCR_FILES) := FILEMODE = 0555 -all clean clobber delete install lint package: $(SUBDIRS) +all clean clobber delete install package: $(SUBDIRS) _msg: $(MSGSUBDIRS) install: install_data diff --git a/usr/src/lib/libsecdb/Makefile.com b/usr/src/lib/libsecdb/Makefile.com index aa027f0efa..ae24955c20 100644 --- a/usr/src/lib/libsecdb/Makefile.com +++ b/usr/src/lib/libsecdb/Makefile.com @@ -26,23 +26,20 @@ LIBRARY = libsecdb.a VERS = .1 OBJECTS = secdb.o getauthattr.o getexecattr.o getprofattr.o \ - getuserattr.o chkauthattr.o + getuserattr.o chkauthattr.o include ../../Makefile.lib # Install this library in the root filesystem include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lnsl -lc SRCDIR = ../common -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CPPFLAGS += -D_REENTRANT -LINTFLAGS += -DPIC -LINTFLAGS64 += -DPIC CERRWARN += -_gcc=-Wno-parentheses CERRWARN += $(CNOWARN_UNINIT) @@ -51,6 +48,5 @@ CERRWARN += $(CNOWARN_UNINIT) all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libsecdb/amd64/Makefile b/usr/src/lib/libsecdb/amd64/Makefile index 67538ac8f1..297028a599 100644 --- a/usr/src/lib/libsecdb/amd64/Makefile +++ b/usr/src/lib/libsecdb/amd64/Makefile @@ -23,7 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # @@ -32,4 +32,4 @@ include ../../Makefile.lib.64 .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsecdb/help/Makefile b/usr/src/lib/libsecdb/help/Makefile index 17638f06f7..d907f83098 100644 --- a/usr/src/lib/libsecdb/help/Makefile +++ b/usr/src/lib/libsecdb/help/Makefile @@ -23,10 +23,6 @@ # Copyright (c) 1999 by Sun Microsystems, Inc. # All rights reserved. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libsecdb/help/Makefile -# SUBDIRS = auths profiles @@ -34,12 +30,11 @@ all:= TARGET= all clean:= TARGET= clean clobber:= TARGET= clobber install:= TARGET= install -lint:= TARGET= lint _msg:= TARGET= _msg .KEEP_STATE: -all clean clobber install lint _msg: $(SUBDIRS) +all clean clobber install _msg: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libsecdb/help/auths/Makefile b/usr/src/lib/libsecdb/help/auths/Makefile index 803c1870ce..300160c935 100644 --- a/usr/src/lib/libsecdb/help/auths/Makefile +++ b/usr/src/lib/libsecdb/help/auths/Makefile @@ -204,4 +204,4 @@ $(DIRS): $(MSGDIR)/%: % $(INS.file) -clean clobber lint: +clean clobber: diff --git a/usr/src/lib/libsecdb/help/profiles/Makefile b/usr/src/lib/libsecdb/help/profiles/Makefile index a8701922f2..c83fb267f9 100644 --- a/usr/src/lib/libsecdb/help/profiles/Makefile +++ b/usr/src/lib/libsecdb/help/profiles/Makefile @@ -134,4 +134,4 @@ $(DIRS): $(MSGDIR)/%: % $(INS.file) -clean clobber lint: +clean clobber: diff --git a/usr/src/lib/libsecdb/i386/Makefile b/usr/src/lib/libsecdb/i386/Makefile index 1e59e5b6e6..c8c3c5083d 100644 --- a/usr/src/lib/libsecdb/i386/Makefile +++ b/usr/src/lib/libsecdb/i386/Makefile @@ -23,14 +23,10 @@ # Copyright (c) 1999, 2001 by Sun Microsystems, Inc. # All rights reserved. # -#ident "%Z%%M% %I% %E% SMI" -# -# libsecdb/i386/Makefile - include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsecdb/sparc/Makefile b/usr/src/lib/libsecdb/sparc/Makefile index f24eef589c..5ab240f17d 100644 --- a/usr/src/lib/libsecdb/sparc/Makefile +++ b/usr/src/lib/libsecdb/sparc/Makefile @@ -23,13 +23,9 @@ # Copyright (c) 1999, 2001 by Sun Microsystems, Inc. # All rights reserved. # -# lib/libsecdb/sparc/Makefile -# -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsecdb/sparcv9/Makefile b/usr/src/lib/libsecdb/sparcv9/Makefile index 7821a207c0..b8482c4e10 100644 --- a/usr/src/lib/libsecdb/sparcv9/Makefile +++ b/usr/src/lib/libsecdb/sparcv9/Makefile @@ -25,7 +25,7 @@ # # lib/libsecdb/sparcv9/Makefile # -#ident "%Z%%M% %I% %E% SMI" + # @@ -34,4 +34,4 @@ include ../../Makefile.lib.64 .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsendfile/Makefile b/usr/src/lib/libsendfile/Makefile index 80b0e8c55f..ece4aa4cb1 100644 --- a/usr/src/lib/libsendfile/Makefile +++ b/usr/src/lib/libsendfile/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -34,11 +32,10 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libsendfile/Makefile.com b/usr/src/lib/libsendfile/Makefile.com index 5a6a30574c..12a5852cf9 100644 --- a/usr/src/lib/libsendfile/Makefile.com +++ b/usr/src/lib/libsendfile/Makefile.com @@ -33,9 +33,8 @@ include ../../Makefile.rootfs SRCDIR = ../common -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc CFLAGS += $(CCVERBOSE) @@ -43,6 +42,5 @@ CFLAGS += $(CCVERBOSE) all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libsendfile/amd64/Makefile b/usr/src/lib/libsendfile/amd64/Makefile index f69d11f706..cde9b4f678 100644 --- a/usr/src/lib/libsendfile/amd64/Makefile +++ b/usr/src/lib/libsendfile/amd64/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # MAPFILE32 = @@ -30,4 +30,4 @@ MAPFILE32 = include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsendfile/i386/Makefile b/usr/src/lib/libsendfile/i386/Makefile index 3d5b9051f3..1e27013184 100644 --- a/usr/src/lib/libsendfile/i386/Makefile +++ b/usr/src/lib/libsendfile/i386/Makefile @@ -24,4 +24,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsendfile/sparc/Makefile b/usr/src/lib/libsendfile/sparc/Makefile index 3d5b9051f3..1e27013184 100644 --- a/usr/src/lib/libsendfile/sparc/Makefile +++ b/usr/src/lib/libsendfile/sparc/Makefile @@ -24,4 +24,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsendfile/sparcv9/Makefile b/usr/src/lib/libsendfile/sparcv9/Makefile index f69d11f706..cde9b4f678 100644 --- a/usr/src/lib/libsendfile/sparcv9/Makefile +++ b/usr/src/lib/libsendfile/sparcv9/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # MAPFILE32 = @@ -30,4 +30,4 @@ MAPFILE32 = include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsff/Makefile b/usr/src/lib/libsff/Makefile index 134bf99c6d..80af3c7eb2 100644 --- a/usr/src/lib/libsff/Makefile +++ b/usr/src/lib/libsff/Makefile @@ -24,15 +24,14 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber lint: $(SUBDIRS) +all clean clobber: $(SUBDIRS) -install: $(SUBDIRS) install_h +install: $(SUBDIRS) $(VARPD_MAPFILES) install_h -install_h: $(ROOTHDRS) +install_h: $(ROOTHDRS) check: $(CHECKHDRS) diff --git a/usr/src/lib/libsff/Makefile.com b/usr/src/lib/libsff/Makefile.com index dab4bfbca3..c0fcadfacb 100644 --- a/usr/src/lib/libsff/Makefile.com +++ b/usr/src/lib/libsff/Makefile.com @@ -19,7 +19,7 @@ OBJECTS = libsff.o include ../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -lnvpair CPPFLAGS += -I../common @@ -29,6 +29,5 @@ SRCDIR = ../common all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libsff/amd64/Makefile b/usr/src/lib/libsff/amd64/Makefile index 4d3cfa1f81..7c2edac1be 100644 --- a/usr/src/lib/libsff/amd64/Makefile +++ b/usr/src/lib/libsff/amd64/Makefile @@ -16,4 +16,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libsff/i386/Makefile b/usr/src/lib/libsff/i386/Makefile index 0a22fa4dc3..bc7f549a34 100644 --- a/usr/src/lib/libsff/i386/Makefile +++ b/usr/src/lib/libsff/i386/Makefile @@ -15,4 +15,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libsff/sparc/Makefile b/usr/src/lib/libsff/sparc/Makefile index 0a22fa4dc3..bc7f549a34 100644 --- a/usr/src/lib/libsff/sparc/Makefile +++ b/usr/src/lib/libsff/sparc/Makefile @@ -15,4 +15,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libsff/sparcv9/Makefile b/usr/src/lib/libsff/sparcv9/Makefile index 4d3cfa1f81..7c2edac1be 100644 --- a/usr/src/lib/libsff/sparcv9/Makefile +++ b/usr/src/lib/libsff/sparcv9/Makefile @@ -16,4 +16,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libshare/Makefile b/usr/src/lib/libshare/Makefile index 1efb3e90ad..7bf92e6eb3 100644 --- a/usr/src/lib/libshare/Makefile +++ b/usr/src/lib/libshare/Makefile @@ -46,11 +46,10 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libshare/autofs/Makefile b/usr/src/lib/libshare/autofs/Makefile index aa5038a24a..9a26d7e71e 100644 --- a/usr/src/lib/libshare/autofs/Makefile +++ b/usr/src/lib/libshare/autofs/Makefile @@ -27,20 +27,19 @@ include ../../Makefile.lib SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) -MSGFILES = libshare_autofs.c +MSGFILES = libshare_autofs.c POFILE = libshare_autofs.po all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) -$(POFILE): $(MSGFILES) +$(POFILE): $(MSGFILES) $(BUILDPO.msgfiles) _msg: $(MSGDOMAINPOFILE) diff --git a/usr/src/lib/libshare/i386/Makefile b/usr/src/lib/libshare/i386/Makefile index 729341c543..4efdf2ec8c 100644 --- a/usr/src/lib/libshare/i386/Makefile +++ b/usr/src/lib/libshare/i386/Makefile @@ -18,8 +18,7 @@ # # CDDL HEADER END # -# -# ident "%Z%%M% %I% %E% SMI" + # # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -27,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libshare/nfs/Makefile b/usr/src/lib/libshare/nfs/Makefile index 27d62bd300..ed8f21e9df 100644 --- a/usr/src/lib/libshare/nfs/Makefile +++ b/usr/src/lib/libshare/nfs/Makefile @@ -19,8 +19,6 @@ # CDDL HEADER END # # -# ident "%Z%%M% %I% %E% SMI" -# # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -30,20 +28,19 @@ include ../../Makefile.lib SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) -MSGFILES = libshare_nfs.c +MSGFILES = libshare_nfs.c POFILE = libshare_nfs.po all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) -$(POFILE): $(MSGFILES) +$(POFILE): $(MSGFILES) $(BUILDPO.msgfiles) _msg: $(MSGDOMAINPOFILE) diff --git a/usr/src/lib/libshare/smb/Makefile b/usr/src/lib/libshare/smb/Makefile index d5f3df5233..be597f8a74 100644 --- a/usr/src/lib/libshare/smb/Makefile +++ b/usr/src/lib/libshare/smb/Makefile @@ -19,8 +19,6 @@ # CDDL HEADER END # # -# ident "%Z%%M% %I% %E% SMI" -# # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -30,17 +28,16 @@ include ../../Makefile.lib SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) -MSGFILES = libshare_smb.c +MSGFILES = libshare_smb.c all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libshare/smbfs/Makefile b/usr/src/lib/libshare/smbfs/Makefile index 8eeb610f13..7f8382d2f5 100644 --- a/usr/src/lib/libshare/smbfs/Makefile +++ b/usr/src/lib/libshare/smbfs/Makefile @@ -19,8 +19,6 @@ # CDDL HEADER END # # -# ident "%Z%%M% %I% %E% SMI" -# # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -30,20 +28,19 @@ include ../../Makefile.lib SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) -MSGFILES = libshare_smbfs.c +MSGFILES = libshare_smbfs.c POFILE = libshare_smbfs.po all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) -$(POFILE): $(MSGFILES) +$(POFILE): $(MSGFILES) $(BUILDPO.msgfiles) _msg: $(MSGDOMAINPOFILE) diff --git a/usr/src/lib/libshare/sparc/Makefile b/usr/src/lib/libshare/sparc/Makefile index 729341c543..4efdf2ec8c 100644 --- a/usr/src/lib/libshare/sparc/Makefile +++ b/usr/src/lib/libshare/sparc/Makefile @@ -18,8 +18,7 @@ # # CDDL HEADER END # -# -# ident "%Z%%M% %I% %E% SMI" + # # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -27,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libshell/Makefile b/usr/src/lib/libshell/Makefile index 1cce2316f0..74fa80c6ea 100644 --- a/usr/src/lib/libshell/Makefile +++ b/usr/src/lib/libshell/Makefile @@ -35,20 +35,19 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint -_msg := TARGET= _msg +_msg := TARGET= _msg .KEEP_STATE: -all clean clobber install lint _msg: $(SUBDIRS) +all clean clobber install _msg: $(SUBDIRS) -LIBRARY= libshell.a +LIBRARY= libshell.a HDRS= \ history.h \ nval.h \ shell.h - + HDRDIR32= $(MACH)/include/ast HDRDIR64= $(MACH64)/include/ast include ../Makefile.asthdr diff --git a/usr/src/lib/libshell/Makefile.com b/usr/src/lib/libshell/Makefile.com index b185d93851..9880bf8e12 100644 --- a/usr/src/lib/libshell/Makefile.com +++ b/usr/src/lib/libshell/Makefile.com @@ -124,7 +124,7 @@ MAPFILES= ../mapfile-vers # Set common AST build flags (e.g. C99/XPG6, needed to support the math stuff) include ../../../Makefile.ast -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += \ -lcmd \ @@ -134,7 +134,6 @@ LDLIBS += \ -lm \ -lc -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) SRCDIR = ../common @@ -172,12 +171,4 @@ pics/sh/nvdisc.o := CERRWARN += -erroff=E_END_OF_LOOP_CODE_NOT_REACHED all: mkpicdirs .WAIT $(LIBS) -# -# libshell is not lint-clean yet; fake up a target. (You can use -# "make lintcheck" to actually run lint; please send all lint fixes -# upstream (to AT&T) so the next update will pull them into ON.) -# -lint: - @ print "usr/src/lib/libshell is not lint-clean: skipping" - include ../../Makefile.targ diff --git a/usr/src/lib/libshell/i386/Makefile b/usr/src/lib/libshell/i386/Makefile index 79cb51eae6..6c35d1fc88 100644 --- a/usr/src/lib/libshell/i386/Makefile +++ b/usr/src/lib/libshell/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libshell/sparc/Makefile b/usr/src/lib/libshell/sparc/Makefile index 8c5c13a9b9..b858cee431 100644 --- a/usr/src/lib/libshell/sparc/Makefile +++ b/usr/src/lib/libshell/sparc/Makefile @@ -30,4 +30,4 @@ include ../Makefile.com # (and on 32bit it is close to the barrier) sparc_C_PICFLAGS = $(C_BIGPICFLAGS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libsip/Makefile b/usr/src/lib/libsip/Makefile index a61fcf8d7b..e32ef45dda 100644 --- a/usr/src/lib/libsip/Makefile +++ b/usr/src/lib/libsip/Makefile @@ -21,8 +21,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -35,11 +33,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libsip/Makefile.com b/usr/src/lib/libsip/Makefile.com index b73783361d..64f25bdac0 100644 --- a/usr/src/lib/libsip/Makefile.com +++ b/usr/src/lib/libsip/Makefile.com @@ -35,8 +35,7 @@ OBJECTS = sip_headers.o sip_msg.o sip_gids.o \ include ../../Makefile.lib SRCDIR = ../common -LIBS = $(DYNLIB) $(LINTLIB) -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) +LIBS = $(DYNLIB) LDLIBS += -lmd5 -lc CFLAGS += $(CCVERBOSE) @@ -49,6 +48,5 @@ SMATCH=off all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libsip/i386/Makefile b/usr/src/lib/libsip/i386/Makefile index 8e913a86ca..60e027145b 100644 --- a/usr/src/lib/libsip/i386/Makefile +++ b/usr/src/lib/libsip/i386/Makefile @@ -21,9 +21,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libsip/sparc/Makefile b/usr/src/lib/libsip/sparc/Makefile index 8e913a86ca..60e027145b 100644 --- a/usr/src/lib/libsip/sparc/Makefile +++ b/usr/src/lib/libsip/sparc/Makefile @@ -21,9 +21,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libsldap/Makefile b/usr/src/lib/libsldap/Makefile index 64525df111..6f0ffbdca7 100644 --- a/usr/src/lib/libsldap/Makefile +++ b/usr/src/lib/libsldap/Makefile @@ -33,7 +33,6 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint catalog := TARGET= catalog _msg := TARGET= _msg package := TARGET= package @@ -46,7 +45,7 @@ POFILES= generic.po .KEEP_STATE: -all clean delete install lint catalog package: $(SUBDIRS) +all clean delete install catalog package: $(SUBDIRS) clobber: $(SUBDIRS) $(RM) $(POFILE) $(POFILES) diff --git a/usr/src/lib/libsldap/Makefile.com b/usr/src/lib/libsldap/Makefile.com index 1404a24572..3fbf8252f3 100644 --- a/usr/src/lib/libsldap/Makefile.com +++ b/usr/src/lib/libsldap/Makefile.com @@ -39,8 +39,7 @@ OBJECTS= $(SLDAPOBJ) include ../../Makefile.lib SRCS = $(SLDAPOBJ:%.o=../common/%.c) -LIBS = $(DYNLIB) $(LINTLIB) -$(LINTLIB):= SRCS=../common/llib-lsldap +LIBS = $(DYNLIB) LDLIBS += -lnsl -lldap -lscf -lc SRCDIR = ../common @@ -49,8 +48,6 @@ CFLAGS += $(CCVERBOSE) LOCFLAGS += -D_REENTRANT -DSUNW_OPTIONS CPPFLAGS += -I../common -I$(SRC)/lib/libldap5/include/ldap \ -I$(ADJUNCT_PROTO)/usr/include/mps $(LOCFLAGS) -LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN -LINTFLAGS64 += -erroff=E_BAD_PTR_CAST_ALIGN CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-switch @@ -63,6 +60,5 @@ SMATCH=off all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libsldap/i386/Makefile b/usr/src/lib/libsldap/i386/Makefile index 8f0cd8cce0..0b65d41b80 100644 --- a/usr/src/lib/libsldap/i386/Makefile +++ b/usr/src/lib/libsldap/i386/Makefile @@ -19,8 +19,7 @@ # # CDDL HEADER END # -# -# ident "%Z%%M% %I% %E% SMI" + # # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -28,4 +27,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libsldap/sparc/Makefile b/usr/src/lib/libsldap/sparc/Makefile index 8f0cd8cce0..0b65d41b80 100644 --- a/usr/src/lib/libsldap/sparc/Makefile +++ b/usr/src/lib/libsldap/sparc/Makefile @@ -19,8 +19,7 @@ # # CDDL HEADER END # -# -# ident "%Z%%M% %I% %E% SMI" + # # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -28,4 +27,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libslp/Makefile b/usr/src/lib/libslp/Makefile index 77b05be5b8..2d7e391c32 100644 --- a/usr/src/lib/libslp/Makefile +++ b/usr/src/lib/libslp/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/Makefile.master @@ -54,12 +52,11 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg .PARALLEL: $(SUBDIRS) -all lint install: install_h .WAIT $(SUBDIRS) +all install: install_h .WAIT $(SUBDIRS) clean clobber: $(SUBDIRS) diff --git a/usr/src/lib/libslp/Makefile.com b/usr/src/lib/libslp/Makefile.com index 23e7d1f0c5..2a5a867eff 100644 --- a/usr/src/lib/libslp/Makefile.com +++ b/usr/src/lib/libslp/Makefile.com @@ -36,9 +36,8 @@ OBJECTS = SLPFindAttrs.o SLPFindSrvTypes.o SLPFindSrvs.o SLPOpen.o \ include ../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -lnsl -lsocket -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) SRCDIR = ../clib @@ -56,6 +55,5 @@ SMATCH=off all: -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libslp/etc/Makefile b/usr/src/lib/libslp/etc/Makefile index 491c079d70..ef37a5c093 100644 --- a/usr/src/lib/libslp/etc/Makefile +++ b/usr/src/lib/libslp/etc/Makefile @@ -40,7 +40,7 @@ CLOBBERFILES = $(ROOTETCINETCONF) .KEEP_STATE: -all lint clean _msg: +all clean _msg: install: $(DIRS) $(ROOTETCINETCONF) diff --git a/usr/src/lib/libslp/i386/Makefile b/usr/src/lib/libslp/i386/Makefile index 2a944b0b43..d6eed917a9 100644 --- a/usr/src/lib/libslp/i386/Makefile +++ b/usr/src/lib/libslp/i386/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -31,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libslp/javalib/Makefile b/usr/src/lib/libslp/javalib/Makefile index 58ff8b437d..7e553b122e 100644 --- a/usr/src/lib/libslp/javalib/Makefile +++ b/usr/src/lib/libslp/javalib/Makefile @@ -20,8 +20,6 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -92,11 +90,9 @@ manifests: install: all message_files manifests $(JARDESTDIR) $(INSJARS) # empty targets for top-level building compatability - -install_h lint: +install_h: # jstyle check -- more for developer's convenience since the checks are # not automated in the build. - check: $(JSTYLE) -p $(PKGPATH)/*.java diff --git a/usr/src/lib/libslp/sparc/Makefile b/usr/src/lib/libslp/sparc/Makefile index 2a944b0b43..d6eed917a9 100644 --- a/usr/src/lib/libslp/sparc/Makefile +++ b/usr/src/lib/libslp/sparc/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -31,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libsmbfs/Makefile b/usr/src/lib/libsmbfs/Makefile index b708bd0571..029d66a4a9 100644 --- a/usr/src/lib/libsmbfs/Makefile +++ b/usr/src/lib/libsmbfs/Makefile @@ -46,14 +46,13 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint MSGFILES = `$(GREP) -l gettext smb/*.[ch]` POFILE = libsmbfs.po .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) _msg: $(MSGDOMAINPOFILE) diff --git a/usr/src/lib/libsmbfs/Makefile.com b/usr/src/lib/libsmbfs/Makefile.com index 71a0d83728..4e895520f3 100644 --- a/usr/src/lib/libsmbfs/Makefile.com +++ b/usr/src/lib/libsmbfs/Makefile.com @@ -78,7 +78,7 @@ OBJECTS= $(OBJ_LIB) $(OBJ_CMN) include $(SRC)/lib/Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR= ../smb CMNDIR= $(SRC)/common/smbclnt @@ -86,7 +86,6 @@ CMNDIR= $(SRC)/common/smbclnt SRCS= $(OBJ_LIB:%.o=$(SRCDIR)/%.c) \ $(OBJ_CMN:%.o=$(CMNDIR)/%.c) -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CSTD= $(CSTD_GNU99) @@ -106,18 +105,11 @@ CPPFLAGS += -D__EXTENSIONS__ -D_REENTRANT -DMIA \ -I$(SRC)/uts/common \ -I$(SRC)/common/smbclnt -# This is pretty mature code, so let's just ignore these. -LINTCHECKFLAGS += -erroff=E_INCONS_ARG_DECL2 -LINTCHECKFLAGS += -erroff=E_INCONS_VAL_TYPE_DECL2 -LINTCHECKFLAGS += -erroff=E_FUNC_RET_MAYBE_IGNORED2 -LINTCHECKFLAGS += -erroff=E_FUNC_RET_ALWAYS_IGNOR2 - # Debugging ${NOT_RELEASE_BUILD} CPPFLAGS += -DDEBUG all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libsmbfs/amd64/Makefile b/usr/src/lib/libsmbfs/amd64/Makefile index 7443ee1806..3c01fb5b3a 100644 --- a/usr/src/lib/libsmbfs/amd64/Makefile +++ b/usr/src/lib/libsmbfs/amd64/Makefile @@ -22,10 +22,8 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libsmbfs/i386/Makefile b/usr/src/lib/libsmbfs/i386/Makefile index 23b74c3928..4acb0bde30 100644 --- a/usr/src/lib/libsmbfs/i386/Makefile +++ b/usr/src/lib/libsmbfs/i386/Makefile @@ -22,9 +22,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libsmbfs/sparc/Makefile b/usr/src/lib/libsmbfs/sparc/Makefile index 23b74c3928..4acb0bde30 100644 --- a/usr/src/lib/libsmbfs/sparc/Makefile +++ b/usr/src/lib/libsmbfs/sparc/Makefile @@ -22,9 +22,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libsmbfs/sparcv9/Makefile b/usr/src/lib/libsmbfs/sparcv9/Makefile index 7443ee1806..3c01fb5b3a 100644 --- a/usr/src/lib/libsmbfs/sparcv9/Makefile +++ b/usr/src/lib/libsmbfs/sparcv9/Makefile @@ -22,10 +22,8 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libsmbios/Makefile b/usr/src/lib/libsmbios/Makefile index 065ab04fdd..bd06132f3d 100644 --- a/usr/src/lib/libsmbios/Makefile +++ b/usr/src/lib/libsmbios/Makefile @@ -22,26 +22,23 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib HDRS = smbios.h HDRDIR = common -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libsmbios/Makefile.com b/usr/src/lib/libsmbios/Makefile.com index 1534830317..3c87bd1840 100644 --- a/usr/src/lib/libsmbios/Makefile.com +++ b/usr/src/lib/libsmbios/Makefile.com @@ -44,7 +44,7 @@ COMMON_SRCDIR = ../../../common/smbios COMMON_HDR = $(SRC)/uts/common/sys/smbios.h SRCS = $(COMMON_OBJS:%.o=$(COMMON_SRCDIR)/%.c) $(LIB_OBJS:%.o=../common/%.c) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common @@ -56,13 +56,11 @@ LDLIBS += -ldevinfo -lc CFLAGS += $(C_BIGPICFLAGS) CFLAGS64 += $(C_BIGPICFLAGS64) -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) .KEEP_STATE: all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libsmbios/amd64/Makefile b/usr/src/lib/libsmbios/amd64/Makefile index c9bd26cfd3..b13b247ca8 100644 --- a/usr/src/lib/libsmbios/amd64/Makefile +++ b/usr/src/lib/libsmbios/amd64/Makefile @@ -22,10 +22,8 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libsmbios/i386/Makefile b/usr/src/lib/libsmbios/i386/Makefile index a333224278..282da97a76 100644 --- a/usr/src/lib/libsmbios/i386/Makefile +++ b/usr/src/lib/libsmbios/i386/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libsmbios/sparc/Makefile b/usr/src/lib/libsmbios/sparc/Makefile index a333224278..282da97a76 100644 --- a/usr/src/lib/libsmbios/sparc/Makefile +++ b/usr/src/lib/libsmbios/sparc/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libsmbios/sparcv9/Makefile b/usr/src/lib/libsmbios/sparcv9/Makefile index c9bd26cfd3..b13b247ca8 100644 --- a/usr/src/lib/libsmbios/sparcv9/Makefile +++ b/usr/src/lib/libsmbios/sparcv9/Makefile @@ -22,10 +22,8 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libsmedia/Makefile b/usr/src/lib/libsmedia/Makefile index ebf5d73f37..a5509a3f9c 100644 --- a/usr/src/lib/libsmedia/Makefile +++ b/usr/src/lib/libsmedia/Makefile @@ -22,11 +22,6 @@ # Copyright (c) 1991-1999 by Sun Microsystems, Inc. # All rights reserved. # -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/libsmedia/Makefile -# - SUBDIRS = plugins library def := TARGET= def @@ -34,12 +29,9 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -modlintlib := TARGET= modlintlib -clean.lint := TARGET= clean.lint -_msg := TARGET= catalog +_msg := TARGET= catalog -all install clean clobber lint _msg : $(SUBDIRS) +all install clean clobber _msg: $(SUBDIRS) $(SUBDIRS) : FRC @cd $@; pwd; $(MAKE) $(TARGET) @@ -47,5 +39,5 @@ $(SUBDIRS) : FRC install_h check : @cd library; pwd; $(MAKE) $@ -FRC : +FRC : diff --git a/usr/src/lib/libsmedia/library/Makefile b/usr/src/lib/libsmedia/library/Makefile index cf1194b02e..7bb74c58a8 100644 --- a/usr/src/lib/libsmedia/library/Makefile +++ b/usr/src/lib/libsmedia/library/Makefile @@ -34,10 +34,9 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint package := TARGET= package -LIBRARY= libsmedia.a +LIBRARY= libsmedia.a TEXT_DOMAIN= SUNW_OST_OSLIB XGETFLAGS= -a POFILE= $(LIBRARY:.a=.po) @@ -48,7 +47,7 @@ GREP= grep .KEEP_STATE: -all clean delete install lint package: $(SUBDIRS) +all clean delete install package: $(SUBDIRS) clobber : $(SUBDIRS) $(RM) $(CLOBBERFILES) diff --git a/usr/src/lib/libsmedia/library/Makefile.com b/usr/src/lib/libsmedia/library/Makefile.com index 4807392165..cdaf3d7624 100644 --- a/usr/src/lib/libsmedia/library/Makefile.com +++ b/usr/src/lib/libsmedia/library/Makefile.com @@ -37,21 +37,12 @@ include ../../../Makefile.lib SRCDIR = ../common -# We can't lint the rpcgen-generated files. -# (Well, we could, but we couldn't fix them.) -lintcheck := SRCS = ../common/l_generic.c ../common/l_misc.c - -LIBS = $(DYNLIB) $(LINTLIB) - -# definitions for lint - -LINTSRC= $(LINTLIB:%.ln=%) -$(LINTLIB):= SRCS = ../common/$(LINTSRC) +LIBS = $(DYNLIB) CLEANFILES += $(DERIVED_FILES:%=../common/%) CPPFLAGS += -D_REENTRANT -I$(SRC)/cmd/smserverd/ -CFLAGS += $(CCVERBOSE) +CFLAGS += $(CCVERBOSE) CFLAGS64 += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-unused-variable @@ -62,7 +53,6 @@ LDLIBS += -lnsl -lc all: $(LIBS) -lint: lintcheck # include library targets include ../../../Makefile.targ @@ -71,14 +61,6 @@ objs/%.o pics/%.o: ../common/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) -# install rule for lint library target - -$(ROOTLINTDIR64)/%: ../common/% - $(INS.file) - -$(ROOTLINTDIR)/%: ../common/% - $(INS.file) - # # Derived files # diff --git a/usr/src/lib/libsmedia/library/i386/Makefile b/usr/src/lib/libsmedia/library/i386/Makefile index 50cbcb01b9..fdba8b0416 100644 --- a/usr/src/lib/libsmedia/library/i386/Makefile +++ b/usr/src/lib/libsmedia/library/i386/Makefile @@ -22,11 +22,9 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libsmedia/library/sparc/Makefile b/usr/src/lib/libsmedia/library/sparc/Makefile index 6cfe59363b..fc9f3314e3 100644 --- a/usr/src/lib/libsmedia/library/sparc/Makefile +++ b/usr/src/lib/libsmedia/library/sparc/Makefile @@ -22,12 +22,10 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libsmedia/plugins/Makefile b/usr/src/lib/libsmedia/plugins/Makefile index d4e3468005..c9db1892bf 100644 --- a/usr/src/lib/libsmedia/plugins/Makefile +++ b/usr/src/lib/libsmedia/plugins/Makefile @@ -22,8 +22,6 @@ # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2013 Garrett D'Amore <garrett@damore.org> # -# lib/libsmedia/plugins/Makefile - SUBDIRS = \ blkdev \ @@ -35,17 +33,13 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -modlintlib := TARGET= modlintlib -clean.lint := TARGET= clean.lint check := TARGET= check install_h := TARGET= install_h -catalog := TARGET= catalog +catalog := TARGET= catalog -all install install_h clean clobber lint catalog : $(SUBDIRS) +all install install_h clean clobber catalog: $(SUBDIRS) $(SUBDIRS) : FRC @cd $@; pwd; $(MAKE) $(TARGET) -FRC : - +FRC : diff --git a/usr/src/lib/libsmedia/plugins/Makefile.com b/usr/src/lib/libsmedia/plugins/Makefile.com index 5c239ce171..3d9bfb9bf6 100644 --- a/usr/src/lib/libsmedia/plugins/Makefile.com +++ b/usr/src/lib/libsmedia/plugins/Makefile.com @@ -29,7 +29,6 @@ LIBS = $(DYNLIB) CPPFLAGS += -I../inc -I$(SRC)/cmd/smserverd/ LDLIBS += -lc $(PLUGIN_SPECIFIC_LIB) -LINTPLUGIN = llib-$(LIBNAME).ln PLUGINDIR = $(ROOTLIBDIR)/smedia PLUGINDIR64 = $(ROOTLIBDIR)/smedia/$(MACH64) FILEMODE = 555 @@ -38,26 +37,13 @@ SOFILES = $(LIBRARY:%.a=%.so) PLUGINS = $(LIBS:%=$(PLUGINDIR)/%) PLUGINS64 = $(LIBS:%=$(PLUGINDIR64)/%) -CLEANFILES= $(LINTOUT) $(LINTPLUGIN) - SRCDIR = ../common # not linted SMATCH=off -LINTFLAGS += -xu -LINTFLAGS64 += -xu -$(LINTPLUGIN) := SRCS=$(OBJECTS:%.o=../common/%.c) -$(LINTPLUGIN) := LINTFLAGS=-nvx -$(LINTPLUGIN) := TARGET_ARCH= - -LINTSRC= $(LINTPLUGIN:%.ln=%) -ROOTLINTDIR= $(ROOTLIBDIR) -ROOTLINT= $(LINTSRC:%=$(ROOTLINTDIR)/%) - .KEEP_STATE: -lint: lintcheck objs/%.o pics/%.o: ../common/%.c $(COMPILE.c) -o $@ $< diff --git a/usr/src/lib/libsmedia/plugins/Makefile.plugin b/usr/src/lib/libsmedia/plugins/Makefile.plugin index 0dd6e561b6..331d8bfc9e 100644 --- a/usr/src/lib/libsmedia/plugins/Makefile.plugin +++ b/usr/src/lib/libsmedia/plugins/Makefile.plugin @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBS = $(DYNLIB) @@ -41,9 +39,8 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint -all install clean lint: $(SUBDIRS) +all install clean: $(SUBDIRS) clobber : $(SUBDIRS) $(RM) -f $(POFILE) @@ -64,4 +61,4 @@ $(POFILE) : $(POFILE_SRCS) $(COMPILE.cpp) $(POFILE_SRCS) | $(XGETTEXT) $(XGETFLAGS) - $(SED) -e '/^domain/d' messages.po > $@ $(RM) messages.po - + diff --git a/usr/src/lib/libsocket/Makefile b/usr/src/lib/libsocket/Makefile index 763363b7fd..7a6668dfc2 100644 --- a/usr/src/lib/libsocket/Makefile +++ b/usr/src/lib/libsocket/Makefile @@ -33,7 +33,6 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint POFILE = libsocket.po MSGFILES = `$(GREP) -l gettext */*.[ch]` @@ -42,7 +41,7 @@ TEXT_DOMAIN = SUNW_OST_NETRPC .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libsocket/Makefile.com b/usr/src/lib/libsocket/Makefile.com index bc51201190..d66af7cde9 100644 --- a/usr/src/lib/libsocket/Makefile.com +++ b/usr/src/lib/libsocket/Makefile.com @@ -41,13 +41,12 @@ include ../../Makefile.lib # install this library in the root filesystem include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCS = $(INETOBJS:%.o=../inet/%.c) $(SOCKOBJS:%.o=../socket/%.c) LDLIBS += -lnsl -lc SRCDIR = ../common -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) # Make string literals read-only to save memory. CFLAGS += $(XSTRCONST) @@ -68,7 +67,6 @@ SMATCH=off all: -lint: lintcheck # libsocket build rules pics/%.o: ../inet/%.c diff --git a/usr/src/lib/libsocket/amd64/Makefile b/usr/src/lib/libsocket/amd64/Makefile index 9fcd5cdbcb..b5ea3b52d1 100644 --- a/usr/src/lib/libsocket/amd64/Makefile +++ b/usr/src/lib/libsocket/amd64/Makefile @@ -22,7 +22,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -30,4 +30,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsocket/i386/Makefile b/usr/src/lib/libsocket/i386/Makefile index a1257bea6f..8d2e4a0b95 100644 --- a/usr/src/lib/libsocket/i386/Makefile +++ b/usr/src/lib/libsocket/i386/Makefile @@ -22,11 +22,9 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsocket/sparc/Makefile b/usr/src/lib/libsocket/sparc/Makefile index c3ea53cfe4..e82960834b 100644 --- a/usr/src/lib/libsocket/sparc/Makefile +++ b/usr/src/lib/libsocket/sparc/Makefile @@ -23,11 +23,9 @@ # Copyright (c) 1997-2001 by Sun Microsystems, Inc. # All rights reserved. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsocket/sparcv9/Makefile b/usr/src/lib/libsocket/sparcv9/Makefile index 2eafde412a..1d6a481946 100644 --- a/usr/src/lib/libsocket/sparcv9/Makefile +++ b/usr/src/lib/libsocket/sparcv9/Makefile @@ -23,7 +23,7 @@ # Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -31,4 +31,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsqlite/Makefile b/usr/src/lib/libsqlite/Makefile index 2d156094a3..a197a94394 100644 --- a/usr/src/lib/libsqlite/Makefile +++ b/usr/src/lib/libsqlite/Makefile @@ -27,14 +27,13 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint # This is the default Makefile target. The objects listed here # are what get build when you type just "make" with no arguments. # all install: sqlite.h $(SUBDIRS) -clobber lint: $(SUBDIRS) +clobber: $(SUBDIRS) $(ROOTHDRDIR): $(INS.dir) diff --git a/usr/src/lib/libsqlite/Makefile.com b/usr/src/lib/libsqlite/Makefile.com index 8dd20a4ce9..85beefbd37 100644 --- a/usr/src/lib/libsqlite/Makefile.com +++ b/usr/src/lib/libsqlite/Makefile.com @@ -53,9 +53,8 @@ include $(SRC)/lib/Makefile.rootfs SRCDIR = ../src TOOLDIR = ../tool $(DYNLIB) := LDLIBS += -lc -LIBS = $(DYNLIB) $(LINTLIB) $(NATIVERELOC) +LIBS = $(DYNLIB) $(NATIVERELOC) -$(LINTLIB) := SRCS = ../$(LINTSRC) # generated sources GENSRC = opcodes.c parse.c @@ -203,19 +202,14 @@ install: all \ $(ROOTLIBDIR)/$(DYNLIB) \ $(ROOTLIBDIR)/$(NATIVERELOC) -lint: all_h: $(GENHDR) $(ROOTLIBDIR)/$(NATIVERELOC) := FILEMODE= 644 -$(ROOTLINTDIR)/$(LINTLIB) := FILEMODE= 644 $(ROOTLINK): $(ROOTLIBDIR) $(ROOTLIBDIR)/$(DYNLIB) $(INS.liblink) -$(ROOTLINTDIR)/%: ../% - $(INS.file) - native: $(NATIVERELOC) $(NATIVERELOC): objs .WAIT $(OBJS:%.o=%-native.o) diff --git a/usr/src/lib/libsqlite/i386/Makefile b/usr/src/lib/libsqlite/i386/Makefile index c7cca61bea..4acb0bde30 100644 --- a/usr/src/lib/libsqlite/i386/Makefile +++ b/usr/src/lib/libsqlite/i386/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libsqlite/sparc/Makefile b/usr/src/lib/libsqlite/sparc/Makefile index c7cca61bea..4acb0bde30 100644 --- a/usr/src/lib/libsqlite/sparc/Makefile +++ b/usr/src/lib/libsqlite/sparc/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libsrpt/Makefile b/usr/src/lib/libsrpt/Makefile index 4e049e0fe5..618575fa52 100644 --- a/usr/src/lib/libsrpt/Makefile +++ b/usr/src/lib/libsrpt/Makefile @@ -35,11 +35,10 @@ clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install install_h := TARGET= install_h -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libsrpt/Makefile.com b/usr/src/lib/libsrpt/Makefile.com index db3ff8edc6..97481db726 100644 --- a/usr/src/lib/libsrpt/Makefile.com +++ b/usr/src/lib/libsrpt/Makefile.com @@ -28,17 +28,15 @@ OBJECTS = libsrpt.o include ../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) SRPTMODDIR = ../../../uts/common/io/comstar/port/srpt INCS += -I$(SRCDIR) -I$(SRPTMODDIR) CSTD = $(CSTD_GNU99) -C99LMODE = -Xc99=%all LDLIBS += -lc -lnvpair -lstmf CPPFLAGS += $(INCS) -D_REENTRANT @@ -46,6 +44,5 @@ CPPFLAGS += $(INCS) -D_REENTRANT all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libsrpt/amd64/Makefile b/usr/src/lib/libsrpt/amd64/Makefile index 644e6b23da..30b6129271 100644 --- a/usr/src/lib/libsrpt/amd64/Makefile +++ b/usr/src/lib/libsrpt/amd64/Makefile @@ -26,4 +26,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libsrpt/i386/Makefile b/usr/src/lib/libsrpt/i386/Makefile index f9373d2096..53dd511aae 100644 --- a/usr/src/lib/libsrpt/i386/Makefile +++ b/usr/src/lib/libsrpt/i386/Makefile @@ -23,4 +23,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libsrpt/sparc/Makefile b/usr/src/lib/libsrpt/sparc/Makefile index 3f74bc6793..5752e4d1be 100644 --- a/usr/src/lib/libsrpt/sparc/Makefile +++ b/usr/src/lib/libsrpt/sparc/Makefile @@ -24,4 +24,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libsrpt/sparcv9/Makefile b/usr/src/lib/libsrpt/sparcv9/Makefile index 8f83585151..793460c0ac 100644 --- a/usr/src/lib/libsrpt/sparcv9/Makefile +++ b/usr/src/lib/libsrpt/sparcv9/Makefile @@ -25,7 +25,7 @@ include ../Makefile.com include ../../Makefile.lib.64 -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) all: $(LIBS) diff --git a/usr/src/lib/libstmf/Makefile b/usr/src/lib/libstmf/Makefile index ac4a95275d..41243cf6ac 100644 --- a/usr/src/lib/libstmf/Makefile +++ b/usr/src/lib/libstmf/Makefile @@ -33,7 +33,6 @@ clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install install_h := TARGET= install_h -lint := TARGET= lint HDRS= libstmf.h @@ -41,7 +40,7 @@ HDRDIR= common .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libstmf/Makefile.com b/usr/src/lib/libstmf/Makefile.com index 7fd4d6b09d..2b75f643df 100644 --- a/usr/src/lib/libstmf/Makefile.com +++ b/usr/src/lib/libstmf/Makefile.com @@ -31,14 +31,13 @@ OBJECTS= stmf.o store.o include ../../Makefile.lib -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) SRCDIR = ../common INCS += -I$(SRCDIR) CSTD= $(CSTD_GNU99) -C99LMODE= -Xc99=%all LDLIBS += -lc -lnvpair -lscf -lm CPPFLAGS += $(INCS) -D_REENTRANT @@ -47,12 +46,10 @@ CERRWARN += -_gcc=-Wno-unused-label # not linted SMATCH=off -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) .KEEP_STATE: all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libstmf/amd64/Makefile b/usr/src/lib/libstmf/amd64/Makefile index 821cbc8a82..0dba37b85a 100644 --- a/usr/src/lib/libstmf/amd64/Makefile +++ b/usr/src/lib/libstmf/amd64/Makefile @@ -29,4 +29,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libstmf/i386/Makefile b/usr/src/lib/libstmf/i386/Makefile index 95a52ca13f..4f51c80a6e 100644 --- a/usr/src/lib/libstmf/i386/Makefile +++ b/usr/src/lib/libstmf/i386/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libstmf/sparc/Makefile b/usr/src/lib/libstmf/sparc/Makefile index ef68abede6..13c0a6c291 100644 --- a/usr/src/lib/libstmf/sparc/Makefile +++ b/usr/src/lib/libstmf/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libstmf/sparcv9/Makefile b/usr/src/lib/libstmf/sparcv9/Makefile index 70aafac121..9dc00d7400 100644 --- a/usr/src/lib/libstmf/sparcv9/Makefile +++ b/usr/src/lib/libstmf/sparcv9/Makefile @@ -27,7 +27,7 @@ include ../Makefile.com include ../../Makefile.lib.64 -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) all: $(LIBS) diff --git a/usr/src/lib/libstmfproxy/Makefile b/usr/src/lib/libstmfproxy/Makefile index 6d1f95f035..f8b53bdf0e 100644 --- a/usr/src/lib/libstmfproxy/Makefile +++ b/usr/src/lib/libstmfproxy/Makefile @@ -33,7 +33,6 @@ clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install install_h := TARGET= install_h -lint := TARGET= lint HDRS= libstmfproxy.h @@ -41,7 +40,7 @@ HDRDIR= common .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libstmfproxy/Makefile.com b/usr/src/lib/libstmfproxy/Makefile.com index e54ba642f3..bd0f9aeb09 100644 --- a/usr/src/lib/libstmfproxy/Makefile.com +++ b/usr/src/lib/libstmfproxy/Makefile.com @@ -30,23 +30,19 @@ OBJECTS= stmftransport.o include ../../Makefile.lib -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) SRCDIR = ../common INCS += -I$(SRCDIR) CSTD= $(CSTD_GNU99) -C99LMODE= -Xc99=%all LDLIBS += -lc -lsocket -lnsl CPPFLAGS += $(INCS) -D_REENTRANT -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) .KEEP_STATE: all: $(LIBS) -#lint: lintcheck - include ../../Makefile.targ diff --git a/usr/src/lib/libstmfproxy/amd64/Makefile b/usr/src/lib/libstmfproxy/amd64/Makefile index 9bf543cd54..72cb942304 100644 --- a/usr/src/lib/libstmfproxy/amd64/Makefile +++ b/usr/src/lib/libstmfproxy/amd64/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libstmfproxy/i386/Makefile b/usr/src/lib/libstmfproxy/i386/Makefile index 0ef5233f44..47878e05bc 100644 --- a/usr/src/lib/libstmfproxy/i386/Makefile +++ b/usr/src/lib/libstmfproxy/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libstmfproxy/sparc/Makefile b/usr/src/lib/libstmfproxy/sparc/Makefile index 5070cffd94..5d797b2e8b 100644 --- a/usr/src/lib/libstmfproxy/sparc/Makefile +++ b/usr/src/lib/libstmfproxy/sparc/Makefile @@ -24,4 +24,4 @@ # include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libsum/Makefile b/usr/src/lib/libsum/Makefile index 7e321090c1..bcf6063972 100644 --- a/usr/src/lib/libsum/Makefile +++ b/usr/src/lib/libsum/Makefile @@ -35,14 +35,13 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint -_msg := TARGET= _msg +_msg := TARGET= _msg .KEEP_STATE: -all clean clobber install lint _msg: $(SUBDIRS) +all clean clobber install _msg: $(SUBDIRS) -LIBRARY= libsum.a +LIBRARY= libsum.a HDRS= \ sum.h diff --git a/usr/src/lib/libsum/Makefile.com b/usr/src/lib/libsum/Makefile.com index 9dffd007f4..9302987f7b 100644 --- a/usr/src/lib/libsum/Makefile.com +++ b/usr/src/lib/libsum/Makefile.com @@ -44,14 +44,13 @@ MAPFILES= ../mapfile-vers # Set common AST build flags (e.g. C99/XPG6, needed to support the math stuff) include ../../../Makefile.ast -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += \ -last \ -lmd \ -lc -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) SRCDIR = ../common @@ -93,12 +92,4 @@ pics/sumlib.o := CERRWARN += -erroff=E_CONST_PROMOTED_UNSIGNED_LONG all: $(LIBS) -# -# libsum is not lint-clean yet; fake up a target. (You can use -# "make lintcheck" to actually run lint; please send all lint fixes -# upstream (to AT&T) so the next update will pull them into ON.) -# -lint: - @ print "usr/src/lib/libsum is not lint-clean: skipping" - include ../../Makefile.targ diff --git a/usr/src/lib/libsum/i386/Makefile b/usr/src/lib/libsum/i386/Makefile index 79cb51eae6..6c35d1fc88 100644 --- a/usr/src/lib/libsum/i386/Makefile +++ b/usr/src/lib/libsum/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libsum/sparc/Makefile b/usr/src/lib/libsum/sparc/Makefile index 79cb51eae6..6c35d1fc88 100644 --- a/usr/src/lib/libsum/sparc/Makefile +++ b/usr/src/lib/libsum/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libsun_ima/Makefile b/usr/src/lib/libsun_ima/Makefile index 31deac7b73..b960f62702 100644 --- a/usr/src/lib/libsun_ima/Makefile +++ b/usr/src/lib/libsun_ima/Makefile @@ -34,11 +34,10 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libsun_ima/Makefile.com b/usr/src/lib/libsun_ima/Makefile.com index f23c75c7b0..2070459bcf 100644 --- a/usr/src/lib/libsun_ima/Makefile.com +++ b/usr/src/lib/libsun_ima/Makefile.com @@ -34,11 +34,10 @@ OBJECTS = $(LOCOBJS) $(COMOBJS) include ../../Makefile.lib SRCS = ../common/ima.c $(SRC)/common/iscsi/utils.c -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) SRCDIR = ../common -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc LDLIBS += -lnsl LDLIBS += -ldevinfo @@ -60,7 +59,6 @@ CPPFLAGS += -DSOLARIS all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libsun_ima/i386/Makefile b/usr/src/lib/libsun_ima/i386/Makefile index 95a52ca13f..4f51c80a6e 100644 --- a/usr/src/lib/libsun_ima/i386/Makefile +++ b/usr/src/lib/libsun_ima/i386/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libsun_ima/sparc/Makefile b/usr/src/lib/libsun_ima/sparc/Makefile index a6f8f0ca91..dcc1b7a2e6 100644 --- a/usr/src/lib/libsun_ima/sparc/Makefile +++ b/usr/src/lib/libsun_ima/sparc/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libsys/Makefile b/usr/src/lib/libsys/Makefile index 24f9ff465f..f956efa735 100644 --- a/usr/src/lib/libsys/Makefile +++ b/usr/src/lib/libsys/Makefile @@ -36,7 +36,6 @@ install := TARGET= install all clean clobber install: $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libsysevent/Makefile b/usr/src/lib/libsysevent/Makefile index 15ab4b3c28..4266cbc3b1 100644 --- a/usr/src/lib/libsysevent/Makefile +++ b/usr/src/lib/libsysevent/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -35,7 +33,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint test := TARGET= test # definitions for install_h target @@ -46,7 +43,7 @@ CHECKHDRS= $(HDRS:%.h=%.check) .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) # install rule for install_h target diff --git a/usr/src/lib/libsysevent/Makefile.com b/usr/src/lib/libsysevent/Makefile.com index a1f97796c2..2a4d20144c 100644 --- a/usr/src/lib/libsysevent/Makefile.com +++ b/usr/src/lib/libsysevent/Makefile.com @@ -35,9 +35,7 @@ OBJECTS= libsysevent.o \ include ../../Makefile.lib include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) - -LINTSRC = $(LINTLIB:%.ln=%) +LIBS = $(DYNLIB) CPPFLAGS += -D_REENTRANT -I.. CFLAGS += $(CCVERBOSE) @@ -46,20 +44,13 @@ LDLIBS += -lnvpair -lc # not linted SMATCH=off -$(LINTLIB) := SRCS = ../llib-lsysevent - .KEEP_STATE: all : $(LIBS) -lint : lintcheck - # include library targets include ../../Makefile.targ pics/%.o: ../%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) - -$(ROOTLINTDIR)/%: ../% - $(INS.file) diff --git a/usr/src/lib/libsysevent/amd64/Makefile b/usr/src/lib/libsysevent/amd64/Makefile index 9e109c2863..e9d461671f 100644 --- a/usr/src/lib/libsysevent/amd64/Makefile +++ b/usr/src/lib/libsysevent/amd64/Makefile @@ -23,8 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 @@ -33,4 +31,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsysevent/i386/Makefile b/usr/src/lib/libsysevent/i386/Makefile index a27d61f99f..2bfb89d072 100644 --- a/usr/src/lib/libsysevent/i386/Makefile +++ b/usr/src/lib/libsysevent/i386/Makefile @@ -23,9 +23,6 @@ # Copyright 2000,2002-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/libsysevent/i386/Makefile include ../Makefile.com @@ -33,4 +30,4 @@ all: $(LIBS) .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsysevent/sparc/Makefile b/usr/src/lib/libsysevent/sparc/Makefile index e3cb1a270b..424b46abc8 100644 --- a/usr/src/lib/libsysevent/sparc/Makefile +++ b/usr/src/lib/libsysevent/sparc/Makefile @@ -23,9 +23,6 @@ # Copyright 2000,2002-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/libsysevent/sparc/Makefile include ../Makefile.com @@ -33,4 +30,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsysevent/sparcv9/Makefile b/usr/src/lib/libsysevent/sparcv9/Makefile index 9b07094621..9b50cbc3f6 100644 --- a/usr/src/lib/libsysevent/sparcv9/Makefile +++ b/usr/src/lib/libsysevent/sparcv9/Makefile @@ -23,9 +23,6 @@ # Copyright 2000,2002-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/libsysevent/sparcv9/Makefile include ../Makefile.com include ../../Makefile.lib.64 @@ -34,4 +31,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libtecla/Makefile b/usr/src/lib/libtecla/Makefile index e5d9e1e429..3fdfe5189b 100644 --- a/usr/src/lib/libtecla/Makefile +++ b/usr/src/lib/libtecla/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -38,11 +36,10 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libtecla/Makefile.com b/usr/src/lib/libtecla/Makefile.com index 975e67c4a0..b7c4c2331b 100644 --- a/usr/src/lib/libtecla/Makefile.com +++ b/usr/src/lib/libtecla/Makefile.com @@ -33,7 +33,7 @@ OBJECTS= getline.o keytab.o freelist.o strngmem.o hash.o history.o \ include ../../Makefile.lib SRCDIR = ../common -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc $(DYNLIB) := LDLIBS += -lcurses CPPFLAGS += -I$(SRCDIR) -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 \ @@ -43,7 +43,6 @@ CPPFLAGS += -I$(SRCDIR) -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 \ -DHAVE_TERM_H=1 -DHAVE_SYS_SELECT_H=1 -DHAVE_SELECT=1 \ -DHAVE_SYSV_PTY=1 -D__EXTENSIONS__=1 -D_POSIX_C_SOURCE=199506L \ -DPREFER_REENTRANT -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) CERRWARN += -_gcc=-Wno-type-limits @@ -54,6 +53,5 @@ SMATCH=off all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libtecla/amd64/Makefile b/usr/src/lib/libtecla/amd64/Makefile index dd68231e26..010d484a50 100644 --- a/usr/src/lib/libtecla/amd64/Makefile +++ b/usr/src/lib/libtecla/amd64/Makefile @@ -23,10 +23,8 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libtecla/i386/Makefile b/usr/src/lib/libtecla/i386/Makefile index af76f5ab90..18584b4da1 100644 --- a/usr/src/lib/libtecla/i386/Makefile +++ b/usr/src/lib/libtecla/i386/Makefile @@ -23,9 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libtecla/sparc/Makefile b/usr/src/lib/libtecla/sparc/Makefile index af76f5ab90..18584b4da1 100644 --- a/usr/src/lib/libtecla/sparc/Makefile +++ b/usr/src/lib/libtecla/sparc/Makefile @@ -23,9 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libtermcap/Makefile b/usr/src/lib/libtermcap/Makefile index dc822135d0..c8a1150c6a 100644 --- a/usr/src/lib/libtermcap/Makefile +++ b/usr/src/lib/libtermcap/Makefile @@ -30,7 +30,6 @@ install := TARGET= install all clean clobber install: $(SUBDIRS) -lint: install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libtermcap/Makefile.com b/usr/src/lib/libtermcap/Makefile.com index 514da01eb8..1a1efeee30 100644 --- a/usr/src/lib/libtermcap/Makefile.com +++ b/usr/src/lib/libtermcap/Makefile.com @@ -13,11 +13,18 @@ # Copyright 2011 Nexenta Systems, Inc. All rights reserved. # +LIBRARY = libtermcap.a +VERS = .1 + # install this library in the root filesystem include ../../Makefile.rootfs -LIBRARY = libtermcap.a -VERS = .1 -LIBS += $(LINTLIB) +COMPATLINKS += usr/ccs/lib/libtermcap.so +COMPATLINKS64 += usr/ccs/lib/$(MACH64)/libtermcap.so + +$(ROOT)/usr/ccs/lib/libtermcap.so := \ + COMPATLINKTARGET=../../../lib/libtermcap.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libtermcap.so := \ + COMPATLINKTARGET=../../../../lib/$(MACH64)/libtermcap.so.1 DYNFLAGS += $(ZLOADFLTR) diff --git a/usr/src/lib/libtermcap/amd64/Makefile b/usr/src/lib/libtermcap/amd64/Makefile index 3e04fa59f3..8ca5b38196 100644 --- a/usr/src/lib/libtermcap/amd64/Makefile +++ b/usr/src/lib/libtermcap/amd64/Makefile @@ -14,9 +14,9 @@ # include $(SRC)/lib/Makefile.filter.com -include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 +include ../Makefile.com -install: $(ROOTLIBS64) $(ROOTLINKS64) +install: $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libtermcap/i386/Makefile b/usr/src/lib/libtermcap/i386/Makefile index e8b506ccb3..552b51a68f 100644 --- a/usr/src/lib/libtermcap/i386/Makefile +++ b/usr/src/lib/libtermcap/i386/Makefile @@ -16,6 +16,6 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libtermcap/sparc/Makefile b/usr/src/lib/libtermcap/sparc/Makefile index e8b506ccb3..552b51a68f 100644 --- a/usr/src/lib/libtermcap/sparc/Makefile +++ b/usr/src/lib/libtermcap/sparc/Makefile @@ -16,6 +16,6 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libtermcap/sparcv9/Makefile b/usr/src/lib/libtermcap/sparcv9/Makefile index 3e04fa59f3..8ca5b38196 100644 --- a/usr/src/lib/libtermcap/sparcv9/Makefile +++ b/usr/src/lib/libtermcap/sparcv9/Makefile @@ -14,9 +14,9 @@ # include $(SRC)/lib/Makefile.filter.com -include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 +include ../Makefile.com -install: $(ROOTLIBS64) $(ROOTLINKS64) +install: $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libthread/Makefile b/usr/src/lib/libthread/Makefile index 6cb7a4fa8a..ef1592a4a5 100644 --- a/usr/src/lib/libthread/Makefile +++ b/usr/src/lib/libthread/Makefile @@ -36,7 +36,6 @@ install := TARGET= install all clean clobber install: $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libthread/Makefile.com b/usr/src/lib/libthread/Makefile.com index 67d2b91e3a..f74b429257 100644 --- a/usr/src/lib/libthread/Makefile.com +++ b/usr/src/lib/libthread/Makefile.com @@ -27,5 +27,35 @@ VERS = .1 include $(SRC)/lib/Makefile.rootfs -LIBS += $(LINTLIB) DYNFLAGS += -F libc.so.1 + +COMPATLINKS += usr/lib/lwp/libthread.so.1 \ + usr/lib/lwp/libthread_db.so.1 \ + lib/libthread_db.so.1 \ + lib/libthread_db.so \ + usr/lib/libthread_db.so.1 \ + usr/lib/libthread_db.so + +COMPATLINKS64 += usr/lib/lwp/$(MACH64)/libthread.so.1 \ + usr/lib/lwp/$(MACH64)/libthread_db.so.1 \ + lib/$(MACH64)/libthread_db.so.1 \ + lib/$(MACH64)/libthread_db.so \ + usr/lib/$(MACH64)/libthread_db.so.1 \ + usr/lib/$(MACH64)/libthread_db.so + +$(ROOT)/usr/lib/lwp/libthread.so.1 := COMPATLINKTARGET=../libthread.so.1 +$(ROOT)/usr/lib/lwp/libthread_db.so.1 := COMPATLINKTARGET=../libthread_db.so.1 +$(ROOT)/usr/lib/lwp/$(MACH64)/libthread.so.1:= \ + COMPATLINKTARGET=../../$(MACH64)/libthread.so.1 +$(ROOT)/usr/lib/lwp/$(MACH64)/libthread_db.so.1:= \ + COMPATLINKTARGET=../../$(MACH64)/libthread_db.so.1 +$(ROOT)/lib/libthread_db.so.1 := COMPATLINKTARGET=libc_db.so.1 +$(ROOT)/lib/libthread_db.so := COMPATLINKTARGET=libc_db.so.1 +$(ROOT)/usr/lib/libthread_db.so.1 := COMPATLINKTARGET=../../lib/libc_db.so.1 +$(ROOT)/usr/lib/libthread_db.so := COMPATLINKTARGET=../../lib/libc_db.so.1 +$(ROOT)/lib/$(MACH64)/libthread_db.so.1 := COMPATLINKTARGET=libc_db.so.1 +$(ROOT)/lib/$(MACH64)/libthread_db.so := COMPATLINKTARGET=libc_db.so.1 +$(ROOT)/usr/lib/$(MACH64)/libthread_db.so.1:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/libc_db.so.1 +$(ROOT)/usr/lib/$(MACH64)/libthread_db.so:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/libc_db.so.1 diff --git a/usr/src/lib/libthread/amd64/Makefile b/usr/src/lib/libthread/amd64/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libthread/amd64/Makefile +++ b/usr/src/lib/libthread/amd64/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libthread/i386/Makefile b/usr/src/lib/libthread/i386/Makefile index 4e4e8c02a9..682e5560ca 100644 --- a/usr/src/lib/libthread/i386/Makefile +++ b/usr/src/lib/libthread/i386/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libthread/sparc/Makefile b/usr/src/lib/libthread/sparc/Makefile index 4e4e8c02a9..682e5560ca 100644 --- a/usr/src/lib/libthread/sparc/Makefile +++ b/usr/src/lib/libthread/sparc/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libthread/sparcv9/Makefile b/usr/src/lib/libthread/sparcv9/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libthread/sparcv9/Makefile +++ b/usr/src/lib/libthread/sparcv9/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libtnf/Makefile b/usr/src/lib/libtnf/Makefile index 85abde990e..1e3ba360aa 100644 --- a/usr/src/lib/libtnf/Makefile +++ b/usr/src/lib/libtnf/Makefile @@ -61,14 +61,13 @@ HDRS= tnf.h ROOTHDRDIR= $(ROOT)/usr/include/tnf ROOTHDRS= $(HDRS:%=$(ROOTHDRDIR)/%) CHECKHDRS= $(HDRS:%.h=%.check) -$(ROOTHDRS) := FILEMODE = 0644 +$(ROOTHDRS) := FILEMODE = 0644 CHECKHDRS = $(HDRS:%.h=%.check) $(ROOTHDRS) := FILEMODE = 644 CPPFLAGS += -D_DATUM_MACROS -D_REENTRANT -LINTFLAGS += -y CERRWARN += -_gcc=-Wno-unused-variable @@ -80,8 +79,6 @@ install: all $(ROOTLIBDIR) $(ROOTLIBS) $(ROOTLINKS) install_h: $(ROOTHDRDIR) $(ROOTHDRS) -lint: - $(LINT.c) $(SRCS) check: $(CHECKHDRS) diff --git a/usr/src/lib/libtnfctl/Makefile b/usr/src/lib/libtnfctl/Makefile index a8ebf82399..b126ac0d1f 100644 --- a/usr/src/lib/libtnfctl/Makefile +++ b/usr/src/lib/libtnfctl/Makefile @@ -30,17 +30,16 @@ SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) # conditional assignments -all := TARGET = all +all := TARGET = all install := TARGET = install clean := TARGET = clean clobber := TARGET = clobber -lint := TARGET = lint -_msg := TARGET= _msg +_msg := TARGET= _msg -LIBRARY= libtnfctl.a +LIBRARY= libtnfctl.a TEXT_DOMAIN= SUNW_OST_OSLIB XGETFLAGS= -a -MSGDIRS= +MSGDIRS= POFILE= $(LIBRARY:.a=.po) POFILES= generic.po @@ -52,12 +51,12 @@ HDRS= tnfctl.h ROOTHDRDIR= $(ROOT)/usr/include/tnf ROOTHDRS= $(HDRS:%=$(ROOTHDRDIR)/%) CHECKHDRS= $(HDRS:%.h=%.check) -$(ROOTHDRS) := FILEMODE = 0644 +$(ROOTHDRS) := FILEMODE = 0644 CHECKHDRS = $(HDRS:%.h=%.check) .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) install_h: $(ROOTHDRDIR) $(ROOTHDRS) diff --git a/usr/src/lib/libtnfctl/Makefile.com b/usr/src/lib/libtnfctl/Makefile.com index 47d3ca9527..83cff465bc 100644 --- a/usr/src/lib/libtnfctl/Makefile.com +++ b/usr/src/lib/libtnfctl/Makefile.com @@ -73,7 +73,6 @@ LDLIBS += -lc -lelf CPPFLAGS += -I$(SRC)/lib/libtnfprobe -D_REENTRANT -I$(SRC)/cmd/sgs/include -LINTFLAGS += -y CERRWARN += $(CNOWARN_UNINIT) CERRWARN += -_gcc=-Wno-empty-body @@ -92,8 +91,6 @@ all: $(LIBS) install_h: $(ROOTHDRDIR) $(ROOTHDRS) -lint: - $(LINT.c) $(SRCS) check: $(CHECKHDRS) diff --git a/usr/src/lib/libtnfprobe/Makefile b/usr/src/lib/libtnfprobe/Makefile index 1235f9d41d..25c3e8a3ed 100644 --- a/usr/src/lib/libtnfprobe/Makefile +++ b/usr/src/lib/libtnfprobe/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -31,23 +29,22 @@ SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) # conditional assignments -all := TARGET = all +all := TARGET = all install := TARGET = install clean := TARGET = clean clobber := TARGET = clobber -lint := TARGET = lint #definitions for install_h target HDRS= com.h writer.h probe.h ROOTHDRDIR= $(ROOT)/usr/include/tnf ROOTHDRS= $(HDRS:%=$(ROOTHDRDIR)/%) CHECKHDRS= $(HDRS:%.h=%.check) -$(ROOTHDRS) := FILEMODE = 0644 +$(ROOTHDRS) := FILEMODE = 0644 CHECKHDRS = $(HDRS:%.h=%.check) .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) install_h: $(ROOTHDRDIR) $(ROOTHDRS) diff --git a/usr/src/lib/libtnfprobe/Makefile.com b/usr/src/lib/libtnfprobe/Makefile.com index 5dbde86c95..f910244e26 100644 --- a/usr/src/lib/libtnfprobe/Makefile.com +++ b/usr/src/lib/libtnfprobe/Makefile.com @@ -43,9 +43,6 @@ OBJECTS= $(OBJECTS.c) $(UFSOBJS) $(OBJECTS.s) include ../../Makefile.lib -# We omit $(OBJECTS.s:%.o=%.s) in the next line, because lint no like -SRCS= $(OBJECTS.c:%.o=../%.c) $(UFSOBJS:%.o=$(UFSDIR)/%.c) - LIBS= $(DYNLIB) DYNFLAGS += $(ZINTERPOSE) @@ -61,7 +58,6 @@ CHECKHDRS = $(HDRS:%.h=%.check) # pick up tnf_types.h CPPFLAGS += -I.. -I$(UFSDIR) -D_REENTRANT -D_TNF_LIBRARY -LINTFLAGS += -y CERRWARN += -_gcc=-Wno-unused-variable CERRWARN += -_gcc=-Wno-parentheses @@ -80,8 +76,6 @@ all: $(LIBS) install_h: $(ROOTHDRDIR) $(ROOTHDRS) -lint: - $(LINT.c) $(SRCS) check: $(CHECKHDRS) diff --git a/usr/src/lib/libtsalarm/Makefile b/usr/src/lib/libtsalarm/Makefile index 56ffb3ba6c..038a1483c6 100644 --- a/usr/src/lib/libtsalarm/Makefile +++ b/usr/src/lib/libtsalarm/Makefile @@ -22,9 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libtsalarm/Makefile include $(SRC)/lib/Makefile.lib @@ -35,11 +32,10 @@ clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install install_h := TARGET= install_h -lint := TARGET= lint .KEEP_STATE: -all clean clobber install_h lint : $(SUBDIRS) +all clean clobber install_h: $(SUBDIRS) install : $(SUBDIRS) diff --git a/usr/src/lib/libtsalarm/Makefile.com b/usr/src/lib/libtsalarm/Makefile.com index a4a6d07c25..4e4d43f2c2 100644 --- a/usr/src/lib/libtsalarm/Makefile.com +++ b/usr/src/lib/libtsalarm/Makefile.com @@ -55,11 +55,6 @@ INS.slink8= $(RM) -r $@; $(SYMLINK) ../$(PLATFORM)/include $@ .KEEP_STATE: -# -# build/lint rules -# all: $(LIBS) -lint: lintcheck - include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libtsnet/Makefile b/usr/src/lib/libtsnet/Makefile index e02f847ac2..fe28b5a74a 100644 --- a/usr/src/lib/libtsnet/Makefile +++ b/usr/src/lib/libtsnet/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -36,14 +34,13 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint POFILE = libtsnet.po MSGFILES = common/misc.i .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libtsnet/Makefile.com b/usr/src/lib/libtsnet/Makefile.com index a929254ab1..3b3a3a334c 100644 --- a/usr/src/lib/libtsnet/Makefile.com +++ b/usr/src/lib/libtsnet/Makefile.com @@ -37,10 +37,9 @@ include ../../Makefile.lib # install this library in the root filesystem include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) LDLIBS += -lsocket -lnsl -lc -lsecdb -ltsol @@ -53,6 +52,5 @@ CERRWARN += $(CNOWARN_UNINIT) all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libtsnet/amd64/Makefile b/usr/src/lib/libtsnet/amd64/Makefile index 69cf39010b..a48c536235 100644 --- a/usr/src/lib/libtsnet/amd64/Makefile +++ b/usr/src/lib/libtsnet/amd64/Makefile @@ -23,9 +23,7 @@ # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" - include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libtsnet/i386/Makefile b/usr/src/lib/libtsnet/i386/Makefile index 2a944b0b43..8537c30eda 100644 --- a/usr/src/lib/libtsnet/i386/Makefile +++ b/usr/src/lib/libtsnet/i386/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -31,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libtsnet/sparc/Makefile b/usr/src/lib/libtsnet/sparc/Makefile index 73ba2bbce8..1551cf2cb2 100644 --- a/usr/src/lib/libtsnet/sparc/Makefile +++ b/usr/src/lib/libtsnet/sparc/Makefile @@ -22,11 +22,9 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libtsnet/sparcv9/Makefile b/usr/src/lib/libtsnet/sparcv9/Makefile index 69cf39010b..a48c536235 100644 --- a/usr/src/lib/libtsnet/sparcv9/Makefile +++ b/usr/src/lib/libtsnet/sparcv9/Makefile @@ -23,9 +23,7 @@ # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" - include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libtsol/Makefile b/usr/src/lib/libtsol/Makefile index 8e91f2fadb..e71dd46fa8 100644 --- a/usr/src/lib/libtsol/Makefile +++ b/usr/src/lib/libtsol/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -36,18 +34,17 @@ POFILE = libtsol.po MSGFILES = common/btos.c common/private.c common/stob.c XGETFLAGS = -a -all := TARGET = all +all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: # Override so that label.h gets installed where expected. ROOTHDRDIR= $(ROOT)/usr/include/tsol -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libtsol/Makefile.com b/usr/src/lib/libtsol/Makefile.com index 478376427c..5b0aa1991a 100644 --- a/usr/src/lib/libtsol/Makefile.com +++ b/usr/src/lib/libtsol/Makefile.com @@ -43,23 +43,16 @@ include ../../Makefile.lib # install this library in the root filesystem include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lsecdb -lc SRCDIR = ../common -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) - -lint:= SRCS = \ - $(NONCOMMONOBJS:%.o=$(SRCDIR)/%.c) \ - $(COMMONOBJS:%.o=$(COMMONDIR)/%.c) COMMONDIR= $(SRC)/common/tsol CFLAGS += $(CCVERBOSE) CPPFLAGS += -D_REENTRANT -I$(SRCDIR) -I$(COMMONDIR) -LINTFLAGS64 += -m64 - CERRWARN += $(CNOWARN_UNINIT) # not linted @@ -69,7 +62,6 @@ SMATCH=off all: $(LIBS) -lint: lintcheck objs/%.o pic_profs/%.o pics/%.o: $(COMMONDIR)/%.c $(COMPILE.c) -o $@ $< diff --git a/usr/src/lib/libtsol/amd64/Makefile b/usr/src/lib/libtsol/amd64/Makefile index 69cf39010b..a48c536235 100644 --- a/usr/src/lib/libtsol/amd64/Makefile +++ b/usr/src/lib/libtsol/amd64/Makefile @@ -23,9 +23,7 @@ # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" - include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libtsol/i386/Makefile b/usr/src/lib/libtsol/i386/Makefile index fb5e32504a..0a45e8bf8d 100644 --- a/usr/src/lib/libtsol/i386/Makefile +++ b/usr/src/lib/libtsol/i386/Makefile @@ -21,10 +21,7 @@ # # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. -#/ - -#ident "%Z%%M% %I% %E% SMI" include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libtsol/sparc/Makefile b/usr/src/lib/libtsol/sparc/Makefile index 4addab0cae..cf2087e71e 100644 --- a/usr/src/lib/libtsol/sparc/Makefile +++ b/usr/src/lib/libtsol/sparc/Makefile @@ -23,8 +23,6 @@ # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" - include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libtsol/sparcv9/Makefile b/usr/src/lib/libtsol/sparcv9/Makefile index 69cf39010b..a48c536235 100644 --- a/usr/src/lib/libtsol/sparcv9/Makefile +++ b/usr/src/lib/libtsol/sparcv9/Makefile @@ -23,9 +23,7 @@ # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" - include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libumem/Makefile b/usr/src/lib/libumem/Makefile index ed59c686ef..f5010815cf 100644 --- a/usr/src/lib/libumem/Makefile +++ b/usr/src/lib/libumem/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -36,11 +34,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libumem/Makefile.com b/usr/src/lib/libumem/Makefile.com index 504a8beb38..21ddb07c76 100644 --- a/usr/src/lib/libumem/Makefile.com +++ b/usr/src/lib/libumem/Makefile.com @@ -159,7 +159,7 @@ CFLAGS64 += $(CCVERBOSE) $(CFLAGS64_$(CURTYPE)) $(CFLAGS64_common) pics/umem.o := SMOFF += index_overflow objs/umem.o := SMOFF += index_overflow -INSTALL_DEPS_library = $(ROOTLINKS) $(ROOTLIBS) +INSTALL_DEPS_library = $(ROOTLINKS) $(ROOTLIBS) $(ROOTCOMPATLINKS) DYNFLAGS += $(ZINTERPOSE) diff --git a/usr/src/lib/libumem/Makefile.targ b/usr/src/lib/libumem/Makefile.targ index 621b935002..9665914f7b 100644 --- a/usr/src/lib/libumem/Makefile.targ +++ b/usr/src/lib/libumem/Makefile.targ @@ -45,11 +45,6 @@ $(TYPES:%=all.%): all.library.targ: $(LIBS) all.standalone.targ: $(STANDLIBRARY) -lint: $(TYPES:%=lint.%) - -$(TYPES:%=lint.%): - @$(MAKE) lintcheck CURTYPE=$(@:lint.%=%) - $(STANDLIBRARY): $(OBJS) $(LINKTEST_OBJ) $(LD) $(BREDUCE) $(ZDEFS) $(LDFLAGS) -o $@.linktest $(OBJS) $(LINKTEST_OBJ) rm $@.linktest @@ -80,7 +75,3 @@ objs/%.o pics/%.o: $(ISASRCDIR)/%.s objs/%.o pics/%.o: ../common/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) - -# install rule for lint library target -$(ROOTLINTDIR)/%: ../common/% - $(INS.file) diff --git a/usr/src/lib/libumem/amd64/Makefile b/usr/src/lib/libumem/amd64/Makefile index b32dff53b1..66257765d3 100644 --- a/usr/src/lib/libumem/amd64/Makefile +++ b/usr/src/lib/libumem/amd64/Makefile @@ -23,8 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# ISASRCDIR=../$(MACH)/ @@ -33,6 +31,7 @@ include ../../Makefile.lib.64 TYPES=library standalone -INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLINT64) $(ROOTLIBS64) +INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLIBS64) \ + $(ROOTCOMPATLINKS64) include ../Makefile.targ diff --git a/usr/src/lib/libumem/sparcv9/Makefile b/usr/src/lib/libumem/sparcv9/Makefile index c7fd416349..27258f0fc7 100644 --- a/usr/src/lib/libumem/sparcv9/Makefile +++ b/usr/src/lib/libumem/sparcv9/Makefile @@ -23,8 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# ISASRCDIR=../sparc @@ -33,6 +31,7 @@ include ../../Makefile.lib.64 TYPES=library standalone -INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLINT64) $(ROOTLIBS64) +INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLIBS64) \ + $(ROOTCOMPATLINKS64) include ../Makefile.targ diff --git a/usr/src/lib/libuuid/Makefile b/usr/src/lib/libuuid/Makefile index 933be73e70..b00f17c691 100644 --- a/usr/src/lib/libuuid/Makefile +++ b/usr/src/lib/libuuid/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -34,11 +32,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libuuid/Makefile.com b/usr/src/lib/libuuid/Makefile.com index 9611fcd062..de1d413ec8 100644 --- a/usr/src/lib/libuuid/Makefile.com +++ b/usr/src/lib/libuuid/Makefile.com @@ -22,8 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY = libuuid.a VERS = .1 @@ -34,11 +32,10 @@ include ../../Makefile.lib # install this library in the root filesystem include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lsocket -lnsl -lc -ldlpi SRCDIR = ../common -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) @@ -46,6 +43,5 @@ CFLAGS += $(CCVERBOSE) all: -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libuuid/amd64/Makefile b/usr/src/lib/libuuid/amd64/Makefile index 1064169930..f820b35e24 100644 --- a/usr/src/lib/libuuid/amd64/Makefile +++ b/usr/src/lib/libuuid/amd64/Makefile @@ -23,14 +23,12 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libuuid/i386/Makefile b/usr/src/lib/libuuid/i386/Makefile index 8d31739416..9fc7468c2a 100644 --- a/usr/src/lib/libuuid/i386/Makefile +++ b/usr/src/lib/libuuid/i386/Makefile @@ -23,11 +23,9 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libuuid/sparc/Makefile b/usr/src/lib/libuuid/sparc/Makefile index 8d31739416..9fc7468c2a 100644 --- a/usr/src/lib/libuuid/sparc/Makefile +++ b/usr/src/lib/libuuid/sparc/Makefile @@ -23,11 +23,9 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libuuid/sparcv9/Makefile b/usr/src/lib/libuuid/sparcv9/Makefile index 4af9507434..aa340f7eee 100644 --- a/usr/src/lib/libuuid/sparcv9/Makefile +++ b/usr/src/lib/libuuid/sparcv9/Makefile @@ -23,14 +23,12 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libuutil/Makefile b/usr/src/lib/libuutil/Makefile index b8421c51f5..f8307afa5a 100644 --- a/usr/src/lib/libuutil/Makefile +++ b/usr/src/lib/libuutil/Makefile @@ -39,11 +39,10 @@ HDRDIR = common SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) -all := TARGET = all +all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint MSGFILES = \ common/uu_dprintf.c \ diff --git a/usr/src/lib/libuutil/Makefile.com b/usr/src/lib/libuutil/Makefile.com index d9da48cc0c..8a07dda7bb 100644 --- a/usr/src/lib/libuutil/Makefile.com +++ b/usr/src/lib/libuutil/Makefile.com @@ -42,7 +42,7 @@ OBJECTS = \ include ../../Makefile.lib include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) $(NOT_NATIVE)NATIVE_BUILD = $(POUND_SIGN) $(NATIVE_BUILD)VERS = @@ -60,19 +60,13 @@ SRCS = \ ../common/uu_pname.c \ ../common/uu_strtoint.c -LINTS = $(OBJECTS:%.o=%.ln) -CLOBBERFILES += $(LINTS) - SRCDIR = ../common -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) LDLIBS += -lc AVLDIR = ../../../common/avl CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(SRCDIR) -I../../common/inc -LINTFLAGS += -erroff=E_GLOBAL_COULD_BE_STATIC2 -LINTFLAGS64 += -erroff=E_GLOBAL_COULD_BE_STATIC2 SMOFF += signed @@ -85,16 +79,6 @@ $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG all: $(LIBS) $(NOT_NATIVE) -lint: $(LINTLIB) globallint - -globallint: $(LINTS) - $(LINT.c) $(LINTS) $(LDLIBS) - -%.ln: $(SRCDIR)/%.c - $(LINT.c) -c $< - -%.ln: $(AVLDIR)/%.c - $(LINT.c) -c $< pics/%.o: $(AVLDIR)/%.c $(COMPILE.c) -o $@ $< diff --git a/usr/src/lib/libuutil/amd64/Makefile b/usr/src/lib/libuutil/amd64/Makefile index ca019fcccf..2bbd813164 100644 --- a/usr/src/lib/libuutil/amd64/Makefile +++ b/usr/src/lib/libuutil/amd64/Makefile @@ -23,10 +23,8 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libuutil/i386/Makefile b/usr/src/lib/libuutil/i386/Makefile index c56fff345b..59045395eb 100644 --- a/usr/src/lib/libuutil/i386/Makefile +++ b/usr/src/lib/libuutil/i386/Makefile @@ -23,9 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libuutil/sparc/Makefile b/usr/src/lib/libuutil/sparc/Makefile index c56fff345b..59045395eb 100644 --- a/usr/src/lib/libuutil/sparc/Makefile +++ b/usr/src/lib/libuutil/sparc/Makefile @@ -23,9 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libuutil/sparcv9/Makefile b/usr/src/lib/libuutil/sparcv9/Makefile index 014bb86833..7270774630 100644 --- a/usr/src/lib/libuutil/sparcv9/Makefile +++ b/usr/src/lib/libuutil/sparcv9/Makefile @@ -23,16 +23,14 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 .KEEP_STATE: -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libv12n/Makefile b/usr/src/lib/libv12n/Makefile index eceddb2405..955350155a 100644 --- a/usr/src/lib/libv12n/Makefile +++ b/usr/src/lib/libv12n/Makefile @@ -31,24 +31,23 @@ HDRDIR = common ROOTHDRDIR = $(ROOT)/usr/include -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber lint: $(SUBDIRS) +all clean clobber: $(SUBDIRS) check: $(CHECKHDRS) install: all .WAIT $(SUBDIRS) -install_h: $(ROOTHDRS) +install_h: $(ROOTHDRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libv12n/Makefile.com b/usr/src/lib/libv12n/Makefile.com index 72ec120aee..ee2f825a13 100644 --- a/usr/src/lib/libv12n/Makefile.com +++ b/usr/src/lib/libv12n/Makefile.com @@ -31,7 +31,7 @@ OBJECTS = $(MACHCOBJS) $(CMNOBJS) include ../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common SRCS = $(MACHCOBJS:%.o=../$(MACH)/%.c) @@ -41,13 +41,11 @@ CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS) CERRWARN += $(CNOWARN_UNINIT) -$(LINTLIB) := SRCS = ../common/llib-lv12n .KEEP_STATE: all: $(LIBS) -lint: $(LINTLIB) lintcheck pics/%.o: ../$(MACH)/%.c $(COMPILE.c) -o $@ $< diff --git a/usr/src/lib/libv12n/sparc/Makefile b/usr/src/lib/libv12n/sparc/Makefile index a4fcbfad35..cf274962be 100644 --- a/usr/src/lib/libv12n/sparc/Makefile +++ b/usr/src/lib/libv12n/sparc/Makefile @@ -46,7 +46,7 @@ LDLIBS += -luuid -lc CPPFLAGS += -I. -I$(SRC)/lib/libds/common -I$(SRC)/cmd/ldmad -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) pics/%.o: $(SRC)/common/mdesc/%.c $(COMPILE.c) -o $@ $< diff --git a/usr/src/lib/libv12n/sparcv9/Makefile b/usr/src/lib/libv12n/sparcv9/Makefile index 7edfc67227..37d588d3d4 100644 --- a/usr/src/lib/libv12n/sparcv9/Makefile +++ b/usr/src/lib/libv12n/sparcv9/Makefile @@ -47,7 +47,7 @@ LDLIBS += -luuid -lc CPPFLAGS += -I. -I$(SRC)/lib/libds/common -I$(SRC)/cmd/ldmad -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) pics/%.o: $(SRC)/common/mdesc/%.c $(COMPILE.c) -o $@ $< diff --git a/usr/src/lib/libvolmgt/Makefile b/usr/src/lib/libvolmgt/Makefile index d135951b02..eb89d02f72 100644 --- a/usr/src/lib/libvolmgt/Makefile +++ b/usr/src/lib/libvolmgt/Makefile @@ -35,11 +35,10 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg package := TARGET= package -LIBRARY= libvolmgt.a +LIBRARY= libvolmgt.a TEXT_DOMAIN= SUNW_OST_OSLIB XGETFLAGS= -a POFILE= $(LIBRARY:.a=.po) @@ -50,7 +49,7 @@ GREP= grep .KEEP_STATE: -all clean clobber delete install lint package: $(SUBDIRS) +all clean clobber delete install package: $(SUBDIRS) # definitions for install_h target HDRS= volmgt.h diff --git a/usr/src/lib/libvolmgt/Makefile.com b/usr/src/lib/libvolmgt/Makefile.com index 7b26a99461..fb670a0ce0 100644 --- a/usr/src/lib/libvolmgt/Makefile.com +++ b/usr/src/lib/libvolmgt/Makefile.com @@ -33,11 +33,7 @@ include ../../Makefile.lib SRCDIR = ../common -LIBS = $(DYNLIB) $(LINTLIB) - -$(LINTLIB):= SRCS = ../common/llib-lvolmgt - -LINTSRC= $(LINTLIB:%.ln=%) +LIBS = $(DYNLIB) CPPFLAGS = -I.. $(CPPFLAGS.master) CFLAGS += $(CCVERBOSE) @@ -48,7 +44,6 @@ LDLIBS += -ladm -lc .KEEP_STATE: -lint: lintcheck # include library targets include ../../Makefile.targ @@ -56,7 +51,3 @@ include ../../Makefile.targ pics/%.o: ../common/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) - -# install rule for lint library target -$(ROOTLINTDIR)/%: ../common/% - $(INS.file) diff --git a/usr/src/lib/libvolmgt/amd64/Makefile b/usr/src/lib/libvolmgt/amd64/Makefile index c9a1718a16..58854901e8 100644 --- a/usr/src/lib/libvolmgt/amd64/Makefile +++ b/usr/src/lib/libvolmgt/amd64/Makefile @@ -22,16 +22,14 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) .KEEP_STATE: -all: $(LIBS) +all: $(LIBS) install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libvolmgt/i386/Makefile b/usr/src/lib/libvolmgt/i386/Makefile index 2a944b0b43..d6eed917a9 100644 --- a/usr/src/lib/libvolmgt/i386/Makefile +++ b/usr/src/lib/libvolmgt/i386/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -31,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libvolmgt/sparc/Makefile b/usr/src/lib/libvolmgt/sparc/Makefile index 2a944b0b43..d6eed917a9 100644 --- a/usr/src/lib/libvolmgt/sparc/Makefile +++ b/usr/src/lib/libvolmgt/sparc/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -31,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libvolmgt/sparcv9/Makefile b/usr/src/lib/libvolmgt/sparcv9/Makefile index c9a1718a16..58854901e8 100644 --- a/usr/src/lib/libvolmgt/sparcv9/Makefile +++ b/usr/src/lib/libvolmgt/sparcv9/Makefile @@ -22,16 +22,14 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) .KEEP_STATE: -all: $(LIBS) +all: $(LIBS) install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libvrrpadm/Makefile b/usr/src/lib/libvrrpadm/Makefile index 03b80fa465..ea94174d1b 100644 --- a/usr/src/lib/libvrrpadm/Makefile +++ b/usr/src/lib/libvrrpadm/Makefile @@ -40,11 +40,10 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libvrrpadm/Makefile.com b/usr/src/lib/libvrrpadm/Makefile.com index 9c26030c8b..df6782730c 100644 --- a/usr/src/lib/libvrrpadm/Makefile.com +++ b/usr/src/lib/libvrrpadm/Makefile.com @@ -32,11 +32,10 @@ include ../../Makefile.lib # install this library in the root filesystem #include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -lsocket -ldladm -lscf SRCDIR = ../common -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(SRCDIR) -D_REENTRANT @@ -47,6 +46,5 @@ CSTD = $(CSTD_GNU99) all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libvrrpadm/i386/Makefile b/usr/src/lib/libvrrpadm/i386/Makefile index c86be4377c..d19fa69829 100644 --- a/usr/src/lib/libvrrpadm/i386/Makefile +++ b/usr/src/lib/libvrrpadm/i386/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libvrrpadm/sparc/Makefile b/usr/src/lib/libvrrpadm/sparc/Makefile index c86be4377c..d19fa69829 100644 --- a/usr/src/lib/libvrrpadm/sparc/Makefile +++ b/usr/src/lib/libvrrpadm/sparc/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libvscan/Makefile b/usr/src/lib/libvscan/Makefile index 1cae18ed12..bfa26a2f04 100644 --- a/usr/src/lib/libvscan/Makefile +++ b/usr/src/lib/libvscan/Makefile @@ -35,14 +35,13 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint POFILE = libvscan.po MSGFILES = common/libvscan.c .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(POFILE): $(MSGFILES) $(BUILDPO.msgfiles) diff --git a/usr/src/lib/libvscan/Makefile.com b/usr/src/lib/libvscan/Makefile.com index 5ec00cc3d3..3f912ff2e1 100644 --- a/usr/src/lib/libvscan/Makefile.com +++ b/usr/src/lib/libvscan/Makefile.com @@ -31,9 +31,8 @@ OBJECTS= libvscan.o include ../../Makefile.lib -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) SRCDIR = ../common -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) # Reset the Makefile.lib macro ROOTLIBDIR to refer to usr/lib/vscan ROOTLIBDIR = $(ROOT)/usr/lib/vscan @@ -47,6 +46,5 @@ SMOFF += signed .KEEP_STATE: all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libvscan/i386/Makefile b/usr/src/lib/libvscan/i386/Makefile index f91f0270e9..2845cd3c2d 100644 --- a/usr/src/lib/libvscan/i386/Makefile +++ b/usr/src/lib/libvscan/i386/Makefile @@ -22,9 +22,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libvscan/sparc/Makefile b/usr/src/lib/libvscan/sparc/Makefile index f91f0270e9..2845cd3c2d 100644 --- a/usr/src/lib/libvscan/sparc/Makefile +++ b/usr/src/lib/libvscan/sparc/Makefile @@ -22,9 +22,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libw/Makefile b/usr/src/lib/libw/Makefile index 6cb7a4fa8a..ef1592a4a5 100644 --- a/usr/src/lib/libw/Makefile +++ b/usr/src/lib/libw/Makefile @@ -36,7 +36,6 @@ install := TARGET= install all clean clobber install: $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libw/amd64/Makefile b/usr/src/lib/libw/amd64/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libw/amd64/Makefile +++ b/usr/src/lib/libw/amd64/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libw/i386/Makefile b/usr/src/lib/libw/i386/Makefile index c318e6089b..2c781f2d6c 100644 --- a/usr/src/lib/libw/i386/Makefile +++ b/usr/src/lib/libw/i386/Makefile @@ -26,6 +26,6 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libw/sparc/Makefile b/usr/src/lib/libw/sparc/Makefile index c318e6089b..2c781f2d6c 100644 --- a/usr/src/lib/libw/sparc/Makefile +++ b/usr/src/lib/libw/sparc/Makefile @@ -26,6 +26,6 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libw/sparcv9/Makefile b/usr/src/lib/libw/sparcv9/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libw/sparcv9/Makefile +++ b/usr/src/lib/libw/sparcv9/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libwrap/Makefile b/usr/src/lib/libwrap/Makefile index 517b9ae163..5b45ed444b 100644 --- a/usr/src/lib/libwrap/Makefile +++ b/usr/src/lib/libwrap/Makefile @@ -13,15 +13,14 @@ HDRDIR = . SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) -all := TARGET = all +all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libwrap/Makefile.com b/usr/src/lib/libwrap/Makefile.com index b5fb0e21be..59285468f0 100644 --- a/usr/src/lib/libwrap/Makefile.com +++ b/usr/src/lib/libwrap/Makefile.com @@ -36,11 +36,10 @@ OBJECTS = hosts_access.o options.o shell_cmd.o rfc931.o eval.o \ include ../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SONAME = $(LIBRARY:.a=.so)$(MAJOR) ROOTLINKS += $(ROOTLIBDIR)/$(LIBLINKS)$(MAJOR) ROOTLINKS64 += $(ROOTLIBDIR64)/$(LIBLINKS)$(MAJOR) -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) MAPFILES = ../mapfile-vers @@ -68,7 +67,6 @@ SMATCH=off all: $(LIBS) -lint: lintcheck $(ROOTLIBDIR)/$(LIBLINKS)$(MAJOR): $(ROOTLIBDIR)/$(LIBLINKS)$(VERS) $(INS.liblink) diff --git a/usr/src/lib/libwrap/amd64/Makefile b/usr/src/lib/libwrap/amd64/Makefile index 48f15f5d2d..8bfc5ceb37 100644 --- a/usr/src/lib/libwrap/amd64/Makefile +++ b/usr/src/lib/libwrap/amd64/Makefile @@ -8,4 +8,4 @@ include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBS64) .WAIT $(ROOTLINKS64) $(ROOTLINT) +install: all $(ROOTLIBS64) .WAIT $(ROOTLINKS64) diff --git a/usr/src/lib/libwrap/i386/Makefile b/usr/src/lib/libwrap/i386/Makefile index 37ad17a2e4..40b421ed5b 100644 --- a/usr/src/lib/libwrap/i386/Makefile +++ b/usr/src/lib/libwrap/i386/Makefile @@ -7,4 +7,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) .WAIT $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) .WAIT $(ROOTLINKS) diff --git a/usr/src/lib/libwrap/sparc/Makefile b/usr/src/lib/libwrap/sparc/Makefile index 37ad17a2e4..40b421ed5b 100644 --- a/usr/src/lib/libwrap/sparc/Makefile +++ b/usr/src/lib/libwrap/sparc/Makefile @@ -7,4 +7,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) .WAIT $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) .WAIT $(ROOTLINKS) diff --git a/usr/src/lib/libwrap/sparcv9/Makefile b/usr/src/lib/libwrap/sparcv9/Makefile index 48f15f5d2d..8bfc5ceb37 100644 --- a/usr/src/lib/libwrap/sparcv9/Makefile +++ b/usr/src/lib/libwrap/sparcv9/Makefile @@ -8,4 +8,4 @@ include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBS64) .WAIT $(ROOTLINKS64) $(ROOTLINT) +install: all $(ROOTLIBS64) .WAIT $(ROOTLINKS64) diff --git a/usr/src/lib/libxcurses/Makefile b/usr/src/lib/libxcurses/Makefile index f8a1e65861..9037fe4959 100644 --- a/usr/src/lib/libxcurses/Makefile +++ b/usr/src/lib/libxcurses/Makefile @@ -33,7 +33,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint # capability NAMES generated source NAMES= \ @@ -54,7 +53,7 @@ CLOBBERFILES= $(GENERATED) .KEEP_STATE: -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) all: $(GENERATED) .WAIT $(SUBDIRS) @@ -63,8 +62,6 @@ install: all .WAIT $(SUBDIRS) clean clobber: $(SUBDIRS) $(RM) $(GENERATED) -lint: $(SUBDIRS) - # still need to implement cstyle check of term.h # do this when we go through and make this library cstyle clean. check: $(HDRS) diff --git a/usr/src/lib/libxcurses/Makefile.com b/usr/src/lib/libxcurses/Makefile.com index d60e9683ab..0d9a390dbc 100644 --- a/usr/src/lib/libxcurses/Makefile.com +++ b/usr/src/lib/libxcurses/Makefile.com @@ -111,8 +111,6 @@ ROOTLIBDIR= $(ROOT)/usr/xpg4/lib ROOTLIBDIR64= $(ROOT)/usr/xpg4/lib/$(MACH64) ROOTLIBS= $(LIBS:%=$(ROOTLIBDIR)/%) -$(LINTLIB):= SRCS=../src/libc/llib-lcurses -$(LINTLIB):= CPPFLAGS += -D_XOPEN_SOURCE_EXTENDED CERRWARN += $(CNOWARN_UNINIT) CERRWARN += -_gcc=-Wno-unused-variable @@ -122,8 +120,6 @@ CERRWARN += -_gcc=-Wno-unused-function # not linted SMATCH=off -LINTSRC= $(LINTLIB:%.ln=%) - LDLIBS += -lc CPPFLAGS = -I../h -I../h/solaris2 -I../src/libc/xcurses $(CPPFLAGS.master) @@ -138,7 +134,6 @@ CLOBBERFILES= libcurses.so libcurses.so$(VERS) all: $(LIBS) -lint: lintcheck # # Include library targets diff --git a/usr/src/lib/libxcurses2/Makefile b/usr/src/lib/libxcurses2/Makefile index d99a9628c8..c4d4031642 100644 --- a/usr/src/lib/libxcurses2/Makefile +++ b/usr/src/lib/libxcurses2/Makefile @@ -33,7 +33,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint # capability NAMES generated source NAMES= \ @@ -60,7 +59,7 @@ CLOBBERFILES= $(GENERATED) .KEEP_STATE: -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) all: $(GENERATED) .WAIT $(SUBDIRS) @@ -69,8 +68,6 @@ install: all .WAIT $(SUBDIRS) clean clobber: $(SUBDIRS) $(RM) $(GENERATED) -lint: $(SUBDIRS) - # still need to implement cstyle check of term.h # do this when we go through and make this library cstyle clean. check: $(HDRS) diff --git a/usr/src/lib/libxcurses2/Makefile.com b/usr/src/lib/libxcurses2/Makefile.com index 12a063c414..2d5497c37d 100644 --- a/usr/src/lib/libxcurses2/Makefile.com +++ b/usr/src/lib/libxcurses2/Makefile.com @@ -83,17 +83,13 @@ SRCS= $(XCURSES:%.o=../src/libc/xcurses/%.c) \ $(MKS:%.o=../src/libc/mks/%.c) \ $(WIDE:%.o=../src/libc/wide/%.c) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) # definitions for install target ROOTLIBDIR= $(ROOT)/usr/xpg4/lib ROOTLIBDIR64= $(ROOT)/usr/xpg4/lib/$(MACH64) ROOTLIBS= $(LIBS:%=$(ROOTLIBDIR)/%) -$(LINTLIB):= SRCS=../src/libc/llib-lcurses - -LINTSRC= $(LINTLIB:%.ln=%) - LDLIBS += -lc CPPFLAGS = -I../h -I../src/libc/xcurses $(CPPFLAGS.master) @@ -113,7 +109,6 @@ CLOBBERFILES= libcurses.so libcurses.so$(VERS) all: $(LIBS) -lint: lintcheck # # Include library targets @@ -131,11 +126,3 @@ objs/%.o pics/%.o: ../src/libc/mks/%.c objs/%.o pics/%.o: ../src/libc/wide/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) - -# install rule for lint library target -$(ROOTLINTDIR)/%: ../src/libc/% - $(INS.file) - -# install rule for 64 bit lint library target -$(ROOTLINTDIR64)/%: ../src/libc/% - $(INS.file) diff --git a/usr/src/lib/libxcurses2/amd64/Makefile b/usr/src/lib/libxcurses2/amd64/Makefile index 80a8e6fcb2..83ef5cbc13 100644 --- a/usr/src/lib/libxcurses2/amd64/Makefile +++ b/usr/src/lib/libxcurses2/amd64/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 @@ -32,4 +30,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libxcurses2/i386/Makefile b/usr/src/lib/libxcurses2/i386/Makefile index 4351f4cf5f..93f4c54e6a 100644 --- a/usr/src/lib/libxcurses2/i386/Makefile +++ b/usr/src/lib/libxcurses2/i386/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -31,6 +29,6 @@ DYNFLAGS += $(DYNFLAGS32) .KEEP_STATE: -all: $(LIBS) +all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libxcurses2/sparc/Makefile b/usr/src/lib/libxcurses2/sparc/Makefile index 14b8ae0ed1..d6eed917a9 100644 --- a/usr/src/lib/libxcurses2/sparc/Makefile +++ b/usr/src/lib/libxcurses2/sparc/Makefile @@ -22,13 +22,11 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com .KEEP_STATE: -all: $(LIBS) +all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libxcurses2/sparcv9/Makefile b/usr/src/lib/libxcurses2/sparcv9/Makefile index 80a8e6fcb2..83ef5cbc13 100644 --- a/usr/src/lib/libxcurses2/sparcv9/Makefile +++ b/usr/src/lib/libxcurses2/sparcv9/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 @@ -32,4 +30,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libxnet/Makefile b/usr/src/lib/libxnet/Makefile index 6cb7a4fa8a..ef1592a4a5 100644 --- a/usr/src/lib/libxnet/Makefile +++ b/usr/src/lib/libxnet/Makefile @@ -36,7 +36,6 @@ install := TARGET= install all clean clobber install: $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libxnet/Makefile.com b/usr/src/lib/libxnet/Makefile.com index 70dccf0033..4475c8fa1a 100644 --- a/usr/src/lib/libxnet/Makefile.com +++ b/usr/src/lib/libxnet/Makefile.com @@ -23,11 +23,10 @@ # Use is subject to license terms. # -LIBRARY = libxnet.a +LIBRARY = libxnet.a VERS = .1 include $(SRC)/lib/Makefile.rootfs -LIBS += $(LINTLIB) DYNFLAGS += $(ZLOADFLTR) CPPFLAGS += -D__EXTENSIONS__ diff --git a/usr/src/lib/libxnet/amd64/Makefile b/usr/src/lib/libxnet/amd64/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libxnet/amd64/Makefile +++ b/usr/src/lib/libxnet/amd64/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libxnet/i386/Makefile b/usr/src/lib/libxnet/i386/Makefile index 4e4e8c02a9..682e5560ca 100644 --- a/usr/src/lib/libxnet/i386/Makefile +++ b/usr/src/lib/libxnet/i386/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libxnet/sparc/Makefile b/usr/src/lib/libxnet/sparc/Makefile index 4e4e8c02a9..682e5560ca 100644 --- a/usr/src/lib/libxnet/sparc/Makefile +++ b/usr/src/lib/libxnet/sparc/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libxnet/sparcv9/Makefile b/usr/src/lib/libxnet/sparcv9/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libxnet/sparcv9/Makefile +++ b/usr/src/lib/libxnet/sparcv9/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libzfs/Makefile b/usr/src/lib/libzfs/Makefile index 12cf832a36..010e00ef08 100644 --- a/usr/src/lib/libzfs/Makefile +++ b/usr/src/lib/libzfs/Makefile @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -38,14 +36,13 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint MSGFILES = `$(GREP) -l gettext $(HDRDIR)/*.[ch]` POFILE = libzfs.po .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(POFILE): pofile_MSGFILES diff --git a/usr/src/lib/libzfs/Makefile.com b/usr/src/lib/libzfs/Makefile.com index 189d585456..eba6f3d1f7 100644 --- a/usr/src/lib/libzfs/Makefile.com +++ b/usr/src/lib/libzfs/Makefile.com @@ -72,7 +72,6 @@ INCS += -I../../libc/inc INCS += -I../../libzutil/common CSTD= $(CSTD_GNU99) -C99LMODE= -Xc99=%all LDLIBS += -lc -lm -ldevid -lgen -lnvpair -luutil -lavl -lefi \ -lidmap -ltsol -lcryptoutil -lpkcs11 -lmd -lumem -lzfs_core \ -ldevinfo -lzutil diff --git a/usr/src/lib/libzfs/amd64/Makefile b/usr/src/lib/libzfs/amd64/Makefile index 44075ed1bd..071ae5b23d 100644 --- a/usr/src/lib/libzfs/amd64/Makefile +++ b/usr/src/lib/libzfs/amd64/Makefile @@ -23,9 +23,9 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" + include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libzfs/i386/Makefile b/usr/src/lib/libzfs/i386/Makefile index cd02883abf..dc6deda296 100644 --- a/usr/src/lib/libzfs/i386/Makefile +++ b/usr/src/lib/libzfs/i386/Makefile @@ -23,8 +23,7 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libzfs/sparc/Makefile b/usr/src/lib/libzfs/sparc/Makefile index cd02883abf..dc6deda296 100644 --- a/usr/src/lib/libzfs/sparc/Makefile +++ b/usr/src/lib/libzfs/sparc/Makefile @@ -23,8 +23,7 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libzfs/sparcv9/Makefile b/usr/src/lib/libzfs/sparcv9/Makefile index fc812ba170..a25e4750b5 100644 --- a/usr/src/lib/libzfs/sparcv9/Makefile +++ b/usr/src/lib/libzfs/sparcv9/Makefile @@ -29,4 +29,4 @@ include ../../Makefile.lib.64 sparcv9_C_PICFLAGS= $(sparcv9_C_BIGPICFLAGS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libzfs_core/Makefile b/usr/src/lib/libzfs_core/Makefile index f0711971e5..9782300263 100644 --- a/usr/src/lib/libzfs_core/Makefile +++ b/usr/src/lib/libzfs_core/Makefile @@ -38,14 +38,13 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint MSGFILES = `$(GREP) -l gettext $(HDRDIR)/*.[ch]` POFILE = libzfs_core.po .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(POFILE): pofile_MSGFILES diff --git a/usr/src/lib/libzfs_core/Makefile.com b/usr/src/lib/libzfs_core/Makefile.com index 5f23a27a1a..5693e9ab0f 100644 --- a/usr/src/lib/libzfs_core/Makefile.com +++ b/usr/src/lib/libzfs_core/Makefile.com @@ -38,7 +38,7 @@ include ../../Makefile.lib # libzfs_core must be installed in the root filesystem for mount(1M) include ../../Makefile.rootfs -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) SRCDIR = ../common @@ -48,20 +48,17 @@ INCS += -I../../../common/zfs INCS += -I../../libc/inc CSTD= $(CSTD_GNU99) -C99LMODE= -Xc99=%all LDLIBS += -lc -lnvpair CPPFLAGS += $(INCS) -D_LARGEFILE64_SOURCE=1 -D_REENTRANT $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG SRCS= $(OBJS_COMMON:%.o=$(SRCDIR)/%.c) \ $(OBJS_SHARED:%.o=$(SRC)/common/zfs/%.c) -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) .KEEP_STATE: all: $(LIBS) -lint: lintcheck pics/%.o: ../../../common/zfs/%.c $(COMPILE.c) -o $@ $< diff --git a/usr/src/lib/libzfs_core/amd64/Makefile b/usr/src/lib/libzfs_core/amd64/Makefile index b780a6dba8..14bdb8486d 100644 --- a/usr/src/lib/libzfs_core/amd64/Makefile +++ b/usr/src/lib/libzfs_core/amd64/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libzfs_core/i386/Makefile b/usr/src/lib/libzfs_core/i386/Makefile index 4088a1eac0..dc6deda296 100644 --- a/usr/src/lib/libzfs_core/i386/Makefile +++ b/usr/src/lib/libzfs_core/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libzfs_core/sparc/Makefile b/usr/src/lib/libzfs_core/sparc/Makefile index 4088a1eac0..dc6deda296 100644 --- a/usr/src/lib/libzfs_core/sparc/Makefile +++ b/usr/src/lib/libzfs_core/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libzfs_core/sparcv9/Makefile b/usr/src/lib/libzfs_core/sparcv9/Makefile index fc812ba170..a25e4750b5 100644 --- a/usr/src/lib/libzfs_core/sparcv9/Makefile +++ b/usr/src/lib/libzfs_core/sparcv9/Makefile @@ -29,4 +29,4 @@ include ../../Makefile.lib.64 sparcv9_C_PICFLAGS= $(sparcv9_C_BIGPICFLAGS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libzfs_jni/Makefile b/usr/src/lib/libzfs_jni/Makefile index ded40b5865..9ec18fc4e1 100644 --- a/usr/src/lib/libzfs_jni/Makefile +++ b/usr/src/lib/libzfs_jni/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -45,11 +43,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libzfs_jni/i386/Makefile b/usr/src/lib/libzfs_jni/i386/Makefile index cd02883abf..703879a954 100644 --- a/usr/src/lib/libzfs_jni/i386/Makefile +++ b/usr/src/lib/libzfs_jni/i386/Makefile @@ -23,8 +23,7 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libzfs_jni/sparc/Makefile b/usr/src/lib/libzfs_jni/sparc/Makefile index cd02883abf..703879a954 100644 --- a/usr/src/lib/libzfs_jni/sparc/Makefile +++ b/usr/src/lib/libzfs_jni/sparc/Makefile @@ -23,8 +23,7 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libzonecfg/Makefile b/usr/src/lib/libzonecfg/Makefile index 794f477cdc..c7b30a5189 100644 --- a/usr/src/lib/libzonecfg/Makefile +++ b/usr/src/lib/libzonecfg/Makefile @@ -32,7 +32,6 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint # # Definitions for message catalog @@ -54,7 +53,7 @@ $(DTDDIR)/%: % .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(POFILE): pofile_MSGFILES diff --git a/usr/src/lib/libzonecfg/amd64/Makefile b/usr/src/lib/libzonecfg/amd64/Makefile index dd68231e26..010d484a50 100644 --- a/usr/src/lib/libzonecfg/amd64/Makefile +++ b/usr/src/lib/libzonecfg/amd64/Makefile @@ -23,10 +23,8 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libzonecfg/i386/Makefile b/usr/src/lib/libzonecfg/i386/Makefile index 87230ec4fa..e129d9ceb8 100644 --- a/usr/src/lib/libzonecfg/i386/Makefile +++ b/usr/src/lib/libzonecfg/i386/Makefile @@ -23,9 +23,7 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libzonecfg/sparc/Makefile b/usr/src/lib/libzonecfg/sparc/Makefile index 87230ec4fa..e129d9ceb8 100644 --- a/usr/src/lib/libzonecfg/sparc/Makefile +++ b/usr/src/lib/libzonecfg/sparc/Makefile @@ -23,9 +23,7 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libzonecfg/sparcv9/Makefile b/usr/src/lib/libzonecfg/sparcv9/Makefile index fab7f868b5..9728f9ee8e 100644 --- a/usr/src/lib/libzonecfg/sparcv9/Makefile +++ b/usr/src/lib/libzonecfg/sparcv9/Makefile @@ -23,10 +23,8 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libzoneinfo/Makefile b/usr/src/lib/libzoneinfo/Makefile index 6f3f633d35..876a38f7fe 100644 --- a/usr/src/lib/libzoneinfo/Makefile +++ b/usr/src/lib/libzoneinfo/Makefile @@ -35,13 +35,12 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) -install_h: $(ROOTHDRS) +install_h: $(ROOTHDRS) check: $(CHECKHDRS) diff --git a/usr/src/lib/libzoneinfo/Makefile.com b/usr/src/lib/libzoneinfo/Makefile.com index 68108c3a0c..101a1a4d1c 100644 --- a/usr/src/lib/libzoneinfo/Makefile.com +++ b/usr/src/lib/libzoneinfo/Makefile.com @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY= libzoneinfo.a VERS= .1 @@ -36,16 +34,14 @@ include ../../Makefile.lib # TEXT_DOMAIN= SUNW_OST_ZONEINFO -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc SRCDIR = ../common -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) .KEEP_STATE: all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libzoneinfo/amd64/Makefile b/usr/src/lib/libzoneinfo/amd64/Makefile index da4f984f67..c1173cb027 100644 --- a/usr/src/lib/libzoneinfo/amd64/Makefile +++ b/usr/src/lib/libzoneinfo/amd64/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libzoneinfo/i386/Makefile b/usr/src/lib/libzoneinfo/i386/Makefile index 19a9e65a11..1c3d6f6f01 100644 --- a/usr/src/lib/libzoneinfo/i386/Makefile +++ b/usr/src/lib/libzoneinfo/i386/Makefile @@ -23,9 +23,7 @@ # Copyright (c) 2001 by Sun Microsystems, Inc. # All rights reserved. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libzoneinfo/sparc/Makefile b/usr/src/lib/libzoneinfo/sparc/Makefile index 19a9e65a11..1c3d6f6f01 100644 --- a/usr/src/lib/libzoneinfo/sparc/Makefile +++ b/usr/src/lib/libzoneinfo/sparc/Makefile @@ -23,9 +23,7 @@ # Copyright (c) 2001 by Sun Microsystems, Inc. # All rights reserved. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libzoneinfo/sparcv9/Makefile b/usr/src/lib/libzoneinfo/sparcv9/Makefile index df2bad0003..7451cc1755 100644 --- a/usr/src/lib/libzoneinfo/sparcv9/Makefile +++ b/usr/src/lib/libzoneinfo/sparcv9/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libzonestat/Makefile b/usr/src/lib/libzonestat/Makefile index 078a881c3c..29749d1800 100644 --- a/usr/src/lib/libzonestat/Makefile +++ b/usr/src/lib/libzonestat/Makefile @@ -34,11 +34,10 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libzonestat/Makefile.com b/usr/src/lib/libzonestat/Makefile.com index 1efc7bf720..9bfdea06fe 100644 --- a/usr/src/lib/libzonestat/Makefile.com +++ b/usr/src/lib/libzonestat/Makefile.com @@ -29,12 +29,11 @@ OBJECTS= libzonestat.o include ../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lcmdutils -lumem -lc SRCDIR = ../common CPPFLAGS += -I../common -mt -D_POSIX_PTHREAD_SEMANTICS -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) CERRWARN += $(CNOWARN_UNINIT) @@ -45,6 +44,5 @@ SMATCH=off all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libzonestat/amd64/Makefile b/usr/src/lib/libzonestat/amd64/Makefile index 9eeb4ef71d..0d34e5e608 100644 --- a/usr/src/lib/libzonestat/amd64/Makefile +++ b/usr/src/lib/libzonestat/amd64/Makefile @@ -24,4 +24,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libzonestat/i386/Makefile b/usr/src/lib/libzonestat/i386/Makefile index f9373d2096..53dd511aae 100644 --- a/usr/src/lib/libzonestat/i386/Makefile +++ b/usr/src/lib/libzonestat/i386/Makefile @@ -23,4 +23,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libzonestat/sparc/Makefile b/usr/src/lib/libzonestat/sparc/Makefile index f9373d2096..53dd511aae 100644 --- a/usr/src/lib/libzonestat/sparc/Makefile +++ b/usr/src/lib/libzonestat/sparc/Makefile @@ -23,4 +23,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libzonestat/sparcv9/Makefile b/usr/src/lib/libzonestat/sparcv9/Makefile index 9eeb4ef71d..0d34e5e608 100644 --- a/usr/src/lib/libzonestat/sparcv9/Makefile +++ b/usr/src/lib/libzonestat/sparcv9/Makefile @@ -24,4 +24,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libzpool/Makefile b/usr/src/lib/libzpool/Makefile index f77568c08a..764e417331 100644 --- a/usr/src/lib/libzpool/Makefile +++ b/usr/src/lib/libzpool/Makefile @@ -23,8 +23,6 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -35,11 +33,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libzpool/Makefile.com b/usr/src/lib/libzpool/Makefile.com index 78c9c0b29a..31bd6aa5e2 100644 --- a/usr/src/lib/libzpool/Makefile.com +++ b/usr/src/lib/libzpool/Makefile.com @@ -48,7 +48,7 @@ SRCDIR= ../common # There should be a mapfile here MAPFILES = -LIBS += $(DYNLIB) $(LINTLIB) +LIBS += $(DYNLIB) INCS += -I../common INCS += -I../../../uts/common/fs/zfs @@ -62,12 +62,9 @@ INCS += -I../../libzutil/common CLEANFILES += ../common/zfs.h CLEANFILES += $(EXTPICS) -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) -$(LINTLIB): ../common/zfs.h $(LIBS): ../common/zfs.h CSTD= $(CSTD_GNU99) -C99LMODE= -Xc99=%all CFLAGS += $(CCGDEBUG) $(CCVERBOSE) $(CNOGLOBAL) CFLAGS64 += $(CCGDEBUG) $(CCVERBOSE) $(CNOGLOBAL) @@ -77,8 +74,6 @@ NATIVE_LIBS += libz.so CPPFLAGS.first = -I$(SRC)/lib/libfakekernel/common CPPFLAGS += $(INCS) -DDEBUG -D_FAKE_KERNEL -LINTFLAGS += -erroff=E_STATIC_UNUSED $(INCS) -LINTFLAGS64 += -erroff=E_STATIC_UNUSED $(INCS) # The following is needed to fix the SmartOS build; see OS-6582. We cannot do # a conditional appendage to INCS, since that breaks the lint build. @@ -100,7 +95,6 @@ SMATCH=off all: $(LIBS) -lint: $(LINTLIB) include ../../Makefile.targ diff --git a/usr/src/lib/libzpool/amd64/Makefile b/usr/src/lib/libzpool/amd64/Makefile index f484bb496d..b780a6dba8 100644 --- a/usr/src/lib/libzpool/amd64/Makefile +++ b/usr/src/lib/libzpool/amd64/Makefile @@ -23,10 +23,8 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libzpool/i386/Makefile b/usr/src/lib/libzpool/i386/Makefile index 3ae822d920..703879a954 100644 --- a/usr/src/lib/libzpool/i386/Makefile +++ b/usr/src/lib/libzpool/i386/Makefile @@ -23,9 +23,7 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libzpool/sparcv9/Makefile b/usr/src/lib/libzpool/sparcv9/Makefile index 49cb413342..d303e3971b 100644 --- a/usr/src/lib/libzpool/sparcv9/Makefile +++ b/usr/src/lib/libzpool/sparcv9/Makefile @@ -23,12 +23,10 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 sparcv9_C_PICFLAGS = $(sparcv9_C_BIGPICFLAGS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libzutil/Makefile.com b/usr/src/lib/libzutil/Makefile.com index 9ec9f67dab..f51c13aef2 100644 --- a/usr/src/lib/libzutil/Makefile.com +++ b/usr/src/lib/libzutil/Makefile.com @@ -26,7 +26,7 @@ include ../../Makefile.lib # libzutil must be installed in the root filesystem for mount(1M) include ../../Makefile.rootfs -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) SRCDIR = ../common @@ -35,7 +35,6 @@ INCS += -I../../../uts/common/fs/zfs INCS += -I../../libc/inc CSTD= $(CSTD_GNU99) -C99LMODE= -Xc99=%all LDLIBS += -lc -lm -ldevid -lnvpair -ladm -lavl -lefi CPPFLAGS += $(INCS) -D_LARGEFILE64_SOURCE=1 -D_REENTRANT $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG diff --git a/usr/src/lib/libzutil/amd64/Makefile b/usr/src/lib/libzutil/amd64/Makefile index 5a2ea08b45..431f2454cb 100644 --- a/usr/src/lib/libzutil/amd64/Makefile +++ b/usr/src/lib/libzutil/amd64/Makefile @@ -16,4 +16,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libzutil/i386/Makefile b/usr/src/lib/libzutil/i386/Makefile index ada420dc55..c65cbc4e4a 100644 --- a/usr/src/lib/libzutil/i386/Makefile +++ b/usr/src/lib/libzutil/i386/Makefile @@ -15,4 +15,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libzutil/sparc/Makefile b/usr/src/lib/libzutil/sparc/Makefile index ada420dc55..c65cbc4e4a 100644 --- a/usr/src/lib/libzutil/sparc/Makefile +++ b/usr/src/lib/libzutil/sparc/Makefile @@ -15,4 +15,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libzutil/sparcv9/Makefile b/usr/src/lib/libzutil/sparcv9/Makefile index e2931cd005..83072d9069 100644 --- a/usr/src/lib/libzutil/sparcv9/Makefile +++ b/usr/src/lib/libzutil/sparcv9/Makefile @@ -18,4 +18,4 @@ include ../../Makefile.lib.64 sparcv9_C_PICFLAGS= $(sparcv9_C_BIGPICFLAGS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/madv/Makefile b/usr/src/lib/madv/Makefile index 06e5b257bb..da3022ccd0 100644 --- a/usr/src/lib/madv/Makefile +++ b/usr/src/lib/madv/Makefile @@ -35,11 +35,10 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint .KEEP_STATE: -all install clean lint: $(SUBDIRS) +all install clean: $(SUBDIRS) clobber: $(SUBDIRS) $(RM) $(POFILE) diff --git a/usr/src/lib/madv/Makefile.com b/usr/src/lib/madv/Makefile.com index 877c35517f..64a0133cb8 100644 --- a/usr/src/lib/madv/Makefile.com +++ b/usr/src/lib/madv/Makefile.com @@ -47,6 +47,5 @@ CERRWARN += $(CNOWARN_UNINIT) all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/mpapi/libmpapi/Makefile b/usr/src/lib/mpapi/libmpapi/Makefile index ebad6d797d..1e8d9c5bb4 100644 --- a/usr/src/lib/mpapi/libmpapi/Makefile +++ b/usr/src/lib/mpapi/libmpapi/Makefile @@ -32,14 +32,13 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint HDRS = mpapi.h mpapi-sun.h HDRDIR = common .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/mpapi/libmpapi/Makefile.com b/usr/src/lib/mpapi/libmpapi/Makefile.com index cc109f0534..eefe784d72 100644 --- a/usr/src/lib/mpapi/libmpapi/Makefile.com +++ b/usr/src/lib/mpapi/libmpapi/Makefile.com @@ -31,12 +31,11 @@ OBJECTS= mpapi.o mpapi-sun.o include ../../../Makefile.lib include ../../../Makefile.rootfs -SRCDIR = ../common +SRCDIR = ../common -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(SRCDIR) -mt $(CCVERBOSE) -D_POSIX_PTHREAD_SEMANTICS @@ -61,7 +60,6 @@ $(IETCFILES) := FILEMODE = 0644 all: $(LIBS) $(IETCFILES) -lint: $(ROOTETC)/%: $(CONFDIR)/% $(INS.file) diff --git a/usr/src/lib/mpapi/libmpapi/i386/Makefile b/usr/src/lib/mpapi/libmpapi/i386/Makefile index c7cca61bea..4acb0bde30 100644 --- a/usr/src/lib/mpapi/libmpapi/i386/Makefile +++ b/usr/src/lib/mpapi/libmpapi/i386/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/mpapi/libmpapi/sparc/Makefile b/usr/src/lib/mpapi/libmpapi/sparc/Makefile index c7cca61bea..4acb0bde30 100644 --- a/usr/src/lib/mpapi/libmpapi/sparc/Makefile +++ b/usr/src/lib/mpapi/libmpapi/sparc/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/mpapi/libmpscsi_vhci/Makefile b/usr/src/lib/mpapi/libmpscsi_vhci/Makefile index f7e3396ef5..80ea5ec505 100644 --- a/usr/src/lib/mpapi/libmpscsi_vhci/Makefile +++ b/usr/src/lib/mpapi/libmpscsi_vhci/Makefile @@ -32,11 +32,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: diff --git a/usr/src/lib/mpapi/libmpscsi_vhci/Makefile.com b/usr/src/lib/mpapi/libmpscsi_vhci/Makefile.com index 023d711284..70d66cdfb1 100644 --- a/usr/src/lib/mpapi/libmpscsi_vhci/Makefile.com +++ b/usr/src/lib/mpapi/libmpscsi_vhci/Makefile.com @@ -57,7 +57,7 @@ OBJECTS= Initialize.o MP_AssignLogicalUnitToTPG.o \ include ../../../Makefile.lib include ../../../Makefile.rootfs -SRCDIR = ../common +SRCDIR = ../common LIBS = $(DYNLIB) LDLIBS += -lc -ldevinfo -lsysevent -lnvpair @@ -73,6 +73,5 @@ SMATCH=off all: $(LIBS) -lint: lintcheck include ../../../Makefile.targ diff --git a/usr/src/lib/mpss/Makefile b/usr/src/lib/mpss/Makefile index 013fdb01e6..5cfdea2c50 100644 --- a/usr/src/lib/mpss/Makefile +++ b/usr/src/lib/mpss/Makefile @@ -35,11 +35,10 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint .KEEP_STATE: -all install clean lint: $(SUBDIRS) +all install clean: $(SUBDIRS) clobber: $(SUBDIRS) $(RM) $(POFILE) diff --git a/usr/src/lib/mpss/Makefile.com b/usr/src/lib/mpss/Makefile.com index 9d54dff9ab..ec1332f7b9 100644 --- a/usr/src/lib/mpss/Makefile.com +++ b/usr/src/lib/mpss/Makefile.com @@ -36,7 +36,7 @@ MAPFILES = LIBS = $(DYNLIB) LDLIBS += -lc -lgen -CFLAGS += $(CCVERBOSE) +CFLAGS += $(CCVERBOSE) CPPFLAGS += -D_REENTRANT DYNFLAGS += $(BLOCAL) $(ZNOVERSION) @@ -47,6 +47,5 @@ CERRWARN += $(CNOWARN_UNINIT) all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/nametoaddr/Makefile b/usr/src/lib/nametoaddr/Makefile index ff451f6261..7efde833c7 100644 --- a/usr/src/lib/nametoaddr/Makefile +++ b/usr/src/lib/nametoaddr/Makefile @@ -22,10 +22,8 @@ # # Copyright (c) 1989 by Sun Microsystems, Inc. # All rights reserved. -#ident "%Z%%M% %I% %E% SMI" -# -# lib/nametoaddr/Makefile # + # include global definitions include ../../Makefile.master @@ -35,11 +33,10 @@ all:= TARGET= all clean:= TARGET= clean clobber:= TARGET= clobber install:= TARGET= install -lint:= TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/nametoaddr/straddr/Makefile b/usr/src/lib/nametoaddr/straddr/Makefile index 7e3af4622b..c5e91bc3cc 100644 --- a/usr/src/lib/nametoaddr/straddr/Makefile +++ b/usr/src/lib/nametoaddr/straddr/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -34,11 +32,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/nametoaddr/straddr/Makefile.com b/usr/src/lib/nametoaddr/straddr/Makefile.com index 21739f4331..138572d34b 100644 --- a/usr/src/lib/nametoaddr/straddr/Makefile.com +++ b/usr/src/lib/nametoaddr/straddr/Makefile.com @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY = libstraddr.a VERS = .2 @@ -48,6 +46,5 @@ CPPFLAGS += -D_REENTRANT all: $(LIBS) -lint: lintcheck include ../../../Makefile.targ diff --git a/usr/src/lib/ncad_addr/Makefile b/usr/src/lib/ncad_addr/Makefile index 143c41fe5a..a9ce76dd8a 100644 --- a/usr/src/lib/ncad_addr/Makefile +++ b/usr/src/lib/ncad_addr/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -34,11 +32,10 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/ncad_addr/Makefile.com b/usr/src/lib/ncad_addr/Makefile.com index a918a1a3a6..446ed16a3f 100644 --- a/usr/src/lib/ncad_addr/Makefile.com +++ b/usr/src/lib/ncad_addr/Makefile.com @@ -38,6 +38,5 @@ CFLAGS += $(CCVERBOSE) all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/nsswitch/Makefile b/usr/src/lib/nsswitch/Makefile index c51fc6e5f4..2d238e24b1 100644 --- a/usr/src/lib/nsswitch/Makefile +++ b/usr/src/lib/nsswitch/Makefile @@ -33,11 +33,10 @@ all:= TARGET= all clean:= TARGET= clean clobber:= TARGET= clobber install:= TARGET= install -lint:= TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; $(MAKE) $(TARGET) diff --git a/usr/src/lib/nsswitch/Makefile.com b/usr/src/lib/nsswitch/Makefile.com index f10f086315..b574bb5563 100644 --- a/usr/src/lib/nsswitch/Makefile.com +++ b/usr/src/lib/nsswitch/Makefile.com @@ -31,8 +31,6 @@ SRCDIR = ../common ROOT32DYNLIB = $(ROOTLIBDIR)/$(DYNLIB1) ROOT64DYNLIB = $(ROOTLIBDIR64)/$(DYNLIB1) -LINTFLAGS = -ux -LINTOUT = lint.out CPPFLAGS += -D_REENTRANT @@ -48,7 +46,6 @@ SMATCH=off LDLIBS += -lc HSONAME = -CLEANFILES += $(LINTOUT) CLOBBERFILES += $(DYNLIB1) # Leaf target makefiles establish exactly what they will build by assigning to diff --git a/usr/src/lib/nsswitch/Makefile.targ b/usr/src/lib/nsswitch/Makefile.targ index 399d9be82c..a1870b74bc 100644 --- a/usr/src/lib/nsswitch/Makefile.targ +++ b/usr/src/lib/nsswitch/Makefile.targ @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# all: $(LIBS) @@ -47,8 +45,6 @@ objs/%.o pics/%.o: ../common/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) -lint: - $(LINT.c) $(SRCS) $(LDLIBS) > $(LINTOUT) 2>&1 # Leaf target makefiles establish exactly what they will install. Use of # ROOTLIBS will install both the default archive library and DYNLIB1, diff --git a/usr/src/lib/nsswitch/ad/Makefile b/usr/src/lib/nsswitch/ad/Makefile index 284c347307..d5436150a4 100644 --- a/usr/src/lib/nsswitch/ad/Makefile +++ b/usr/src/lib/nsswitch/ad/Makefile @@ -34,11 +34,10 @@ all:= TARGET= all clean:= TARGET= clean clobber:= TARGET= clobber install:= TARGET= install -lint:= TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(FILES_SUBDIRS) +all clean clobber install: $(FILES_SUBDIRS) $(MACH) $(MACH64): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/nsswitch/compat/Makefile b/usr/src/lib/nsswitch/compat/Makefile index 7e2c8196b1..ed69fbf8dd 100644 --- a/usr/src/lib/nsswitch/compat/Makefile +++ b/usr/src/lib/nsswitch/compat/Makefile @@ -20,12 +20,9 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1991 - 1996, by Sun Microsystems, Inc. # All rights reserved. # -# lib/nsswitch/compat/Makefile include ../../../Makefile.master @@ -35,11 +32,10 @@ all:= TARGET= all clean:= TARGET= clean clobber:= TARGET= clobber install:= TARGET= install -lint:= TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(FILES_SUBDIRS) +all clean clobber install: $(FILES_SUBDIRS) $(MACH) $(MACH64): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/nsswitch/compat/Makefile.com b/usr/src/lib/nsswitch/compat/Makefile.com index 5b600c5588..b5b4b7f388 100644 --- a/usr/src/lib/nsswitch/compat/Makefile.com +++ b/usr/src/lib/nsswitch/compat/Makefile.com @@ -23,9 +23,6 @@ # Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/nsswitch/compat/Makefile.com LIBRARY = libnss_compat.a VERS = .1 @@ -43,5 +40,14 @@ include ../../Makefile.com # install this library in the root filesystem include ../../../Makefile.rootfs -LDLIBS += -lnsl DYNLIB1 = nss_compat.so$(VERS) + +COMPATLINKS= usr/lib/$(DYNLIB1) +COMPATLINKS64= usr/lib/$(MACH64)/$(DYNLIB1) + +$(ROOT)/usr/lib/$(DYNLIB1) := COMPATLINKTARGET=../../lib/$(DYNLIB1) +$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB1):= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB1) + +LDLIBS += -lnsl + diff --git a/usr/src/lib/nsswitch/compat/amd64/Makefile b/usr/src/lib/nsswitch/compat/amd64/Makefile index 1334471b25..2f85b65f33 100644 --- a/usr/src/lib/nsswitch/compat/amd64/Makefile +++ b/usr/src/lib/nsswitch/compat/amd64/Makefile @@ -23,7 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/nsswitch/compat/i386/Makefile b/usr/src/lib/nsswitch/compat/i386/Makefile index b7894e1fb1..2ca94e0c37 100644 --- a/usr/src/lib/nsswitch/compat/i386/Makefile +++ b/usr/src/lib/nsswitch/compat/i386/Makefile @@ -23,7 +23,7 @@ # Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # lib/nsswitch/compat/i386/Makefile @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/compat/sparc/Makefile b/usr/src/lib/nsswitch/compat/sparc/Makefile index bf84dac75a..9b36f0b9be 100644 --- a/usr/src/lib/nsswitch/compat/sparc/Makefile +++ b/usr/src/lib/nsswitch/compat/sparc/Makefile @@ -23,7 +23,7 @@ # Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # lib/nsswitch/compat/sparc/Makefile @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/compat/sparcv9/Makefile b/usr/src/lib/nsswitch/compat/sparcv9/Makefile index 7e6c72e5c7..39d99524aa 100644 --- a/usr/src/lib/nsswitch/compat/sparcv9/Makefile +++ b/usr/src/lib/nsswitch/compat/sparcv9/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" + # # Copyright (c) 1993,2001 by Sun Microsystems, Inc. # All rights reserved. @@ -34,4 +34,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/nsswitch/dns/Makefile b/usr/src/lib/nsswitch/dns/Makefile index 9fc3326ce3..ed69fbf8dd 100644 --- a/usr/src/lib/nsswitch/dns/Makefile +++ b/usr/src/lib/nsswitch/dns/Makefile @@ -20,12 +20,9 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1991 - 1996, by Sun Microsystems, Inc. # All rights reserved. # -# lib/nsswitch/dns/Makefile include ../../../Makefile.master @@ -35,11 +32,10 @@ all:= TARGET= all clean:= TARGET= clean clobber:= TARGET= clobber install:= TARGET= install -lint:= TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(FILES_SUBDIRS) +all clean clobber install: $(FILES_SUBDIRS) $(MACH) $(MACH64): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/nsswitch/dns/Makefile.com b/usr/src/lib/nsswitch/dns/Makefile.com index 0366633c0c..bc66038274 100644 --- a/usr/src/lib/nsswitch/dns/Makefile.com +++ b/usr/src/lib/nsswitch/dns/Makefile.com @@ -38,11 +38,19 @@ include ../../Makefile.com # install this library in the root filesystem include ../../../Makefile.rootfs +DYNLIB1 = nss_dns.so$(VERS) + +COMPATLINKS= usr/lib/$(DYNLIB1) +COMPATLINKS64= usr/lib/$(MACH64)/$(DYNLIB1) + +$(ROOT)/usr/lib/$(DYNLIB1) := COMPATLINKTARGET=../../lib/$(DYNLIB1) +$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB1):= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB1) + # Appropriate libresolv loaded at runtime. This is the default, to be dlopened # if no libresolv was provided by the application. CPPFLAGS += -DNSS_DNS_LIBRESOLV=\"libresolv.so.2\" -LINTFLAGS += -erroff=E_GLOBAL_COULD_BE_STATIC2 LDLIBS += -lnsl -lresolv_joy -lsocket DYNLIB1 = nss_dns.so$(VERS) diff --git a/usr/src/lib/nsswitch/dns/amd64/Makefile b/usr/src/lib/nsswitch/dns/amd64/Makefile index 1334471b25..2f85b65f33 100644 --- a/usr/src/lib/nsswitch/dns/amd64/Makefile +++ b/usr/src/lib/nsswitch/dns/amd64/Makefile @@ -23,7 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/nsswitch/dns/i386/Makefile b/usr/src/lib/nsswitch/dns/i386/Makefile index 164288fc1d..a1784e474a 100644 --- a/usr/src/lib/nsswitch/dns/i386/Makefile +++ b/usr/src/lib/nsswitch/dns/i386/Makefile @@ -23,7 +23,7 @@ # Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # lib/nsswitch/dns/i386/Makefile @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/dns/sparc/Makefile b/usr/src/lib/nsswitch/dns/sparc/Makefile index 9ea99483e7..c42e6a88f5 100644 --- a/usr/src/lib/nsswitch/dns/sparc/Makefile +++ b/usr/src/lib/nsswitch/dns/sparc/Makefile @@ -23,7 +23,7 @@ # Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # lib/nsswitch/dns/sparc/Makefile @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/dns/sparcv9/Makefile b/usr/src/lib/nsswitch/dns/sparcv9/Makefile index dbcedcf28e..b686e818ca 100644 --- a/usr/src/lib/nsswitch/dns/sparcv9/Makefile +++ b/usr/src/lib/nsswitch/dns/sparcv9/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" + # # Copyright (c) 1993,2001 by Sun Microsystems, Inc. # All rights reserved. @@ -34,4 +34,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/nsswitch/files/Makefile b/usr/src/lib/nsswitch/files/Makefile index fdd66fff3b..ed69fbf8dd 100644 --- a/usr/src/lib/nsswitch/files/Makefile +++ b/usr/src/lib/nsswitch/files/Makefile @@ -20,12 +20,9 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1991 - 1996, by Sun Microsystems, Inc. # All rights reserved. # -# lib/nsswitch/Makefile include ../../../Makefile.master @@ -35,11 +32,10 @@ all:= TARGET= all clean:= TARGET= clean clobber:= TARGET= clobber install:= TARGET= install -lint:= TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(FILES_SUBDIRS) +all clean clobber install: $(FILES_SUBDIRS) $(MACH) $(MACH64): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/nsswitch/files/Makefile.com b/usr/src/lib/nsswitch/files/Makefile.com index 1489badee6..e79567aaaf 100644 --- a/usr/src/lib/nsswitch/files/Makefile.com +++ b/usr/src/lib/nsswitch/files/Makefile.com @@ -56,10 +56,22 @@ include ../../Makefile.com include ../../../Makefile.rootfs CPPFLAGS += -I../../../common/inc -LINTFLAGS += -erroff=E_GLOBAL_COULD_BE_STATIC2 -LINTFLAGS64 += -erroff=E_GLOBAL_COULD_BE_STATIC2 LDLIBS += -lnsl DYNLIB1 = nss_files.so$(VERS) +COMPATLINKS= usr/lib/$(DYNLIB1) \ + etc/lib/$(DYNLIB1) +COMPATLINKS64= usr/lib/$(MACH64)/$(DYNLIB1) + +$(ROOT)/usr/lib/$(DYNLIB1) := COMPATLINKTARGET=../../lib/$(DYNLIB1) +$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB1):= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB1) +$(ROOT)/usr/lib/$(DYNLIB1) := COMPATLINKTARGET=../../lib/$(DYNLIB1) +$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB1):= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB1) + +$(ROOT)/etc/lib/$(DYNLIB1) := COMPATLINKTARGET= ../../lib/$(DYNLIB1) + all: $(DYNLIB1) + diff --git a/usr/src/lib/nsswitch/files/amd64/Makefile b/usr/src/lib/nsswitch/files/amd64/Makefile index 1334471b25..2f85b65f33 100644 --- a/usr/src/lib/nsswitch/files/amd64/Makefile +++ b/usr/src/lib/nsswitch/files/amd64/Makefile @@ -23,7 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/nsswitch/files/i386/Makefile b/usr/src/lib/nsswitch/files/i386/Makefile index 96e5ad1958..8680ea468e 100644 --- a/usr/src/lib/nsswitch/files/i386/Makefile +++ b/usr/src/lib/nsswitch/files/i386/Makefile @@ -23,7 +23,7 @@ # Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # lib/nsswitch/files/i386/Makefile @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/files/sparc/Makefile b/usr/src/lib/nsswitch/files/sparc/Makefile index e79a5949bb..13c233f678 100644 --- a/usr/src/lib/nsswitch/files/sparc/Makefile +++ b/usr/src/lib/nsswitch/files/sparc/Makefile @@ -23,7 +23,7 @@ # Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # lib/nsswitch/files/sparc/Makefile @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/files/sparcv9/Makefile b/usr/src/lib/nsswitch/files/sparcv9/Makefile index 1c6d8cc170..1509fc0993 100644 --- a/usr/src/lib/nsswitch/files/sparcv9/Makefile +++ b/usr/src/lib/nsswitch/files/sparcv9/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" + # # Copyright (c) 1993,2001 by Sun Microsystems, Inc. # All rights reserved. @@ -34,4 +34,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/nsswitch/ldap/Makefile b/usr/src/lib/nsswitch/ldap/Makefile index eabc270b02..676b76d129 100644 --- a/usr/src/lib/nsswitch/ldap/Makefile +++ b/usr/src/lib/nsswitch/ldap/Makefile @@ -20,13 +20,9 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1999 by Sun Microsystems, Inc. # All rights reserved. # -# lib/nsswitch/ldap/Makefile -# include ../../../Makefile.master @@ -36,11 +32,10 @@ all:= TARGET= all clean:= TARGET= clean clobber:= TARGET= clobber install:= TARGET= install -lint:= TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(FILES_SUBDIRS) +all clean clobber install: $(FILES_SUBDIRS) $(MACH) $(MACH64): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/nsswitch/ldap/Makefile.com b/usr/src/lib/nsswitch/ldap/Makefile.com index 694bd5f023..63dbda12ce 100644 --- a/usr/src/lib/nsswitch/ldap/Makefile.com +++ b/usr/src/lib/nsswitch/ldap/Makefile.com @@ -57,6 +57,4 @@ include ../../Makefile.com CPPFLAGS += -I../../../libsldap/common LDLIBS += -lsldap -lnsl -lldap -LINTFLAGS += -erroff=E_GLOBAL_COULD_BE_STATIC2 -LINTFLAGS64 += -erroff=E_GLOBAL_COULD_BE_STATIC2 DYNLIB1 = nss_ldap.so$(VERS) diff --git a/usr/src/lib/nsswitch/mdns/Makefile b/usr/src/lib/nsswitch/mdns/Makefile index f67704e53a..842cd86b55 100644 --- a/usr/src/lib/nsswitch/mdns/Makefile +++ b/usr/src/lib/nsswitch/mdns/Makefile @@ -21,9 +21,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/nsswitch/mdns/Makefile include ../../../Makefile.master @@ -33,11 +30,10 @@ all:= TARGET= all clean:= TARGET= clean clobber:= TARGET= clobber install:= TARGET= install -lint:= TARGET= lint .KEEP_STATE: -all clean clobber install lint debugmod: $(FILES_SUBDIRS) +all clean clobber install debugmod: $(FILES_SUBDIRS) $(MACH) $(MACH64): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/nsswitch/nis/Makefile b/usr/src/lib/nsswitch/nis/Makefile index b3dbfb5bf9..ed69fbf8dd 100644 --- a/usr/src/lib/nsswitch/nis/Makefile +++ b/usr/src/lib/nsswitch/nis/Makefile @@ -20,12 +20,9 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1991 - 1996, by Sun Microsystems, Inc. # All rights reserved. # -# lib/nsswitch/nis/Makefile include ../../../Makefile.master @@ -35,11 +32,10 @@ all:= TARGET= all clean:= TARGET= clean clobber:= TARGET= clobber install:= TARGET= install -lint:= TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(FILES_SUBDIRS) +all clean clobber install: $(FILES_SUBDIRS) $(MACH) $(MACH64): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/nsswitch/nis/Makefile.com b/usr/src/lib/nsswitch/nis/Makefile.com index cbccdfb764..0e083e1c0e 100644 --- a/usr/src/lib/nsswitch/nis/Makefile.com +++ b/usr/src/lib/nsswitch/nis/Makefile.com @@ -54,8 +54,14 @@ include ../../Makefile.com # install this library in the root filesystem include ../../../Makefile.rootfs -LINTFLAGS += -erroff=E_GLOBAL_COULD_BE_STATIC2 -LINTFLAGS64 += -erroff=E_GLOBAL_COULD_BE_STATIC2 +DYNLIB1 = nss_nis.so$(VERS) + +COMPATLINKS= usr/lib/$(DYNLIB1) +COMPATLINKS64= usr/lib/$(MACH64)/$(DYNLIB1) + +$(ROOT)/usr/lib/$(DYNLIB1) := COMPATLINKTARGET=../../lib/$(DYNLIB1) +$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB1):= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB1) LDLIBS += -lnsl -DYNLIB1 = nss_nis.so$(VERS) + diff --git a/usr/src/lib/nsswitch/nis/amd64/Makefile b/usr/src/lib/nsswitch/nis/amd64/Makefile index 1334471b25..2f85b65f33 100644 --- a/usr/src/lib/nsswitch/nis/amd64/Makefile +++ b/usr/src/lib/nsswitch/nis/amd64/Makefile @@ -23,7 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/nsswitch/nis/i386/Makefile b/usr/src/lib/nsswitch/nis/i386/Makefile index 7c905cb9ed..efacc329ce 100644 --- a/usr/src/lib/nsswitch/nis/i386/Makefile +++ b/usr/src/lib/nsswitch/nis/i386/Makefile @@ -23,7 +23,7 @@ # Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # lib/nsswitch/nis/i386/Makefile @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/nis/sparc/Makefile b/usr/src/lib/nsswitch/nis/sparc/Makefile index cc816ee636..8ffaa154cd 100644 --- a/usr/src/lib/nsswitch/nis/sparc/Makefile +++ b/usr/src/lib/nsswitch/nis/sparc/Makefile @@ -23,7 +23,7 @@ # Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # lib/nsswitch/nis/sparc/Makefile @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/nis/sparcv9/Makefile b/usr/src/lib/nsswitch/nis/sparcv9/Makefile index 66974953c6..02a0757556 100644 --- a/usr/src/lib/nsswitch/nis/sparcv9/Makefile +++ b/usr/src/lib/nsswitch/nis/sparcv9/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" + # # Copyright (c) 1993,2001 by Sun Microsystems, Inc. # All rights reserved. @@ -34,4 +34,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/nsswitch/user/Makefile b/usr/src/lib/nsswitch/user/Makefile index 123b24895e..ed69fbf8dd 100644 --- a/usr/src/lib/nsswitch/user/Makefile +++ b/usr/src/lib/nsswitch/user/Makefile @@ -20,12 +20,9 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1991 - 1996, by Sun Microsystems, Inc. # All rights reserved. # -# lib/nsswitch/user/Makefile include ../../../Makefile.master @@ -35,11 +32,10 @@ all:= TARGET= all clean:= TARGET= clean clobber:= TARGET= clobber install:= TARGET= install -lint:= TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(FILES_SUBDIRS) +all clean clobber install: $(FILES_SUBDIRS) $(MACH) $(MACH64): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/nsswitch/user/Makefile.com b/usr/src/lib/nsswitch/user/Makefile.com index befd4172a7..0a1803ff22 100644 --- a/usr/src/lib/nsswitch/user/Makefile.com +++ b/usr/src/lib/nsswitch/user/Makefile.com @@ -22,9 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/nsswitch/user/Makefile.com LIBRARY = libnss_user.a VERS = .1 @@ -38,10 +35,15 @@ include ../../Makefile.com # install this library in the root filesystem include ../../../Makefile.rootfs -CPPFLAGS += -I../../../common/inc -LINTFLAGS += -erroff=E_GLOBAL_COULD_BE_STATIC2 -erroff=E_FUNC_SET_NOT_USED -LINTFLAGS64 += -erroff=E_GLOBAL_COULD_BE_STATIC2 -erroff=E_FUNC_SET_NOT_USED - DYNLIB1 = nss_user.so$(VERS) +COMPATLINKS= usr/lib/$(DYNLIB1) +COMPATLINKS64= usr/lib/$(MACH64)/$(DYNLIB1) + +$(ROOT)/usr/lib/$(DYNLIB1) := COMPATLINKTARGET=../../lib/$(DYNLIB1) +$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB1) := \ + COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB1) + +CPPFLAGS += -I../../../common/inc + all: $(DYNLIB1) diff --git a/usr/src/lib/nsswitch/user/amd64/Makefile b/usr/src/lib/nsswitch/user/amd64/Makefile index 1334471b25..2f85b65f33 100644 --- a/usr/src/lib/nsswitch/user/amd64/Makefile +++ b/usr/src/lib/nsswitch/user/amd64/Makefile @@ -23,7 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/nsswitch/user/i386/Makefile b/usr/src/lib/nsswitch/user/i386/Makefile index 173380a346..ffe5bd84ba 100644 --- a/usr/src/lib/nsswitch/user/i386/Makefile +++ b/usr/src/lib/nsswitch/user/i386/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" + # # Copyright (c) 1993,2001 by Sun Microsystems, Inc. # All rights reserved. @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/user/sparc/Makefile b/usr/src/lib/nsswitch/user/sparc/Makefile index 2d974133a9..6de0a45157 100644 --- a/usr/src/lib/nsswitch/user/sparc/Makefile +++ b/usr/src/lib/nsswitch/user/sparc/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" + # # Copyright (c) 1993,2001 by Sun Microsystems, Inc. # All rights reserved. @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/user/sparcv9/Makefile b/usr/src/lib/nsswitch/user/sparcv9/Makefile index 87fbebb765..7f1a6c94bf 100644 --- a/usr/src/lib/nsswitch/user/sparcv9/Makefile +++ b/usr/src/lib/nsswitch/user/sparcv9/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" + # # Copyright (c) 1993,2001 by Sun Microsystems, Inc. # All rights reserved. @@ -34,4 +34,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/pam_modules/Makefile b/usr/src/lib/pam_modules/Makefile index 4df91511af..babbcc4de3 100644 --- a/usr/src/lib/pam_modules/Makefile +++ b/usr/src/lib/pam_modules/Makefile @@ -59,12 +59,11 @@ catalog := TARGET= _msg clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all clean clobber install lint _msg: $(SUBDIRS) +all clean clobber install _msg: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/pam_modules/allow/Makefile b/usr/src/lib/pam_modules/allow/Makefile index 99f0e3a31c..838b7380ef 100644 --- a/usr/src/lib/pam_modules/allow/Makefile +++ b/usr/src/lib/pam_modules/allow/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -38,11 +36,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) _msg: $(MSGDOMAINPOFILE) diff --git a/usr/src/lib/pam_modules/allow/Makefile.com b/usr/src/lib/pam_modules/allow/Makefile.com index 50c8f669a1..2d9ae89bb8 100644 --- a/usr/src/lib/pam_modules/allow/Makefile.com +++ b/usr/src/lib/pam_modules/allow/Makefile.com @@ -23,11 +23,10 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" LIBRARY= pam_allow.a VERS= .1 -OBJECTS= allow.o +OBJECTS= allow.o include ../../Makefile.pam_modules @@ -35,6 +34,5 @@ LDLIBS += -lpam -lc all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/pam_modules/authtok_check/Makefile b/usr/src/lib/pam_modules/authtok_check/Makefile index 61bc9201a9..b7d6f72b56 100644 --- a/usr/src/lib/pam_modules/authtok_check/Makefile +++ b/usr/src/lib/pam_modules/authtok_check/Makefile @@ -22,10 +22,8 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -include ../../Makefile.lib +include ../../Makefile.lib TEXT_DOMAIN= SUNW_OST_SYSOSPAM POFILE= authtok_check.po @@ -38,11 +36,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) _msg: $(MSGDOMAINPOFILE) diff --git a/usr/src/lib/pam_modules/authtok_check/Makefile.com b/usr/src/lib/pam_modules/authtok_check/Makefile.com index ffdafad371..95c326b6d6 100644 --- a/usr/src/lib/pam_modules/authtok_check/Makefile.com +++ b/usr/src/lib/pam_modules/authtok_check/Makefile.com @@ -41,6 +41,5 @@ SMATCH=off all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/pam_modules/authtok_get/Makefile b/usr/src/lib/pam_modules/authtok_get/Makefile index a7ef66e32d..c37923062d 100644 --- a/usr/src/lib/pam_modules/authtok_get/Makefile +++ b/usr/src/lib/pam_modules/authtok_get/Makefile @@ -22,10 +22,8 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -include ../../Makefile.lib +include ../../Makefile.lib TEXT_DOMAIN= SUNW_OST_SYSOSPAM POFILE= authtok_get.po @@ -38,11 +36,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) _msg: $(MSGDOMAINPOFILE) diff --git a/usr/src/lib/pam_modules/authtok_get/Makefile.com b/usr/src/lib/pam_modules/authtok_get/Makefile.com index f39d523e07..d5f50ed8f8 100644 --- a/usr/src/lib/pam_modules/authtok_get/Makefile.com +++ b/usr/src/lib/pam_modules/authtok_get/Makefile.com @@ -23,9 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# usr/src/lib/pam_modules/authtok_get/Makefile.com -# -# ident "%Z%%M% %I% %E% SMI" LIBRARY= pam_authtok_get.a VERS= .1 @@ -37,6 +34,5 @@ LDLIBS += -lpam -lc all: $(LIBS) -lint: lintcheck include ../../../Makefile.targ diff --git a/usr/src/lib/pam_modules/authtok_store/Makefile b/usr/src/lib/pam_modules/authtok_store/Makefile index 2237eccf27..f05be52fe3 100644 --- a/usr/src/lib/pam_modules/authtok_store/Makefile +++ b/usr/src/lib/pam_modules/authtok_store/Makefile @@ -22,10 +22,8 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -include ../../Makefile.lib +include ../../Makefile.lib TEXT_DOMAIN= SUNW_OST_SYSOSPAM POFILE= authtok_store.po @@ -38,11 +36,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) _msg: $(MSGDOMAINPOFILE) diff --git a/usr/src/lib/pam_modules/authtok_store/Makefile.com b/usr/src/lib/pam_modules/authtok_store/Makefile.com index 6346195a73..28efe7c649 100644 --- a/usr/src/lib/pam_modules/authtok_store/Makefile.com +++ b/usr/src/lib/pam_modules/authtok_store/Makefile.com @@ -23,10 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# usr/src/lib/pam_modules/authtok_store/Makefile.com -# LIBRARY= pam_authtok_store.a VERS= .1 @@ -38,6 +34,5 @@ LDLIBS += -lpam -lc all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/pam_modules/deny/Makefile b/usr/src/lib/pam_modules/deny/Makefile index bb8685eb35..4395d45c4f 100644 --- a/usr/src/lib/pam_modules/deny/Makefile +++ b/usr/src/lib/pam_modules/deny/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -38,11 +36,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) _msg: $(MSGDOMAINPOFILE) diff --git a/usr/src/lib/pam_modules/deny/Makefile.com b/usr/src/lib/pam_modules/deny/Makefile.com index 24c98eab47..4709a9fd58 100644 --- a/usr/src/lib/pam_modules/deny/Makefile.com +++ b/usr/src/lib/pam_modules/deny/Makefile.com @@ -23,13 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# usr/src/lib/pam_modules/deny/Makefile.com -# -#ident "%Z%%M% %I% %E% SMI" LIBRARY= pam_deny.a VERS= .1 -OBJECTS= deny.o +OBJECTS= deny.o include ../../Makefile.pam_modules @@ -37,6 +34,5 @@ LDLIBS += -lpam -lc all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/pam_modules/dhkeys/Makefile b/usr/src/lib/pam_modules/dhkeys/Makefile index 619aaeb110..c337d12bf5 100644 --- a/usr/src/lib/pam_modules/dhkeys/Makefile +++ b/usr/src/lib/pam_modules/dhkeys/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -42,11 +40,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) _msg: $(MSGDOMAINPOFILE) diff --git a/usr/src/lib/pam_modules/dhkeys/Makefile.com b/usr/src/lib/pam_modules/dhkeys/Makefile.com index c5a0391025..8ec736a113 100644 --- a/usr/src/lib/pam_modules/dhkeys/Makefile.com +++ b/usr/src/lib/pam_modules/dhkeys/Makefile.com @@ -39,6 +39,5 @@ CERRWARN += -_gcc=-Wno-parentheses all: $(LIBS) -lint: lintcheck include ../../../Makefile.targ diff --git a/usr/src/lib/pam_modules/dial_auth/Makefile b/usr/src/lib/pam_modules/dial_auth/Makefile index bdccadb1e5..28453b52ac 100644 --- a/usr/src/lib/pam_modules/dial_auth/Makefile +++ b/usr/src/lib/pam_modules/dial_auth/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -38,11 +36,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) _msg: $(MSGDOMAINPOFILE) diff --git a/usr/src/lib/pam_modules/dial_auth/Makefile.com b/usr/src/lib/pam_modules/dial_auth/Makefile.com index 116c37763f..d3a6d760d6 100644 --- a/usr/src/lib/pam_modules/dial_auth/Makefile.com +++ b/usr/src/lib/pam_modules/dial_auth/Makefile.com @@ -23,13 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# usr/src/lib/pam_modules/dial_auth/Makefile.com -# -#ident "%Z%%M% %I% %E% SMI" LIBRARY= pam_dial_auth.a VERS= .1 -OBJECTS= dial_auth.o +OBJECTS= dial_auth.o include ../../Makefile.pam_modules @@ -37,6 +34,5 @@ LDLIBS += -lpam -lc all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/pam_modules/krb5/Makefile b/usr/src/lib/pam_modules/krb5/Makefile index 27c168cd9e..8cb7fc57e4 100644 --- a/usr/src/lib/pam_modules/krb5/Makefile +++ b/usr/src/lib/pam_modules/krb5/Makefile @@ -37,11 +37,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(POFILE): $(MSGFILES) $(BUILDPO.msgfiles) diff --git a/usr/src/lib/pam_modules/krb5/Makefile.com b/usr/src/lib/pam_modules/krb5/Makefile.com index 44e00890ad..b00a756a9e 100644 --- a/usr/src/lib/pam_modules/krb5/Makefile.com +++ b/usr/src/lib/pam_modules/krb5/Makefile.com @@ -37,7 +37,7 @@ PRIV_OBJ= krb5_authenticate.o \ OBJECTS= $(PRIV_OBJ) -include ../../Makefile.pam_modules +include ../../Makefile.pam_modules include $(SRC)/lib/gss_mechs/mech_krb5/Makefile.mech_krb5 CPPFLAGS += -I../../../gss_mechs/mech_krb5/include \ @@ -57,15 +57,9 @@ SMATCH=off # called after dlclose() DYNFLAGS += $(ZNODELETE) -CLOBBERFILES += $(LINTLIB) $(LINTOUT) $(POFILE) - -# -# Don't lint derived files -# -lint := SRCS= $(PRIV_OBJ:%.o=$(SRCDIR)/%.c) +CLOBBERFILES += $(POFILE) all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/pam_modules/krb5_migrate/Makefile b/usr/src/lib/pam_modules/krb5_migrate/Makefile index 190282d0bb..3beb200414 100644 --- a/usr/src/lib/pam_modules/krb5_migrate/Makefile +++ b/usr/src/lib/pam_modules/krb5_migrate/Makefile @@ -22,10 +22,8 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -include ../../Makefile.lib +include ../../Makefile.lib TEXT_DOMAIN= SUNW_OST_SYSOSPAM POFILE= pam_krb5_migrate.po @@ -38,11 +36,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(POFILE): $(MSGFILES) $(BUILDPO.msgfiles) diff --git a/usr/src/lib/pam_modules/krb5_migrate/Makefile.com b/usr/src/lib/pam_modules/krb5_migrate/Makefile.com index 498b00f83b..71a3e4f9fb 100644 --- a/usr/src/lib/pam_modules/krb5_migrate/Makefile.com +++ b/usr/src/lib/pam_modules/krb5_migrate/Makefile.com @@ -45,6 +45,5 @@ LDLIBS += -lpam -lc all: $(LIBS) -lint: lintcheck include ../../../Makefile.targ diff --git a/usr/src/lib/pam_modules/ldap/Makefile b/usr/src/lib/pam_modules/ldap/Makefile index 4a5995bb82..a09f4f6534 100644 --- a/usr/src/lib/pam_modules/ldap/Makefile +++ b/usr/src/lib/pam_modules/ldap/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -39,11 +37,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(POFILE): $(MSGFILES) $(BUILDPO.msgfiles) diff --git a/usr/src/lib/pam_modules/ldap/Makefile.com b/usr/src/lib/pam_modules/ldap/Makefile.com index 8166a466b1..be6c625cae 100644 --- a/usr/src/lib/pam_modules/ldap/Makefile.com +++ b/usr/src/lib/pam_modules/ldap/Makefile.com @@ -28,7 +28,7 @@ LIBRARY= pam_ldap.a VERS= .1 -OBJECTS= ldap_authenticate.o \ +OBJECTS= ldap_authenticate.o \ ldap_setcred.o \ ldap_acct_mgmt.o \ ldap_close_session.o \ @@ -44,6 +44,5 @@ CERRWARN += -_gcc=-Wno-parentheses all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/pam_modules/list/Makefile b/usr/src/lib/pam_modules/list/Makefile index 21e8a6a469..528739d716 100644 --- a/usr/src/lib/pam_modules/list/Makefile +++ b/usr/src/lib/pam_modules/list/Makefile @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -37,11 +35,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) _msg: $(MSGDOMAINPOFILE) @@ -50,5 +47,5 @@ $(SUBDIRS): FRC FRC: -include $(SRC)/Makefile.msg.targ +include $(SRC)/Makefile.msg.targ include ../../Makefile.targ diff --git a/usr/src/lib/pam_modules/list/Makefile.com b/usr/src/lib/pam_modules/list/Makefile.com index 0099d415ea..ff0e799f45 100644 --- a/usr/src/lib/pam_modules/list/Makefile.com +++ b/usr/src/lib/pam_modules/list/Makefile.com @@ -22,12 +22,10 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY= pam_list.a VERS= .1 -OBJECTS= list.o +OBJECTS= list.o include ../../Makefile.pam_modules @@ -35,6 +33,5 @@ LDLIBS += -lpam -lc all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/pam_modules/passwd_auth/Makefile b/usr/src/lib/pam_modules/passwd_auth/Makefile index b93feb4aa8..8b8463f9ff 100644 --- a/usr/src/lib/pam_modules/passwd_auth/Makefile +++ b/usr/src/lib/pam_modules/passwd_auth/Makefile @@ -22,10 +22,8 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -include ../../Makefile.lib +include ../../Makefile.lib TEXT_DOMAIN= SUNW_OST_SYSOSPAM POFILE= passwd_auth.po @@ -38,11 +36,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) _msg: $(MSGDOMAINPOFILE) diff --git a/usr/src/lib/pam_modules/passwd_auth/Makefile.com b/usr/src/lib/pam_modules/passwd_auth/Makefile.com index 18cc740cd5..b1b2d51533 100644 --- a/usr/src/lib/pam_modules/passwd_auth/Makefile.com +++ b/usr/src/lib/pam_modules/passwd_auth/Makefile.com @@ -25,7 +25,6 @@ # # usr/src/lib/pam_modules/passwd_auth/Makefile.com # -# ident "%Z%%M% %I% %E% SMI" LIBRARY= pam_passwd_auth.a VERS= .1 @@ -37,6 +36,5 @@ LDLIBS += -lpam -lc all: $(LIBS) -lint: lintcheck include ../../../Makefile.targ diff --git a/usr/src/lib/pam_modules/rhosts_auth/Makefile b/usr/src/lib/pam_modules/rhosts_auth/Makefile index f37449cda6..71e2072cef 100644 --- a/usr/src/lib/pam_modules/rhosts_auth/Makefile +++ b/usr/src/lib/pam_modules/rhosts_auth/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -38,11 +36,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) _msg: $(MSGDOMAINPOFILE) @@ -51,5 +48,5 @@ $(SUBDIRS): FRC FRC: -include $(SRC)/Makefile.msg.targ -include ../../Makefile.targ +include $(SRC)/Makefile.msg.targ +include ../../Makefile.targ diff --git a/usr/src/lib/pam_modules/rhosts_auth/Makefile.com b/usr/src/lib/pam_modules/rhosts_auth/Makefile.com index 60cff0ce18..4989fe20e5 100644 --- a/usr/src/lib/pam_modules/rhosts_auth/Makefile.com +++ b/usr/src/lib/pam_modules/rhosts_auth/Makefile.com @@ -23,10 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# usr/src/lib/pam_modules/rhosts_auth/Makefile.com -# -#ident "%Z%%M% %I% %E% SMI" -# LIBRARY= pam_rhosts_auth.a VERS= .1 @@ -38,6 +34,5 @@ LDLIBS += -lpam -lsocket -lc all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/pam_modules/roles/Makefile b/usr/src/lib/pam_modules/roles/Makefile index 1851f68225..e7679c787e 100644 --- a/usr/src/lib/pam_modules/roles/Makefile +++ b/usr/src/lib/pam_modules/roles/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -38,11 +36,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) _msg: $(MSGDOMAINPOFILE) diff --git a/usr/src/lib/pam_modules/roles/Makefile.com b/usr/src/lib/pam_modules/roles/Makefile.com index 74da5a5c2f..a44a455b00 100644 --- a/usr/src/lib/pam_modules/roles/Makefile.com +++ b/usr/src/lib/pam_modules/roles/Makefile.com @@ -23,13 +23,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# usr/src/lib/pam_modules/roles/Makefile.com -# -#ident "%Z%%M% %I% %E% SMI" LIBRARY= pam_roles.a VERS= .1 -OBJECTS= roles.o +OBJECTS= roles.o include ../../Makefile.pam_modules @@ -37,6 +34,5 @@ LDLIBS += -lpam -lsecdb -lc all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/pam_modules/sample/Makefile b/usr/src/lib/pam_modules/sample/Makefile index c9a7427362..b720c07ec0 100644 --- a/usr/src/lib/pam_modules/sample/Makefile +++ b/usr/src/lib/pam_modules/sample/Makefile @@ -22,10 +22,8 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -include ../../Makefile.lib +include ../../Makefile.lib TEXT_DOMAIN= SUNW_OST_SYSOSPAM POFILE= sample_authenticate.po @@ -38,11 +36,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) _msg: $(MSGDOMAINPOFILE) diff --git a/usr/src/lib/pam_modules/sample/Makefile.com b/usr/src/lib/pam_modules/sample/Makefile.com index a38f09734a..9a34fbc897 100644 --- a/usr/src/lib/pam_modules/sample/Makefile.com +++ b/usr/src/lib/pam_modules/sample/Makefile.com @@ -24,13 +24,10 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# usr/src/lib/pam_modules/sample/Makefile.com -# -#ident "%Z%%M% %I% %E% SMI" LIBRARY= pam_sample.a VERS= .1 -OBJECTS= sample_authenticate.o \ +OBJECTS= sample_authenticate.o \ sample_setcred.o \ sample_acct_mgmt.o \ sample_close_session.o \ @@ -44,6 +41,5 @@ LDLIBS += -lpam -lc all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/pam_modules/smb/Makefile b/usr/src/lib/pam_modules/smb/Makefile index ea50c3ae1f..b3e928ecf1 100644 --- a/usr/src/lib/pam_modules/smb/Makefile +++ b/usr/src/lib/pam_modules/smb/Makefile @@ -23,10 +23,8 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -include ../../Makefile.lib +include ../../Makefile.lib TEXT_DOMAIN= SUNW_OST_SYSOSPAM POFILE= smb_passwd.po @@ -39,11 +37,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) _msg: $(MSGDOMAINPOFILE) diff --git a/usr/src/lib/pam_modules/smb/Makefile.com b/usr/src/lib/pam_modules/smb/Makefile.com index 2a461d53bc..4e851da8ab 100644 --- a/usr/src/lib/pam_modules/smb/Makefile.com +++ b/usr/src/lib/pam_modules/smb/Makefile.com @@ -40,6 +40,5 @@ LDLIBS += -lsmb -lpam -lc all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/pam_modules/smbfs/Makefile b/usr/src/lib/pam_modules/smbfs/Makefile index b621fb5528..4e0563df4d 100644 --- a/usr/src/lib/pam_modules/smbfs/Makefile +++ b/usr/src/lib/pam_modules/smbfs/Makefile @@ -23,10 +23,8 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -include ../../Makefile.lib +include ../../Makefile.lib TEXT_DOMAIN= SUNW_OST_SYSOSPAM POFILE= smbfs_login.po @@ -43,11 +41,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) _msg: $(MSGDOMAINPOFILE) diff --git a/usr/src/lib/pam_modules/smbfs/Makefile.com b/usr/src/lib/pam_modules/smbfs/Makefile.com index 5b8d9dcb3f..a7e8873cea 100644 --- a/usr/src/lib/pam_modules/smbfs/Makefile.com +++ b/usr/src/lib/pam_modules/smbfs/Makefile.com @@ -23,8 +23,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY= pam_smbfs_login.a VERS= .1 @@ -35,11 +33,8 @@ include ../../Makefile.pam_modules LDLIBS += -lpam -lc -lsmbfs CFLAGS += -I../../../libsmbfs CFLAGS64 += -I../../../libsmbfs -LINTFLAGS += -I$(SRC)/lib/libsmbfs -LINTFLAGS64 += -I$(SRC)/lib/libsmbfs all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/pam_modules/timestamp/Makefile b/usr/src/lib/pam_modules/timestamp/Makefile index 81f04b8670..360745de29 100644 --- a/usr/src/lib/pam_modules/timestamp/Makefile +++ b/usr/src/lib/pam_modules/timestamp/Makefile @@ -11,7 +11,7 @@ # Copyright 2014 Nexenta Systems, Inc. # -include ../../Makefile.lib +include ../../Makefile.lib TEXT_DOMAIN= SUNW_OST_SYSOSPAM POFILE= pam_timestamp.po @@ -24,11 +24,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) _msg: $(MSGDOMAINPOFILE) diff --git a/usr/src/lib/pam_modules/timestamp/Makefile.com b/usr/src/lib/pam_modules/timestamp/Makefile.com index 596dbb5228..b32f9487a0 100644 --- a/usr/src/lib/pam_modules/timestamp/Makefile.com +++ b/usr/src/lib/pam_modules/timestamp/Makefile.com @@ -17,7 +17,7 @@ LIBRARY= pam_timestamp.a VERS= .1 -OBJECTS= pam_timestamp.o +OBJECTS= pam_timestamp.o include ../../Makefile.pam_modules @@ -25,6 +25,5 @@ LDLIBS += -lpam -lc all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/pam_modules/tsol_acct/Makefile b/usr/src/lib/pam_modules/tsol_acct/Makefile index 7f7344b7b7..cc8ffaf569 100644 --- a/usr/src/lib/pam_modules/tsol_acct/Makefile +++ b/usr/src/lib/pam_modules/tsol_acct/Makefile @@ -22,23 +22,20 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib -SUBDIRS= $(MACH) -$(BUILD64)SUBDIRS += $(MACH64) +SUBDIRS= $(MACH) +$(BUILD64)SUBDIRS += $(MACH64) all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/pam_modules/tsol_acct/Makefile.com b/usr/src/lib/pam_modules/tsol_acct/Makefile.com index fb0e0d9568..86c503560f 100644 --- a/usr/src/lib/pam_modules/tsol_acct/Makefile.com +++ b/usr/src/lib/pam_modules/tsol_acct/Makefile.com @@ -22,11 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# usr/src/lib/pam_modules/tsol/Makefile.com -# -# ident "%Z%%M% %I% %E% SMI" -# -# LIBRARY= pam_tsol_account.a VERS= .1 @@ -38,6 +33,5 @@ LDLIBS += -lc -lpam -ltsol -ltsnet all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/pam_modules/unix_account/Makefile b/usr/src/lib/pam_modules/unix_account/Makefile index 7870eaa9b2..1d76458e78 100644 --- a/usr/src/lib/pam_modules/unix_account/Makefile +++ b/usr/src/lib/pam_modules/unix_account/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -31,18 +29,17 @@ TEXT_DOMAIN= SUNW_OST_SYSOSPAM POFILE= unix_account.po MSGFILES= unix_acct.c -SUBDIRS= $(MACH) -$(BUILD64)SUBDIRS += $(MACH64) +SUBDIRS= $(MACH) +$(BUILD64)SUBDIRS += $(MACH64) all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) # need rule here $(POFILE): $(MSGFILES) diff --git a/usr/src/lib/pam_modules/unix_account/Makefile.com b/usr/src/lib/pam_modules/unix_account/Makefile.com index 9971e8b296..b3d0f20ad0 100644 --- a/usr/src/lib/pam_modules/unix_account/Makefile.com +++ b/usr/src/lib/pam_modules/unix_account/Makefile.com @@ -36,6 +36,5 @@ CERRWARN += -_gcc=-Wno-parentheses all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/pam_modules/unix_auth/Makefile b/usr/src/lib/pam_modules/unix_auth/Makefile index 7379dc399b..49c71f90ff 100644 --- a/usr/src/lib/pam_modules/unix_auth/Makefile +++ b/usr/src/lib/pam_modules/unix_auth/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -31,18 +29,17 @@ TEXT_DOMAIN= SUNW_OST_SYSOSPAM POFILE= unix_auth.po MSGFILES= unix_auth.c -SUBDIRS= $(MACH) -$(BUILD64)SUBDIRS += $(MACH64) +SUBDIRS= $(MACH) +$(BUILD64)SUBDIRS += $(MACH64) all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) _msg: $(MSGDOMAINPOFILE) diff --git a/usr/src/lib/pam_modules/unix_auth/Makefile.com b/usr/src/lib/pam_modules/unix_auth/Makefile.com index d3fb47fdaa..682c774848 100644 --- a/usr/src/lib/pam_modules/unix_auth/Makefile.com +++ b/usr/src/lib/pam_modules/unix_auth/Makefile.com @@ -22,10 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# usr/src/lib/pam_modules/unix_auth/Makefile.com -# LIBRARY= pam_unix_auth.a VERS= .1 @@ -37,6 +33,5 @@ LDLIBS += -lpam -lsecdb -lc all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/pam_modules/unix_cred/Makefile b/usr/src/lib/pam_modules/unix_cred/Makefile index 3c3962f06a..68a82db3d2 100644 --- a/usr/src/lib/pam_modules/unix_cred/Makefile +++ b/usr/src/lib/pam_modules/unix_cred/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -31,18 +29,17 @@ TEXT_DOMAIN= SUNW_OST_SYSOSPAM POFILE= unix_cred.po MSGFILES= unix_cred.c -SUBDIRS= $(MACH) -$(BUILD64)SUBDIRS += $(MACH64) +SUBDIRS= $(MACH) +$(BUILD64)SUBDIRS += $(MACH64) all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) _msg: $(MSGDOMAINPOFILE) diff --git a/usr/src/lib/pam_modules/unix_cred/Makefile.com b/usr/src/lib/pam_modules/unix_cred/Makefile.com index 80e273840f..84b0e97f0e 100644 --- a/usr/src/lib/pam_modules/unix_cred/Makefile.com +++ b/usr/src/lib/pam_modules/unix_cred/Makefile.com @@ -35,6 +35,5 @@ CERRWARN += $(CNOWARN_UNINIT) all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/pam_modules/unix_session/Makefile b/usr/src/lib/pam_modules/unix_session/Makefile index 8cd0cb4374..170fb4b11f 100644 --- a/usr/src/lib/pam_modules/unix_session/Makefile +++ b/usr/src/lib/pam_modules/unix_session/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -31,18 +29,17 @@ TEXT_DOMAIN= SUNW_OST_SYSOSPAM POFILE= unix_session.po MSGFILES= unix_session.c -SUBDIRS= $(MACH) -$(BUILD64)SUBDIRS += $(MACH64) +SUBDIRS= $(MACH) +$(BUILD64)SUBDIRS += $(MACH64) all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) _msg: $(MSGDOMAINPOFILE) diff --git a/usr/src/lib/pam_modules/unix_session/Makefile.com b/usr/src/lib/pam_modules/unix_session/Makefile.com index 26216e2961..cad6f42a56 100644 --- a/usr/src/lib/pam_modules/unix_session/Makefile.com +++ b/usr/src/lib/pam_modules/unix_session/Makefile.com @@ -23,10 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# usr/src/lib/pam_modules/unix_session/Makefile.com -# LIBRARY= pam_unix_session.a VERS= .1 @@ -40,6 +36,5 @@ CPPFLAGS += -D_FILE_OFFSET_BITS=64 all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/passwdutil/Makefile b/usr/src/lib/passwdutil/Makefile index e09cd44703..223fcd6567 100644 --- a/usr/src/lib/passwdutil/Makefile +++ b/usr/src/lib/passwdutil/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -36,12 +34,11 @@ $(BUILD64)SUBDIRS += $(MACH64) all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber -install := TARGET= install -lint := TARGET= lint - +install := TARGET= install + .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/passwdutil/Makefile.com b/usr/src/lib/passwdutil/Makefile.com index 84d02df746..ea41874acb 100644 --- a/usr/src/lib/passwdutil/Makefile.com +++ b/usr/src/lib/passwdutil/Makefile.com @@ -49,8 +49,7 @@ include ../../Makefile.lib # LIBNAME= passwdutil -LIBS= $(DYNLIB) $(LINTLIB) -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) +LIBS= $(DYNLIB) LDLIBS += -lsldap -lnsl -lc CPPFLAGS += -DENABLE_SUNOS_AGING -D_REENTRANT \ @@ -64,12 +63,9 @@ CERRWARN += -_gcc=-Wno-unused-label # not linted SMATCH=off -lint := SRCS= $(OBJ:%.o=$(SRCDIR)/%.c) - .KEEP_STATE: all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/passwdutil/i386/Makefile b/usr/src/lib/passwdutil/i386/Makefile index 79dee35ae1..67086a25e2 100644 --- a/usr/src/lib/passwdutil/i386/Makefile +++ b/usr/src/lib/passwdutil/i386/Makefile @@ -23,11 +23,7 @@ # Copyright (c) 2001 by Sun Microsystems, Inc. # All rights reserved. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/passwdutil/i386/Makefile -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINT) +install: all $(ROOTLIBS) diff --git a/usr/src/lib/passwdutil/sparc/Makefile b/usr/src/lib/passwdutil/sparc/Makefile index 4f8b74b6f8..3908353384 100644 --- a/usr/src/lib/passwdutil/sparc/Makefile +++ b/usr/src/lib/passwdutil/sparc/Makefile @@ -23,11 +23,7 @@ # Copyright (c) 2001 by Sun Microsystems, Inc. # All rights reserved. # -# ident "%Z%%M% %I% %E% SMI" -# -# usr/src/lib/passwdutil/sparc/Makefile -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINT) +install: all $(ROOTLIBS) diff --git a/usr/src/lib/pkcs11/Makefile b/usr/src/lib/pkcs11/Makefile index c552af6b57..f2db14f3d4 100644 --- a/usr/src/lib/pkcs11/Makefile +++ b/usr/src/lib/pkcs11/Makefile @@ -24,7 +24,7 @@ include ../Makefile.lib -HDRS = cryptoki.h pkcs11.h pkcs11f.h pkcs11t.h +HDRS = cryptoki.h pkcs11.h pkcs11f.h pkcs11t.h HDRDIR = include ROOTHDRDIR = $(ROOT)/usr/include/security @@ -39,15 +39,14 @@ SUBDIRS = \ pkcs11_softtoken \ pkcs11_tpm -all := TARGET= all -clean := TARGET= clean +all := TARGET= all +clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/pkcs11/libkcfd/Makefile b/usr/src/lib/pkcs11/libkcfd/Makefile index 1f4d996ae6..b801a9c0fb 100644 --- a/usr/src/lib/pkcs11/libkcfd/Makefile +++ b/usr/src/lib/pkcs11/libkcfd/Makefile @@ -39,7 +39,7 @@ install := TARGET= install all clean clobber install: $(SUBDIRS) -check lint install_h: +check install_h: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/pkcs11/libkcfd/Makefile.com b/usr/src/lib/pkcs11/libkcfd/Makefile.com index b1715278a4..4fdeed21ea 100644 --- a/usr/src/lib/pkcs11/libkcfd/Makefile.com +++ b/usr/src/lib/pkcs11/libkcfd/Makefile.com @@ -29,8 +29,6 @@ VERS = .1 include $(SRC)/lib/Makefile.rootfs -LIBS += $(LINTLIB) - # # Identify that this library is an interposer. This identification # ensures that runtime symbol lookup resolves to this library diff --git a/usr/src/lib/pkcs11/libkcfd/i386/Makefile b/usr/src/lib/pkcs11/libkcfd/i386/Makefile index 21e8ab504f..63486f492c 100644 --- a/usr/src/lib/pkcs11/libkcfd/i386/Makefile +++ b/usr/src/lib/pkcs11/libkcfd/i386/Makefile @@ -29,6 +29,6 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/pkcs11/libkcfd/sparc/Makefile b/usr/src/lib/pkcs11/libkcfd/sparc/Makefile index 05909fb581..348e26b441 100644 --- a/usr/src/lib/pkcs11/libkcfd/sparc/Makefile +++ b/usr/src/lib/pkcs11/libkcfd/sparc/Makefile @@ -29,6 +29,6 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/pkcs11/libpkcs11/Makefile b/usr/src/lib/pkcs11/libpkcs11/Makefile index cb3acc6143..de9110d68a 100644 --- a/usr/src/lib/pkcs11/libpkcs11/Makefile +++ b/usr/src/lib/pkcs11/libpkcs11/Makefile @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../../Makefile.master include ../../Makefile.lib @@ -36,11 +34,10 @@ check := TARGET= check clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/pkcs11/libpkcs11/Makefile.com b/usr/src/lib/pkcs11/libpkcs11/Makefile.com index cb9dcf89bd..bec143be52 100644 --- a/usr/src/lib/pkcs11/libpkcs11/Makefile.com +++ b/usr/src/lib/pkcs11/libpkcs11/Makefile.com @@ -29,33 +29,33 @@ VERS= .1 OBJECTS= \ - metaAttrManager.o \ - metaCrypt.o \ - metaDigest.o \ - metaDualCrypt.o \ - metaGeneral.o \ - metaKeys.o \ - metaMechManager.o \ - metaObject.o \ - metaObjectManager.o \ - metaRand.o \ - metaSession.o \ - metaSessionManager.o \ - metaSign.o \ - metaSlotManager.o \ - metaSlotToken.o \ - metaUtil.o \ - metaVerify.o \ - pkcs11General.o \ - pkcs11SlotToken.o \ - pkcs11Session.o \ - pkcs11Object.o \ - pkcs11Crypt.o \ - pkcs11Digest.o \ - pkcs11Sign.o \ - pkcs11Verify.o \ - pkcs11DualCrypt.o \ - pkcs11Keys.o \ + metaAttrManager.o \ + metaCrypt.o \ + metaDigest.o \ + metaDualCrypt.o \ + metaGeneral.o \ + metaKeys.o \ + metaMechManager.o \ + metaObject.o \ + metaObjectManager.o \ + metaRand.o \ + metaSession.o \ + metaSessionManager.o \ + metaSign.o \ + metaSlotManager.o \ + metaSlotToken.o \ + metaUtil.o \ + metaVerify.o \ + pkcs11General.o \ + pkcs11SlotToken.o \ + pkcs11Session.o \ + pkcs11Object.o \ + pkcs11Crypt.o \ + pkcs11Digest.o \ + pkcs11Sign.o \ + pkcs11Verify.o \ + pkcs11DualCrypt.o \ + pkcs11Keys.o \ pkcs11Rand.o \ pkcs11Slottable.o \ pkcs11Conf.o \ @@ -67,14 +67,12 @@ include ../../../Makefile.lib SRCDIR= ../common INCDIR= ../../include -LIBS = $(DYNLIB) $(LINTLIB) -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) +LIBS = $(DYNLIB) LDLIBS += -lcryptoutil -lc CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(INCDIR) -I$(SRCDIR) -D_REENTRANT -LINTFLAGS64 += -errchk=longptr64 CERRWARN += -_gcc=-Wno-unused-label CERRWARN += $(CNOWARN_UNINIT) @@ -86,6 +84,5 @@ SMATCH=off all: $(LIBS) -lint: lintcheck include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/pkcs11/libpkcs11/i386/Makefile b/usr/src/lib/pkcs11/libpkcs11/i386/Makefile index dfafa04d2f..e129d9ceb8 100644 --- a/usr/src/lib/pkcs11/libpkcs11/i386/Makefile +++ b/usr/src/lib/pkcs11/libpkcs11/i386/Makefile @@ -23,10 +23,7 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libpkcs11/i386/Makefile include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/pkcs11/libpkcs11/sparc/Makefile b/usr/src/lib/pkcs11/libpkcs11/sparc/Makefile index 9fb963b570..e129d9ceb8 100644 --- a/usr/src/lib/pkcs11/libpkcs11/sparc/Makefile +++ b/usr/src/lib/pkcs11/libpkcs11/sparc/Makefile @@ -23,10 +23,7 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libpkcs11/sparc/Makefile include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/pkcs11/libsoftcrypto/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/Makefile index 96d8d8144d..57ac14a115 100644 --- a/usr/src/lib/pkcs11/libsoftcrypto/Makefile +++ b/usr/src/lib/pkcs11/libsoftcrypto/Makefile @@ -32,13 +32,12 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: .PARALLEL: $(SUBDIRS) -all clean clobber install lint: \ +all clean clobber install: \ $(CAPDIR) .WAIT $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/pkcs11/libsoftcrypto/Makefile.com b/usr/src/lib/pkcs11/libsoftcrypto/Makefile.com index 3c01b7ad0c..baca0d4bde 100644 --- a/usr/src/lib/pkcs11/libsoftcrypto/Makefile.com +++ b/usr/src/lib/pkcs11/libsoftcrypto/Makefile.com @@ -116,8 +116,3 @@ PAD_SRC = $(PAD_COMMON_SRC) $(PAD_PSM_SRC) # Header include directories CRYPTODIR = $(SRC)/common/crypto UTSDIR = $(SRC)/uts/common/ - -# Lint -EXTRA_LINT_FLAGS = $(AES_FLAGS) $(BLOWFISH_FLAGS) $(ARCFOUR_FLAGS) \ - $(DES_FLAGS) $(BIGNUM_FLAGS) $(MODES_FLAGS) \ - $(DH_FLAGS) $(DSA_FLAGS) $(RSA_FLAGS) $(PAD_FLAGS) diff --git a/usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile index 848a6b55b2..46ae07f9ef 100644 --- a/usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile +++ b/usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile @@ -61,7 +61,7 @@ SRCS = $(AES_SRC) $(ARCFOUR_SRC) $(BIGNUM_SRC) $(BLOWFISH_SRC) \ SRCDIR = $(SRC)/lib/pkcs11/libsoftcrypto/common -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) MAPFILEDIR = ../common CFLAGS += -xO4 -xcrossfile @@ -70,15 +70,12 @@ ASFLAGS += $(AS_PICFLAGS) -P -D__STDC__ -D_ASM BIGNUM_FLAGS += -DPSR_MUL CLEANFILES += arcfour-x86_64.s LDLIBS += -lcryptoutil -lc -LINTFLAGS64 += $(EXTRA_LINT_FLAGS) .KEEP_STATE: all: $(LIBS) -lint: $(SRCS) - -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) pics/%.o: $(AES_DIR)/$(MACH64)/%.c $(COMPILE.c) $(AES_FLAGS) -o $@ $< diff --git a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/Makefile index bfd264345e..3b03cec003 100644 --- a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/Makefile +++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/Makefile @@ -41,7 +41,6 @@ install := TARGET= install all clean clobber install: \ $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/intel/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/intel/Makefile index aa11eb6fde..1191e6f7d4 100644 --- a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/intel/Makefile +++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/intel/Makefile @@ -39,7 +39,6 @@ install := TARGET= install all clean clobber install: \ $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile index 77aed04fa7..dddbce3b10 100644 --- a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile +++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile @@ -39,7 +39,6 @@ install := TARGET= install all clean clobber install: \ $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/Makefile index 77aed04fa7..dddbce3b10 100644 --- a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/Makefile +++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/Makefile @@ -39,7 +39,6 @@ install := TARGET= install all clean clobber install: \ $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/pkcs11/libsoftcrypto/i386/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/i386/Makefile index 11c2507cee..60b934a8d7 100644 --- a/usr/src/lib/pkcs11/libsoftcrypto/i386/Makefile +++ b/usr/src/lib/pkcs11/libsoftcrypto/i386/Makefile @@ -45,13 +45,12 @@ SRCS = $(AES_SRC) $(ARCFOUR_SRC) $(BIGNUM_SRC) $(BLOWFISH_SRC) \ SRCDIR = $(SRC)/lib/pkcs11/libsoftcrypto/common -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) MAPFILEDIR = ../common CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(CRYPTODIR) -I$(UTSDIR) -D_POSIX_PTHREAD_SEMANTICS LDLIBS += -lcryptoutil -lc -LINTFLAGS += $(EXTRA_LINT_FLAGS) # Symbol capabilities objects are i386. EXTPICS = ../capabilities/intel/i386/pics/symcap.o @@ -60,8 +59,6 @@ EXTPICS = ../capabilities/intel/i386/pics/symcap.o all: $(LIBS) -lint: $(SRCS) - -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) include ../Makefile.targ diff --git a/usr/src/lib/pkcs11/libsoftcrypto/sparc/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/sparc/Makefile index 398c8265dc..79a352895b 100644 --- a/usr/src/lib/pkcs11/libsoftcrypto/sparc/Makefile +++ b/usr/src/lib/pkcs11/libsoftcrypto/sparc/Makefile @@ -37,7 +37,7 @@ SRCS = $(AES_SRC) $(ARCFOUR_SRC) $(BIGNUM_SRC) $(BLOWFISH_SRC) \ SRCDIR = $(SRC)/lib/pkcs11/libsoftcrypto/common -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) MAPFILEDIR = ../common CFLAGS += $(CCVERBOSE) @@ -48,7 +48,6 @@ CERRWARN += $(CNOWARN_UNINIT) CPPFLAGS += -I$(CRYPTODIR) -I$(UTSDIR) -D_POSIX_PTHREAD_SEMANTICS LDLIBS += -lcryptoutil -lc -LINTFLAGS += $(EXTRA_LINT_FLAGS) # Symbol capabilities objects are added for sun4u and sun4v. EXTPICS = ../capabilities/sun4u/sparc/pics/symcap.o \ @@ -58,8 +57,6 @@ EXTPICS = ../capabilities/sun4u/sparc/pics/symcap.o \ all: $(LIBS) -lint: $(SRCS) - -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) include ../Makefile.targ diff --git a/usr/src/lib/pkcs11/libsoftcrypto/sparcv9/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/sparcv9/Makefile index d90a6125f0..eb85292eab 100644 --- a/usr/src/lib/pkcs11/libsoftcrypto/sparcv9/Makefile +++ b/usr/src/lib/pkcs11/libsoftcrypto/sparcv9/Makefile @@ -38,7 +38,7 @@ SRCS = $(AES_SRC) $(ARCFOUR_SRC) $(BIGNUM_SRC) $(BLOWFISH_SRC) \ SRCDIR = $(SRC)/lib/pkcs11/libsoftcrypto/common -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) MAPFILEDIR = ../common CFLAGS += $(CCVERBOSE) @@ -49,7 +49,6 @@ CERRWARN += $(CNOWARN_UNINIT) CPPFLAGS += -I$(CRYPTODIR) -I$(UTSDIR) -D_POSIX_PTHREAD_SEMANTICS LDLIBS += -lcryptoutil -lc -LINTFLAGS64 += $(EXTRA_LINT_FLAGS) # Symbol capabilities objects are added for sun4u and sun4v. EXTPICS = ../capabilities/sun4u/sparcv9/pics/symcap.o \ @@ -59,8 +58,6 @@ EXTPICS = ../capabilities/sun4u/sparcv9/pics/symcap.o \ all: $(LIBS) -lint: $(SRCS) - -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) include ../Makefile.targ diff --git a/usr/src/lib/pkcs11/pkcs11_kernel/Makefile b/usr/src/lib/pkcs11/pkcs11_kernel/Makefile index ead030d990..91baa42c2b 100644 --- a/usr/src/lib/pkcs11/pkcs11_kernel/Makefile +++ b/usr/src/lib/pkcs11/pkcs11_kernel/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/Makefile.lib @@ -35,11 +33,10 @@ check := TARGET= check clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com b/usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com index 9cf7027144..5c55be29d5 100644 --- a/usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com +++ b/usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com @@ -28,15 +28,15 @@ LIBRARY= pkcs11_kernel.a VERS= .1 CORE_OBJECTS= \ - kernelGeneral.o \ - kernelSlottable.o \ - kernelSlotToken.o \ - kernelObject.o \ - kernelDigest.o \ - kernelSign.o \ - kernelVerify.o \ - kernelDualCrypt.o \ - kernelKeys.o \ + kernelGeneral.o \ + kernelSlottable.o \ + kernelSlotToken.o \ + kernelObject.o \ + kernelDigest.o \ + kernelSign.o \ + kernelVerify.o \ + kernelDualCrypt.o \ + kernelKeys.o \ kernelRand.o \ kernelSession.o \ kernelSessionUtil.o \ @@ -99,15 +99,6 @@ ROOTLIBDIR64= $(ROOT)/usr/lib/security/$(MACH64) all: $(LIBS) -# we don't need to lint ST_OBJECTS since they are linted elsewhere. -lintcheck := SRCS = $(CORESRCS) -lintother := OSRCS = ../common/kernelSoftCommon.c -lintother := CPPFLAGS = -I$(ST_DIR) $(CPPFLAGS.master) - -lintother: $$(OSRCS) - $(LINT.c) $(LINTCHECKFLAGS) $(OSRCS) $(LDLIBS) - -lint: lintcheck lintother pics/%.o: $(ST_DIR)/%.c $(COMPILE.c) -o $@ $< -I$(ST_DIR) diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile b/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile index cdeea1697a..bd158b1cf2 100644 --- a/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile +++ b/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/Makefile.lib @@ -35,11 +33,10 @@ check := TARGET= check clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all check clean clobber install lint: $(SUBDIRS) +all check clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.com b/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.com index a837802e81..a3d76fd04e 100644 --- a/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.com +++ b/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.com @@ -124,7 +124,6 @@ LIBS = $(DYNLIB) LDLIBS += -lc -lmd -lcryptoutil -lsoftcrypto -lgen CSTD = $(CSTD_GNU99) -C99LMODE = -Xc99=%all CFLAGS += $(CCVERBOSE) @@ -145,21 +144,14 @@ CPPFLAGS += -I$(AESDIR) -I$(BLOWFISHDIR) -I$(ARCFOURDIR) -I$(DESDIR) \ -I$(BIGNUMDIR) -I$(PADDIR) -D_POSIX_PTHREAD_SEMANTICS \ -DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B -LINTFLAGS64 += -errchk=longptr64 ROOTLIBDIR= $(ROOT)/usr/lib/security ROOTLIBDIR64= $(ROOT)/usr/lib/security/$(MACH64) -LINTSRC = \ - $(LCL_OBJECTS:%.o=$(SRCDIR)/%.c) \ - $(RNG_COBJECTS:%.o=$(RNGDIR)/%.c) - .KEEP_STATE: all: $(LIBS) -lint: $$(LINTSRC) - $(LINT.c) $(LINTCHECKFLAGS) $(LINTSRC) $(LDLIBS) pics/%.o: $(BERDIR)/%.c $(COMPILE.c) -o $@ $< -D_SOLARIS_SDK -I$(BERDIR) \ diff --git a/usr/src/lib/pkcs11/pkcs11_tpm/Makefile b/usr/src/lib/pkcs11/pkcs11_tpm/Makefile index 156414a3ef..8c085a8538 100644 --- a/usr/src/lib/pkcs11/pkcs11_tpm/Makefile +++ b/usr/src/lib/pkcs11/pkcs11_tpm/Makefile @@ -31,11 +31,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com b/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com index 244d460f5e..3dd128871f 100644 --- a/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com +++ b/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com @@ -100,19 +100,10 @@ CERRWARN += $(CNOWARN_UNINIT) # not linted SMATCH=off -LINTSRC= $(OBJECTS:%.o=$(SRCDIR)/%.c) - -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) -LINTSRC= $(SRCS) - -CLOBBERFILES += C.ln - .KEEP_STATE: all: $(LIBS) -lint: $$(LINTSRC) - $(LINT.c) $(LINTCHECKFLAGS) $(LINTSRC) $(LDLIBS) pics/%.o: $(SRCDIR)/%.c $(COMPILE.c) -o $@ $< diff --git a/usr/src/lib/policykit/libpolkit/i386/Makefile b/usr/src/lib/policykit/libpolkit/i386/Makefile index 8643a8305f..98589d6d31 100644 --- a/usr/src/lib/policykit/libpolkit/i386/Makefile +++ b/usr/src/lib/policykit/libpolkit/i386/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTLIBPC) $(ROOTMAJLINK) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLIBPC) $(ROOTMAJLINK) diff --git a/usr/src/lib/policykit/libpolkit/sparc/Makefile b/usr/src/lib/policykit/libpolkit/sparc/Makefile index 8643a8305f..98589d6d31 100644 --- a/usr/src/lib/policykit/libpolkit/sparc/Makefile +++ b/usr/src/lib/policykit/libpolkit/sparc/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTLIBPC) $(ROOTMAJLINK) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLIBPC) $(ROOTMAJLINK) diff --git a/usr/src/lib/print/Makefile b/usr/src/lib/print/Makefile index 4572cdc14e..cb73284cdf 100644 --- a/usr/src/lib/print/Makefile +++ b/usr/src/lib/print/Makefile @@ -40,7 +40,6 @@ clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install install_h := TARGET = install_h -lint := TARGET = lint TEXT_DOMAIN= SUNW_OST_OSLIB POFILE= print-lib.po @@ -67,7 +66,7 @@ _msg: $(MSGDOMAIN) install: $(ROOTDIRS) $(ROOTSYMLINKDIRS) $(SUBDIRS) -install_h clean strip lint: $(SUBDIRS) +install_h clean strip: $(SUBDIRS) clobber: $(SUBDIRS) local_clobber diff --git a/usr/src/lib/print/libhttp-core/Makefile b/usr/src/lib/print/libhttp-core/Makefile index b92d620b10..88d4640509 100644 --- a/usr/src/lib/print/libhttp-core/Makefile +++ b/usr/src/lib/print/libhttp-core/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -36,14 +34,11 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: all clean clobber install: .WAIT $(SUBDIRS) -lint: # $(SUBDIRS) - install_h: # $(ROOTHDRS) check: # $(CHECKHDRS) diff --git a/usr/src/lib/print/libhttp-core/Makefile.com b/usr/src/lib/print/libhttp-core/Makefile.com index f8412cd381..2a0e82e1b9 100644 --- a/usr/src/lib/print/libhttp-core/Makefile.com +++ b/usr/src/lib/print/libhttp-core/Makefile.com @@ -31,7 +31,6 @@ OBJECTS = http-addr.o http-support.o http.o ROOTLIBDIR = $(ROOT)/usr/lib/print include ../../../Makefile.lib -include ../../../Makefile.rootfs SRCDIR = ../common @@ -40,7 +39,6 @@ ROOTLIBDIR64= $(ROOT)/usr/lib/print/$(MACH) LIBS = $(DYNLIB) -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(SRCDIR) @@ -57,7 +55,6 @@ LDLIBS += -lsocket -lnsl -lc all: $(LIBS) -lint: lintcheck $(ROOTLIBDIR): $(INS.dir) diff --git a/usr/src/lib/print/libipp-core/Makefile b/usr/src/lib/print/libipp-core/Makefile index b92d620b10..88d4640509 100644 --- a/usr/src/lib/print/libipp-core/Makefile +++ b/usr/src/lib/print/libipp-core/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -36,14 +34,11 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: all clean clobber install: .WAIT $(SUBDIRS) -lint: # $(SUBDIRS) - install_h: # $(ROOTHDRS) check: # $(CHECKHDRS) diff --git a/usr/src/lib/print/libipp-core/Makefile.com b/usr/src/lib/print/libipp-core/Makefile.com index 20c9a1e5ac..d6134f1481 100644 --- a/usr/src/lib/print/libipp-core/Makefile.com +++ b/usr/src/lib/print/libipp-core/Makefile.com @@ -29,15 +29,11 @@ VERS = .0 OBJECTS = ipp.o ipp_types.o read.o strings.o write.o include ../../../Makefile.lib -include ../../../Makefile.rootfs SRCDIR = ../common -ROOTLIBDIR= $(ROOT)/usr/lib - LIBS = $(DYNLIB) -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(SRCDIR) @@ -57,6 +53,5 @@ LDLIBS += -lpapi-common -lc all: $(LIBS) -lint: lintcheck include ../../../Makefile.targ diff --git a/usr/src/lib/print/libipp-core/i386/Makefile b/usr/src/lib/print/libipp-core/i386/Makefile index 3b985583a4..b26eabf93d 100644 --- a/usr/src/lib/print/libipp-core/i386/Makefile +++ b/usr/src/lib/print/libipp-core/i386/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) # $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/print/libipp-core/sparc/Makefile b/usr/src/lib/print/libipp-core/sparc/Makefile index 3b985583a4..b26eabf93d 100644 --- a/usr/src/lib/print/libipp-core/sparc/Makefile +++ b/usr/src/lib/print/libipp-core/sparc/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) # $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/print/libipp-listener/Makefile b/usr/src/lib/print/libipp-listener/Makefile index b92d620b10..88d4640509 100644 --- a/usr/src/lib/print/libipp-listener/Makefile +++ b/usr/src/lib/print/libipp-listener/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -36,14 +34,11 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: all clean clobber install: .WAIT $(SUBDIRS) -lint: # $(SUBDIRS) - install_h: # $(ROOTHDRS) check: # $(CHECKHDRS) diff --git a/usr/src/lib/print/libipp-listener/Makefile.com b/usr/src/lib/print/libipp-listener/Makefile.com index 158935f9f1..aed0d8e745 100644 --- a/usr/src/lib/print/libipp-listener/Makefile.com +++ b/usr/src/lib/print/libipp-listener/Makefile.com @@ -36,15 +36,11 @@ OBJECTS = \ set-printer-attributes.o validate-job.o include ../../../Makefile.lib -include ../../../Makefile.rootfs SRCDIR = ../common -ROOTLIBDIR= $(ROOT)/usr/lib - LIBS = $(DYNLIB) -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CPPFLAGS += -DSOLARIS_PRIVATE_POST_0_9 @@ -66,6 +62,5 @@ LDLIBS += -lipp-core -lpapi -lc -lsocket -lnsl all: $(LIBS) -lint: lintcheck include ../../../Makefile.targ diff --git a/usr/src/lib/print/libipp-listener/i386/Makefile b/usr/src/lib/print/libipp-listener/i386/Makefile index 3b985583a4..b26eabf93d 100644 --- a/usr/src/lib/print/libipp-listener/i386/Makefile +++ b/usr/src/lib/print/libipp-listener/i386/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) # $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/print/libipp-listener/sparc/Makefile b/usr/src/lib/print/libipp-listener/sparc/Makefile index 3b985583a4..b26eabf93d 100644 --- a/usr/src/lib/print/libipp-listener/sparc/Makefile +++ b/usr/src/lib/print/libipp-listener/sparc/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) # $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/print/libpapi-common/Makefile b/usr/src/lib/print/libpapi-common/Makefile index ef7e964b85..bcbf97492d 100644 --- a/usr/src/lib/print/libpapi-common/Makefile +++ b/usr/src/lib/print/libpapi-common/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -36,15 +34,12 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: all clean clobber: .WAIT $(SUBDIRS) install: .WAIT $(SUBDIRS) install_h -lint: # $(SUBDIRS) - install_h: $(ROOTHDRS) check: $(CHECKHDRS) diff --git a/usr/src/lib/print/libpapi-common/Makefile.com b/usr/src/lib/print/libpapi-common/Makefile.com index 2f09a330ac..0a1f4f213a 100644 --- a/usr/src/lib/print/libpapi-common/Makefile.com +++ b/usr/src/lib/print/libpapi-common/Makefile.com @@ -29,15 +29,11 @@ VERS = .0 OBJECTS = attribute.o common.o library.o list.o misc.o status.o uri.o include ../../../Makefile.lib -include ../../../Makefile.rootfs - -ROOTLIBDIR= $(ROOT)/usr/lib SRCDIR = ../common LIBS = $(DYNLIB) -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(SRCDIR) @@ -55,6 +51,5 @@ LDLIBS += -lc -lsocket -lnsl all: $(LIBS) -lint: lintcheck include ../../../Makefile.targ diff --git a/usr/src/lib/print/libpapi-common/i386/Makefile b/usr/src/lib/print/libpapi-common/i386/Makefile index 3b985583a4..b26eabf93d 100644 --- a/usr/src/lib/print/libpapi-common/i386/Makefile +++ b/usr/src/lib/print/libpapi-common/i386/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) # $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/print/libpapi-common/sparc/Makefile b/usr/src/lib/print/libpapi-common/sparc/Makefile index 3b985583a4..b26eabf93d 100644 --- a/usr/src/lib/print/libpapi-common/sparc/Makefile +++ b/usr/src/lib/print/libpapi-common/sparc/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) # $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/print/libpapi-dynamic/Makefile b/usr/src/lib/print/libpapi-dynamic/Makefile index b92d620b10..88d4640509 100644 --- a/usr/src/lib/print/libpapi-dynamic/Makefile +++ b/usr/src/lib/print/libpapi-dynamic/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -36,14 +34,11 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: all clean clobber install: .WAIT $(SUBDIRS) -lint: # $(SUBDIRS) - install_h: # $(ROOTHDRS) check: # $(CHECKHDRS) diff --git a/usr/src/lib/print/libpapi-dynamic/Makefile.com b/usr/src/lib/print/libpapi-dynamic/Makefile.com index daab165a1d..de7378e876 100644 --- a/usr/src/lib/print/libpapi-dynamic/Makefile.com +++ b/usr/src/lib/print/libpapi-dynamic/Makefile.com @@ -29,15 +29,11 @@ VERS = .0 OBJECTS = job.o nss.o printer.o psm.o service.o include ../../../Makefile.lib -include ../../../Makefile.rootfs SRCDIR = ../common -ROOTLIBDIR= $(ROOT)/usr/lib - LIBS = $(DYNLIB) -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) MAPFILES = $(SRCDIR)/mapfile @@ -55,6 +51,5 @@ SMOFF += all_func_returns all: $(LIBS) -lint: lintcheck include ../../../Makefile.targ diff --git a/usr/src/lib/print/libpapi-dynamic/i386/Makefile b/usr/src/lib/print/libpapi-dynamic/i386/Makefile index 3b985583a4..b26eabf93d 100644 --- a/usr/src/lib/print/libpapi-dynamic/i386/Makefile +++ b/usr/src/lib/print/libpapi-dynamic/i386/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) # $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/print/libpapi-dynamic/sparc/Makefile b/usr/src/lib/print/libpapi-dynamic/sparc/Makefile index 3b985583a4..b26eabf93d 100644 --- a/usr/src/lib/print/libpapi-dynamic/sparc/Makefile +++ b/usr/src/lib/print/libpapi-dynamic/sparc/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) # $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/print/libpapi-ipp/Makefile b/usr/src/lib/print/libpapi-ipp/Makefile index b92d620b10..88d4640509 100644 --- a/usr/src/lib/print/libpapi-ipp/Makefile +++ b/usr/src/lib/print/libpapi-ipp/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -36,14 +34,11 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: all clean clobber install: .WAIT $(SUBDIRS) -lint: # $(SUBDIRS) - install_h: # $(ROOTHDRS) check: # $(CHECKHDRS) diff --git a/usr/src/lib/print/libpapi-ipp/Makefile.com b/usr/src/lib/print/libpapi-ipp/Makefile.com index 90cf130adb..ef6b9110a3 100644 --- a/usr/src/lib/print/libpapi-ipp/Makefile.com +++ b/usr/src/lib/print/libpapi-ipp/Makefile.com @@ -27,10 +27,8 @@ LIBRARY = psm-ipp.a VERS = .1 OBJECTS = ipp-support.o job.o printer.o service.o -ROOTLIBDIR = $(ROOT)/usr/lib/print include ../../../Makefile.lib -include ../../../Makefile.rootfs SRCDIR = ../common @@ -43,7 +41,6 @@ $(EXTRALINKS): $(ROOTLINKS) LIBS = $(DYNLIB) -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(SRCDIR) @@ -67,7 +64,6 @@ LDLIBS += -lipp-core -lc all: $(LIBS) -lint: lintcheck $(ROOTLIBDIR): $(INS.dir) diff --git a/usr/src/lib/print/libpapi-lpd/Makefile b/usr/src/lib/print/libpapi-lpd/Makefile index b92d620b10..842cc00550 100644 --- a/usr/src/lib/print/libpapi-lpd/Makefile +++ b/usr/src/lib/print/libpapi-lpd/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -36,7 +34,6 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: diff --git a/usr/src/lib/print/libpapi-lpd/Makefile.com b/usr/src/lib/print/libpapi-lpd/Makefile.com index 1e24f80ac5..3de91a340b 100644 --- a/usr/src/lib/print/libpapi-lpd/Makefile.com +++ b/usr/src/lib/print/libpapi-lpd/Makefile.com @@ -31,7 +31,6 @@ OBJECTS = job.o library.o lpd-cancel.o lpd-job.o lpd-query.o printer.o \ service.o $(COMMON_OBJS) include ../../../Makefile.lib -include ../../../Makefile.rootfs SRCDIR = ../common @@ -44,7 +43,6 @@ $(EXTRALINKS): $(ROOTLINKS) LIBS = $(DYNLIB) -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(SRCDIR) @@ -65,7 +63,6 @@ CLOBBERFILES += $(PROG) all: $(LIBS) $(PROG) -lint: lintcheck include ../../../Makefile.targ diff --git a/usr/src/lib/print/libprint/Makefile b/usr/src/lib/print/libprint/Makefile index 55847e0be0..d65934b7d4 100644 --- a/usr/src/lib/print/libprint/Makefile +++ b/usr/src/lib/print/libprint/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -34,7 +32,6 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: diff --git a/usr/src/lib/print/libprint/Makefile.com b/usr/src/lib/print/libprint/Makefile.com index 47492ab7c8..6a79beed68 100644 --- a/usr/src/lib/print/libprint/Makefile.com +++ b/usr/src/lib/print/libprint/Makefile.com @@ -31,15 +31,11 @@ OBJECTS = \ ns_cmn_printer.o nss_convert.o nss_ldap.o nss_printer.o nss_write.o include ../../../Makefile.lib -include ../../../Makefile.rootfs SRCDIR = ../common -ROOTLIBDIR= $(ROOT)/usr/lib - LIBS = $(DYNLIB) -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(SRCDIR) @@ -55,6 +51,5 @@ LDLIBS += -lnsl -lsocket -lc -lldap all: $(LIBS) -lint: lintcheck include ../../../Makefile.targ diff --git a/usr/src/lib/print/libprint/i386/Makefile b/usr/src/lib/print/libprint/i386/Makefile index 3b985583a4..b26eabf93d 100644 --- a/usr/src/lib/print/libprint/i386/Makefile +++ b/usr/src/lib/print/libprint/i386/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) # $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/print/libprint/sparc/Makefile b/usr/src/lib/print/libprint/sparc/Makefile index 3b985583a4..b26eabf93d 100644 --- a/usr/src/lib/print/libprint/sparc/Makefile +++ b/usr/src/lib/print/libprint/sparc/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) # $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/pylibbe/Makefile b/usr/src/lib/pylibbe/Makefile index 670615ee8c..a5626cc1b4 100644 --- a/usr/src/lib/pylibbe/Makefile +++ b/usr/src/lib/pylibbe/Makefile @@ -38,14 +38,13 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint MSGFILES = `$(FIND) . -name '*.py' -o -name '*.c'` POFILE = libbe_py.po .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) $(POFILE): pofile_MSGFILES diff --git a/usr/src/lib/pysolaris/Makefile b/usr/src/lib/pysolaris/Makefile index 2c588428c3..4788a3d3e4 100644 --- a/usr/src/lib/pysolaris/Makefile +++ b/usr/src/lib/pysolaris/Makefile @@ -35,14 +35,13 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint PYCFIND = $(FIND) . -name '*.pyc' PYCFILES = $(PYCFIND:sh) .KEEP_STATE: -all install clean lint: $(SUBDIRS) +all install clean: $(SUBDIRS) clobber: $(SUBDIRS) $(RM) $(PYCFILES) diff --git a/usr/src/lib/pysolaris/Makefile.com b/usr/src/lib/pysolaris/Makefile.com index b42b9cba9a..ac9b344e40 100644 --- a/usr/src/lib/pysolaris/Makefile.com +++ b/usr/src/lib/pysolaris/Makefile.com @@ -40,7 +40,6 @@ PYFILES= $(PYSRCS) $(PYSRCS:%.py=%.pyc) ROOTPYSOLFILES= $(PYFILES:%=$(ROOTLIBDIR)/%) CSTD= $(CSTD_GNU99) -C99LMODE= -Xc99=%all LIBS = $(DYNLIB) LDLIBS += -lc -lsec -lidmap -lpython$(PYVER)$(PYSUFFIX) diff --git a/usr/src/lib/pyzfs/Makefile b/usr/src/lib/pyzfs/Makefile index 2cf7b8a517..e3fe65c079 100644 --- a/usr/src/lib/pyzfs/Makefile +++ b/usr/src/lib/pyzfs/Makefile @@ -37,7 +37,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint MSGFIND = $(FIND) . -name '*.py' -o -name '*.c' MSGFILES = $(MSGFIND:sh) @@ -47,7 +46,7 @@ POFILE = pyzfs.po .KEEP_STATE: -all install clean lint: $(SUBDIRS) +all install clean: $(SUBDIRS) clobber: $(SUBDIRS) $(RM) $(POFILE) $(PYCFILES) diff --git a/usr/src/lib/pyzfs/Makefile.com b/usr/src/lib/pyzfs/Makefile.com index 7473b27ba9..f96d495eff 100644 --- a/usr/src/lib/pyzfs/Makefile.com +++ b/usr/src/lib/pyzfs/Makefile.com @@ -43,7 +43,6 @@ PYFILES= $(PYSRCS) $(PYSRCS:%.py=%.pyc) ROOTPYZFSFILES= $(PYFILES:%=$(ROOTLIBDIR)/%) CSTD= $(CSTD_GNU99) -C99LMODE= -Xc99=%all LIBS = $(DYNLIB) LDLIBS += -lc -lnvpair -lpython$(PYVER)$(PYSUFFIX) -lzfs diff --git a/usr/src/lib/raidcfg_plugins/Makefile b/usr/src/lib/raidcfg_plugins/Makefile index cde7f25413..cad154b7bf 100644 --- a/usr/src/lib/raidcfg_plugins/Makefile +++ b/usr/src/lib/raidcfg_plugins/Makefile @@ -29,16 +29,15 @@ include $(SRC)/Makefile.master SUBDIRS= $(COMMON_SUBDIRS) $($(MACH)_SUBDIRS) -all:= TARGET= all +all:= TARGET= all install:= TARGET= install clean:= TARGET= clean clobber:= TARGET= clobber -lint:= TARGET= lint _msg:= TARGET= _msg .KEEP_STATE: -all clean clobber lint install _msg: $(SUBDIRS) +all clean clobber install _msg: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/rpcsec_gss/Makefile b/usr/src/lib/rpcsec_gss/Makefile index da7a5e7056..560ac07c71 100644 --- a/usr/src/lib/rpcsec_gss/Makefile +++ b/usr/src/lib/rpcsec_gss/Makefile @@ -23,8 +23,6 @@ # Copyright (c) 1995,1997, by Sun Microsystems, Inc. # All rights reserved. # -#pragma ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.master SUBDIRS= $(MACH) $(BUILD64) $(MACH64) @@ -47,10 +45,9 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg -LIBRARY= rpcsec.a +LIBRARY= rpcsec.a TEXT_DOMAIN= SUNW_OST_NETRPC XGETFLAGS= -a POFILE= $(LIBRARY:.a=.po) diff --git a/usr/src/lib/rpcsec_gss/Makefile.com b/usr/src/lib/rpcsec_gss/Makefile.com index ea159a6692..77c9c6e03e 100644 --- a/usr/src/lib/rpcsec_gss/Makefile.com +++ b/usr/src/lib/rpcsec_gss/Makefile.com @@ -46,15 +46,12 @@ SMATCH=off DYNFLAGS += $(ZIGNORE) -LINTSRC= $(LINTLIB:%.ln=%) - LIBS = $(DYNLIB) LDLIBS += -lgss -lnsl -lc .KEEP_STATE: -lint: lintcheck # include library targets include ../../Makefile.targ diff --git a/usr/src/lib/sasl_plugins/Makefile b/usr/src/lib/sasl_plugins/Makefile index 2bd546fa55..df6ceb2089 100644 --- a/usr/src/lib/sasl_plugins/Makefile +++ b/usr/src/lib/sasl_plugins/Makefile @@ -35,11 +35,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h check: diff --git a/usr/src/lib/sasl_plugins/Makefile.com b/usr/src/lib/sasl_plugins/Makefile.com index af5b810455..e06ef7ca5c 100644 --- a/usr/src/lib/sasl_plugins/Makefile.com +++ b/usr/src/lib/sasl_plugins/Makefile.com @@ -46,8 +46,6 @@ MAPFILES = ../../mapfile-vers ROOTLIBDIR= $(ROOT)/usr/lib/sasl ROOTLIBDIR64= $(ROOT)/usr/lib/sasl/$(MACH64) -LINTFLAGS= $(ENC_FLAGS) -LINTFLAGS64= -m64 $(ENC_FLAGS) CFLAGS += $(CCVERBOSE) $(XSTRCONST) $(ENC_FLAGS) CFLAGS64 += $(XSTRCONST) $(ENC_FLAGS) @@ -56,7 +54,6 @@ CFLAGS64 += $(XSTRCONST) $(ENC_FLAGS) all: $(LIBS) -lint: lintcheck pics/%.o: $(SRC)/lib/libsasl/plugin/%.c $(COMPILE.c) -o $@ $< diff --git a/usr/src/lib/sasl_plugins/Makefile.subdirs b/usr/src/lib/sasl_plugins/Makefile.subdirs index 68de866d06..f5a41fa9d2 100644 --- a/usr/src/lib/sasl_plugins/Makefile.subdirs +++ b/usr/src/lib/sasl_plugins/Makefile.subdirs @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/Makefile.lib @@ -34,10 +32,9 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/scsi/Makefile.subdirs b/usr/src/lib/scsi/Makefile.subdirs index 246da18969..f47e18331b 100644 --- a/usr/src/lib/scsi/Makefile.subdirs +++ b/usr/src/lib/scsi/Makefile.subdirs @@ -23,20 +23,18 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" .KEEP_STATE: -all := TARGET += all -check := TARGET += check -clean := TARGET += clean -clobber := TARGET += clobber -install := TARGET += install -install_h := TARGET += install_h -lint := TARGET += lint -_msg := TARGET += _msg +all := TARGET = all +check := TARGET = check +clean := TARGET = clean +clobber := TARGET = clobber +install := TARGET = install +install_h := TARGET = install_h +_msg := TARGET = _msg -all check clean clobber install install_h lint: $(SUBDIRS) +all check clean clobber install install_h: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; VERSION='$(VERSION)' $(MAKE) $(TARGET) diff --git a/usr/src/lib/scsi/libscsi/Makefile b/usr/src/lib/scsi/libscsi/Makefile index c21f8e06fd..6bde94ef10 100644 --- a/usr/src/lib/scsi/libscsi/Makefile +++ b/usr/src/lib/scsi/libscsi/Makefile @@ -23,7 +23,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" include ../../Makefile.lib include ../Makefile.defs @@ -41,12 +40,11 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint install_h:= TARGET = install_h .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/scsi/libscsi/Makefile.com b/usr/src/lib/scsi/libscsi/Makefile.com index d8e18b1fb3..470da55161 100644 --- a/usr/src/lib/scsi/libscsi/Makefile.com +++ b/usr/src/lib/scsi/libscsi/Makefile.com @@ -47,21 +47,18 @@ CERRWARN += -_gcc=-Wno-type-limits LDLIBS += \ -lumem \ -lc -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) ROOTLIBDIR = $(ROOTSCSILIBDIR) ROOTLIBDIR64 = $(ROOTSCSILIBDIR)/$(MACH64) CLEANFILES += \ ../common/scsi_errno.c -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) .KEEP_STATE: all : $(LIBS) -lint : lintcheck - ../common/scsi_errno.c: ../common/mkerrno.sh ../common/libscsi.h sh ../common/mkerrno.sh < ../common/libscsi.h > $@ diff --git a/usr/src/lib/scsi/libscsi/amd64/Makefile b/usr/src/lib/scsi/libscsi/amd64/Makefile index e3fab7e838..75b07600ad 100644 --- a/usr/src/lib/scsi/libscsi/amd64/Makefile +++ b/usr/src/lib/scsi/libscsi/amd64/Makefile @@ -23,9 +23,8 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" include ../Makefile.com include ../../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/scsi/libscsi/i386/Makefile b/usr/src/lib/scsi/libscsi/i386/Makefile index b68583c86f..6c35d1fc88 100644 --- a/usr/src/lib/scsi/libscsi/i386/Makefile +++ b/usr/src/lib/scsi/libscsi/i386/Makefile @@ -23,8 +23,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/scsi/libscsi/sparc/Makefile b/usr/src/lib/scsi/libscsi/sparc/Makefile index b68583c86f..6c35d1fc88 100644 --- a/usr/src/lib/scsi/libscsi/sparc/Makefile +++ b/usr/src/lib/scsi/libscsi/sparc/Makefile @@ -23,8 +23,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/scsi/libscsi/sparcv9/Makefile b/usr/src/lib/scsi/libscsi/sparcv9/Makefile index e3fab7e838..75b07600ad 100644 --- a/usr/src/lib/scsi/libscsi/sparcv9/Makefile +++ b/usr/src/lib/scsi/libscsi/sparcv9/Makefile @@ -23,9 +23,8 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" include ../Makefile.com include ../../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/scsi/libses/Makefile b/usr/src/lib/scsi/libses/Makefile index abb400b621..cde5b044b1 100644 --- a/usr/src/lib/scsi/libses/Makefile +++ b/usr/src/lib/scsi/libses/Makefile @@ -23,7 +23,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" include ../../Makefile.lib include ../Makefile.defs @@ -41,12 +40,11 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint install_h:= TARGET = install_h .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/scsi/libses/Makefile.defs b/usr/src/lib/scsi/libses/Makefile.defs index 0c31d9af9f..6d112f65b0 100644 --- a/usr/src/lib/scsi/libses/Makefile.defs +++ b/usr/src/lib/scsi/libses/Makefile.defs @@ -51,9 +51,8 @@ LDLIBS += \ -lumem \ -lc -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) CLEANFILES += \ ../common/ses_errno.c -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) diff --git a/usr/src/lib/scsi/libses/Makefile.targ b/usr/src/lib/scsi/libses/Makefile.targ index a73a46eae4..ab51445fad 100644 --- a/usr/src/lib/scsi/libses/Makefile.targ +++ b/usr/src/lib/scsi/libses/Makefile.targ @@ -23,14 +23,10 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" - .KEEP_STATE: all : $(LIBS) -lint : lintcheck - ../common/ses_errno.c: ../common/mkerrno.sh ../common/libses.h sh ../common/mkerrno.sh < $(ROOTSCSIHDRDIR)/libses.h > $@ diff --git a/usr/src/lib/scsi/libses/amd64/Makefile b/usr/src/lib/scsi/libses/amd64/Makefile index aaa948e5ae..1caea4ea49 100644 --- a/usr/src/lib/scsi/libses/amd64/Makefile +++ b/usr/src/lib/scsi/libses/amd64/Makefile @@ -23,7 +23,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" include ../Makefile.com include ../../../Makefile.lib @@ -31,6 +30,6 @@ include ../../../Makefile.lib.64 include ../Makefile.defs include ../Makefile.defs.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) include ../Makefile.targ diff --git a/usr/src/lib/scsi/libses/i386/Makefile b/usr/src/lib/scsi/libses/i386/Makefile index b2454048f0..6cf1050b9e 100644 --- a/usr/src/lib/scsi/libses/i386/Makefile +++ b/usr/src/lib/scsi/libses/i386/Makefile @@ -23,7 +23,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" include ../Makefile.com include ../../../Makefile.lib @@ -31,6 +30,6 @@ include ../Makefile.defs DYNFLAGS += $(DYNFLAGS32) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) include ../Makefile.targ diff --git a/usr/src/lib/scsi/libses/sparc/Makefile b/usr/src/lib/scsi/libses/sparc/Makefile index b2454048f0..6cf1050b9e 100644 --- a/usr/src/lib/scsi/libses/sparc/Makefile +++ b/usr/src/lib/scsi/libses/sparc/Makefile @@ -23,7 +23,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" include ../Makefile.com include ../../../Makefile.lib @@ -31,6 +30,6 @@ include ../Makefile.defs DYNFLAGS += $(DYNFLAGS32) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) include ../Makefile.targ diff --git a/usr/src/lib/scsi/libses/sparcv9/Makefile b/usr/src/lib/scsi/libses/sparcv9/Makefile index aaa948e5ae..1caea4ea49 100644 --- a/usr/src/lib/scsi/libses/sparcv9/Makefile +++ b/usr/src/lib/scsi/libses/sparcv9/Makefile @@ -23,7 +23,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" include ../Makefile.com include ../../../Makefile.lib @@ -31,6 +30,6 @@ include ../../../Makefile.lib.64 include ../Makefile.defs include ../Makefile.defs.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) include ../Makefile.targ diff --git a/usr/src/lib/scsi/libsmp/Makefile b/usr/src/lib/scsi/libsmp/Makefile index d530e09093..7511401181 100644 --- a/usr/src/lib/scsi/libsmp/Makefile +++ b/usr/src/lib/scsi/libsmp/Makefile @@ -39,12 +39,11 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint install_h:= TARGET = install_h .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/scsi/libsmp/Makefile.com b/usr/src/lib/scsi/libsmp/Makefile.com index 748963db4e..9ef7621c70 100644 --- a/usr/src/lib/scsi/libsmp/Makefile.com +++ b/usr/src/lib/scsi/libsmp/Makefile.com @@ -50,21 +50,18 @@ SMOFF += all_func_returns LDLIBS += \ -lumem \ -lc -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) ROOTLIBDIR = $(ROOTSCSILIBDIR) ROOTLIBDIR64 = $(ROOTSCSILIBDIR)/$(MACH64) CLEANFILES += \ ../common/smp_errno.c -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) .KEEP_STATE: all : $(LIBS) -lint : lintcheck - ../common/smp_errno.c: ../common/mkerrno.sh ../common/libsmp.h sh ../common/mkerrno.sh < ../common/libsmp.h > $@ diff --git a/usr/src/lib/scsi/libsmp/amd64/Makefile b/usr/src/lib/scsi/libsmp/amd64/Makefile index e59eb2b811..7a85eb1e6c 100644 --- a/usr/src/lib/scsi/libsmp/amd64/Makefile +++ b/usr/src/lib/scsi/libsmp/amd64/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/scsi/libsmp/i386/Makefile b/usr/src/lib/scsi/libsmp/i386/Makefile index c6e75c4787..51dea8dd0e 100644 --- a/usr/src/lib/scsi/libsmp/i386/Makefile +++ b/usr/src/lib/scsi/libsmp/i386/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/scsi/libsmp/sparc/Makefile b/usr/src/lib/scsi/libsmp/sparc/Makefile index c6e75c4787..51dea8dd0e 100644 --- a/usr/src/lib/scsi/libsmp/sparc/Makefile +++ b/usr/src/lib/scsi/libsmp/sparc/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/scsi/libsmp/sparcv9/Makefile b/usr/src/lib/scsi/libsmp/sparcv9/Makefile index e59eb2b811..7a85eb1e6c 100644 --- a/usr/src/lib/scsi/libsmp/sparcv9/Makefile +++ b/usr/src/lib/scsi/libsmp/sparcv9/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine b/usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine index 12b742ef1a..0bad757481 100644 --- a/usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine +++ b/usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine @@ -51,19 +51,13 @@ DMOD_OBJS = $(DMOD_SRCS:%.c=%.o) ROOTPROG = $(ROOTPLUGINLIBDIR)/scsi/engines/$(PROG) ROOTPROG64 = $(ROOTPLUGINLIBDIR)/scsi/engines/$(MACH64)/$(PROG) -LINTFLAGS += -mu -LINTFILES = $(SRCS:%.c=%.ln) - -DMODLINTTGT = $(DMOD:%=lint_dmod) -DMODLINTFILES = $(DMOD_SRCS:%.c=%.ln) - APIMAP = ../../../../../libscsi/libscsi_api.map CSTD = $(CSTD_GNU99) CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS) -CFLAGS += -G $(XREGSFLAG) +CFLAGS += -G $(XREGSFLAG) CFLAGS64 += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS) -CFLAGS64 += -G $(XREGSFLAG) +CFLAGS64 += -G $(XREGSFLAG) CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT CPPFLAGS += -I../../../../../libscsi/common $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG diff --git a/usr/src/lib/scsi/plugins/scsi/engines/Makefile.targ b/usr/src/lib/scsi/plugins/scsi/engines/Makefile.targ index edeaa039e3..e60697fbed 100644 --- a/usr/src/lib/scsi/plugins/scsi/engines/Makefile.targ +++ b/usr/src/lib/scsi/plugins/scsi/engines/Makefile.targ @@ -29,7 +29,7 @@ all: $(PROG) $(DMODPROG) .NO_PARALLEL: -.PARALLEL: $(OBJS) $(LINTFILES) $(DMOD_OBJS) $(DMODLINTFILES) +.PARALLEL: $(OBJS) $(DMOD_OBJS) $(PROG): $(OBJS) $(APIMAP) $(LINK.c) $(OBJS) -o $@ $(LDLIBS) @@ -50,24 +50,11 @@ $(DMODPROG): $(DMOD_OBJS) $(CTFCONVERT_O) clean: - $(RM) $(OBJS) $(DMOD_OBJS) $(LINTFILES) $(DMODLINTFILES) $(CLEANFILES) + $(RM) $(OBJS) $(DMOD_OBJS) $(CLEANFILES) clobber: clean $(RM) $(PROG) $(DMODPROG) -%.ln: %.c - $(LINT.c) -c $< - -%.ln: ../%.c - $(LINT.c) -c $< - -lint_prog: $(LINTFILES) - $(LINT) $(LINTFLAGS) $(LINTFILES) $(LDLIBS) - -lint_dmod: $(DMODLINTFILES) - $(LINT) $(LINTFLAGS) $(DMODLINTFILES) $(LDLIBS) - -lint: lint_prog $(DMODLINTTGT) install_h: diff --git a/usr/src/lib/scsi/plugins/scsi/engines/uscsi/Makefile b/usr/src/lib/scsi/plugins/scsi/engines/uscsi/Makefile index ae7db6b449..bcc158c629 100644 --- a/usr/src/lib/scsi/plugins/scsi/engines/uscsi/Makefile +++ b/usr/src/lib/scsi/plugins/scsi/engines/uscsi/Makefile @@ -23,7 +23,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" include $(SRC)/Makefile.master @@ -34,12 +33,11 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint install_h:= TARGET = install_h .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) install_h check: diff --git a/usr/src/lib/scsi/plugins/ses/Makefile.lib b/usr/src/lib/scsi/plugins/ses/Makefile.lib index c8bbd52561..4d9d106f2e 100644 --- a/usr/src/lib/scsi/plugins/ses/Makefile.lib +++ b/usr/src/lib/scsi/plugins/ses/Makefile.lib @@ -61,19 +61,13 @@ ROOTPROG64 = $(ROOTPLUGINDIR64)/$(PROG) ROOTALIASES = $(ALIASES:%=$(ROOTPLUGINDIR)/%.so) ROOTALIASES64 = $(ALIASES:%=$(ROOTPLUGINDIR64)/%.so) -LINTFLAGS += -mu -LINTFILES = $(SRCS:%.c=%.ln) - -DMODLINTTGT = $(DMOD:%=lint_dmod) -DMODLINTFILES = $(DMOD_SRCS:%.c=%.ln) - APIMAP = ../../../../libses/libses_api.map CSTD = $(CSTD_GNU99) CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS) -CFLAGS += -G $(XREGSFLAG) +CFLAGS += -G $(XREGSFLAG) CFLAGS64 += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS) -CFLAGS64 += -G $(XREGSFLAG) +CFLAGS64 += -G $(XREGSFLAG) CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG LDFLAGS += $(ZTEXT) $(ZIGNORE) diff --git a/usr/src/lib/scsi/plugins/ses/Makefile.plugin b/usr/src/lib/scsi/plugins/ses/Makefile.plugin index fe0f796fd2..9f86dc0b89 100644 --- a/usr/src/lib/scsi/plugins/ses/Makefile.plugin +++ b/usr/src/lib/scsi/plugins/ses/Makefile.plugin @@ -23,7 +23,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" include $(SRC)/Makefile.master @@ -39,12 +38,11 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint install_h:= TARGET = install_h .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) install_h: $(ROOTHDRDIR) $(ROOTHDRS) diff --git a/usr/src/lib/scsi/plugins/ses/Makefile.targ b/usr/src/lib/scsi/plugins/ses/Makefile.targ index 1753da2da4..a7a3ac5a84 100644 --- a/usr/src/lib/scsi/plugins/ses/Makefile.targ +++ b/usr/src/lib/scsi/plugins/ses/Makefile.targ @@ -29,7 +29,7 @@ all: $(PROG) $(DMODPROG) .NO_PARALLEL: -.PARALLEL: $(OBJS) $(LINTFILES) $(DMOD_OBJS) $(DMODLINTFILES) +.PARALLEL: $(OBJS) $(DMOD_OBJS) $(PROG): $(OBJS) $(APIMAP) $(LINK.c) $(OBJS) -o $@ $(LDLIBS) @@ -50,24 +50,11 @@ $(DMODPROG): $(DMOD_OBJS) $(CTFCONVERT_O) clean: - $(RM) $(OBJS) $(DMOD_OBJS) $(LINTFILES) $(DMODLINTFILES) $(CLEANFILES) + $(RM) $(OBJS) $(DMOD_OBJS) $(CLEANFILES) clobber: clean $(RM) $(PROG) $(DMODPROG) -%.ln: %.c - $(LINT.c) -c $< - -%.ln: $(SRCDIR)/%.c - $(LINT.c) -c $< - -lint_prog: $(LINTFILES) - $(LINT) $(LINTFLAGS) $(LINTFILES) $(LDLIBS) - -lint_dmod: $(DMODLINTFILES) - $(LINT) $(LINTFLAGS) $(DMODLINTFILES) $(LDLIBS) - -lint: lint_prog $(DMODLINTTGT) install_h: diff --git a/usr/src/lib/scsi/plugins/smp/Makefile.lib b/usr/src/lib/scsi/plugins/smp/Makefile.lib index 3ef898705c..0474284472 100644 --- a/usr/src/lib/scsi/plugins/smp/Makefile.lib +++ b/usr/src/lib/scsi/plugins/smp/Makefile.lib @@ -60,19 +60,13 @@ ROOTPROG64 = $(ROOTPLUGINDIR64)/$(PROG) ROOTALIASES = $(ALIASES:%=$(ROOTPLUGINDIR)/%.so) ROOTALIASES64 = $(ALIASES:%=$(ROOTPLUGINDIR64)/%.so) -LINTFLAGS += -mu -LINTFILES = $(SRCS:%.c=%.ln) - -DMODLINTTGT = $(DMOD:%=lint_dmod) -DMODLINTFILES = $(DMOD_SRCS:%.c=%.ln) - APIMAP = ../../../../libsmp/libsmp_api.map CSTD = $(CSTD_GNU99) CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS) -CFLAGS += -G $(XREGSFLAG) +CFLAGS += -G $(XREGSFLAG) CFLAGS64 += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS) -CFLAGS64 += -G $(XREGSFLAG) +CFLAGS64 += -G $(XREGSFLAG) CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG LDFLAGS += $(ZTEXT) $(ZCOMBRELOC) $(ZIGNORE) diff --git a/usr/src/lib/scsi/plugins/smp/Makefile.plugin b/usr/src/lib/scsi/plugins/smp/Makefile.plugin index add83a92c4..9a0ee38b71 100644 --- a/usr/src/lib/scsi/plugins/smp/Makefile.plugin +++ b/usr/src/lib/scsi/plugins/smp/Makefile.plugin @@ -37,12 +37,11 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint install_h:= TARGET = install_h .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) install_h: $(ROOTHDRDIR) $(ROOTHDRS) diff --git a/usr/src/lib/scsi/plugins/smp/Makefile.targ b/usr/src/lib/scsi/plugins/smp/Makefile.targ index 450fbd9562..4ee9ad587d 100644 --- a/usr/src/lib/scsi/plugins/smp/Makefile.targ +++ b/usr/src/lib/scsi/plugins/smp/Makefile.targ @@ -27,7 +27,7 @@ all: $(PROG) $(DMODPROG) .NO_PARALLEL: -.PARALLEL: $(OBJS) $(LINTFILES) $(DMOD_OBJS) $(DMODLINTFILES) +.PARALLEL: $(OBJS) $(DMOD_OBJS) $(PROG): $(OBJS) $(APIMAP) $(LINK.c) $(OBJS) -o $@ $(LDLIBS) @@ -48,24 +48,11 @@ $(DMODPROG): $(DMOD_OBJS) $(CTFCONVERT_O) clean: - $(RM) $(OBJS) $(DMOD_OBJS) $(LINTFILES) $(DMODLINTFILES) $(CLEANFILES) + $(RM) $(OBJS) $(DMOD_OBJS) $(CLEANFILES) clobber: clean $(RM) $(PROG) $(DMODPROG) -%.ln: %.c - $(LINT.c) -c $< - -%.ln: $(SRCDIR)/%.c - $(LINT.c) -c $< - -lint_prog: $(LINTFILES) - $(LINT) $(LINTFLAGS) $(LINTFILES) $(LDLIBS) - -lint_dmod: $(DMODLINTFILES) - $(LINT) $(LINTFLAGS) $(DMODLINTFILES) $(LDLIBS) - -lint: lint_prog $(DMODLINTTGT) install_h: diff --git a/usr/src/lib/smbclnt/Makefile.lib b/usr/src/lib/smbclnt/Makefile.lib index 67528308d3..278110047e 100644 --- a/usr/src/lib/smbclnt/Makefile.lib +++ b/usr/src/lib/smbclnt/Makefile.lib @@ -39,13 +39,12 @@ ROOTLIBDIR = $(ROOT)/usr/lib/smbfs ROOTLIBDIR64 = $(ROOT)/usr/lib/smbfs/$(MACH64) SRCDIR= ../common -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) CSTD = $(CSTD_GNU99) CPPFLAGS += -I$(SRCDIR) -I. LDLIBS32 += -L$(ROOT)/usr/lib/smbfs LDLIBS64 += -L$(ROOT)/usr/lib/smbfs/$(MACH64) -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CLEANFILES += $(OBJECTS:%_ndr.o=%_ndr.c) diff --git a/usr/src/lib/smbclnt/Makefile.smbclnt b/usr/src/lib/smbclnt/Makefile.smbclnt index 4df97c6daa..7b1d07cd17 100644 --- a/usr/src/lib/smbclnt/Makefile.smbclnt +++ b/usr/src/lib/smbclnt/Makefile.smbclnt @@ -43,11 +43,10 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber lint: $(SUBDIRS) +all clean clobber: $(SUBDIRS) install: install_h $(SUBDIRS) diff --git a/usr/src/lib/smbclnt/Makefile.subdirs b/usr/src/lib/smbclnt/Makefile.subdirs index 66720e53ee..7febe451c4 100644 --- a/usr/src/lib/smbclnt/Makefile.subdirs +++ b/usr/src/lib/smbclnt/Makefile.subdirs @@ -33,9 +33,8 @@ clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install install_h := TARGET = install_h -lint := TARGET = lint -all check clean clobber install install_h lint: $(SUBDIRS) +all check clean clobber install install_h: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; VERSION='$(VERSION)' $(MAKE) $(TARGET) diff --git a/usr/src/lib/smbclnt/libfknsmb/amd64/Makefile b/usr/src/lib/smbclnt/libfknsmb/amd64/Makefile index 441f9285b5..e912caa030 100644 --- a/usr/src/lib/smbclnt/libfknsmb/amd64/Makefile +++ b/usr/src/lib/smbclnt/libfknsmb/amd64/Makefile @@ -18,4 +18,4 @@ MACH_LDLIBS += -L$(ROOT)/usr/lib/smbfs/$(MACH64) include ../Makefile.com include ../../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/smbclnt/libfknsmb/i386/Makefile b/usr/src/lib/smbclnt/libfknsmb/i386/Makefile index 40b7e3bf5d..153a34d4ff 100644 --- a/usr/src/lib/smbclnt/libfknsmb/i386/Makefile +++ b/usr/src/lib/smbclnt/libfknsmb/i386/Makefile @@ -15,4 +15,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/smbclnt/libfknsmb/sparc/Makefile b/usr/src/lib/smbclnt/libfknsmb/sparc/Makefile index 40b7e3bf5d..153a34d4ff 100644 --- a/usr/src/lib/smbclnt/libfknsmb/sparc/Makefile +++ b/usr/src/lib/smbclnt/libfknsmb/sparc/Makefile @@ -15,4 +15,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/smbclnt/libfknsmb/sparcv9/Makefile b/usr/src/lib/smbclnt/libfknsmb/sparcv9/Makefile index de1ec045d8..f78dfa57c1 100644 --- a/usr/src/lib/smbclnt/libfknsmb/sparcv9/Makefile +++ b/usr/src/lib/smbclnt/libfknsmb/sparcv9/Makefile @@ -20,4 +20,4 @@ include ../../../Makefile.lib.64 sparcv9_C_PICFLAGS= $(sparcv9_C_BIGPICFLAGS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/smbclnt/libfksmbfs/amd64/Makefile b/usr/src/lib/smbclnt/libfksmbfs/amd64/Makefile index 8b52fdf7af..2a42666cd9 100644 --- a/usr/src/lib/smbclnt/libfksmbfs/amd64/Makefile +++ b/usr/src/lib/smbclnt/libfksmbfs/amd64/Makefile @@ -20,4 +20,4 @@ include ../../../Makefile.lib.64 DYNFLAGS += -R/usr/lib/smbfs/$(MACH64) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/smbclnt/libfksmbfs/i386/Makefile b/usr/src/lib/smbclnt/libfksmbfs/i386/Makefile index 6e1eb18522..3ed3ac2507 100644 --- a/usr/src/lib/smbclnt/libfksmbfs/i386/Makefile +++ b/usr/src/lib/smbclnt/libfksmbfs/i386/Makefile @@ -17,4 +17,4 @@ include ../Makefile.com DYNFLAGS += -R/usr/lib/smbfs -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/smbclnt/libfksmbfs/sparc/Makefile b/usr/src/lib/smbclnt/libfksmbfs/sparc/Makefile index 6e1eb18522..3ed3ac2507 100644 --- a/usr/src/lib/smbclnt/libfksmbfs/sparc/Makefile +++ b/usr/src/lib/smbclnt/libfksmbfs/sparc/Makefile @@ -17,4 +17,4 @@ include ../Makefile.com DYNFLAGS += -R/usr/lib/smbfs -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/smbclnt/libfksmbfs/sparcv9/Makefile b/usr/src/lib/smbclnt/libfksmbfs/sparcv9/Makefile index 151660294b..67f3a88f37 100644 --- a/usr/src/lib/smbclnt/libfksmbfs/sparcv9/Makefile +++ b/usr/src/lib/smbclnt/libfksmbfs/sparcv9/Makefile @@ -21,4 +21,4 @@ include ../../../Makefile.lib.64 DYNFLAGS += -R/usr/lib/smbfs/$(MACH64) sparcv9_C_PICFLAGS= $(sparcv9_C_BIGPICFLAGS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/smbsrv/Makefile.lib b/usr/src/lib/smbsrv/Makefile.lib index a6c75a4ab4..7785a71ca6 100644 --- a/usr/src/lib/smbsrv/Makefile.lib +++ b/usr/src/lib/smbsrv/Makefile.lib @@ -38,12 +38,10 @@ ROOTLIBDIR64 = $(ROOT)/usr/lib/smbsrv/$(MACH64) SRCDIR= ../common NDLDIR= $(ROOT)/usr/include/smbsrv/ndl -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) CSTD = $(CSTD_GNU99) -C99LMODE = -Xc99=%all CPPFLAGS += -I$(SRCDIR) -I. LDLIBS32 += -L$(ROOT)/usr/lib/smbsrv LDLIBS64 += -L$(ROOT)/usr/lib/smbsrv/$(MACH64) -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CLEANFILES += $(OBJECTS:%_ndr.o=%_ndr.c) diff --git a/usr/src/lib/smbsrv/Makefile.smbsrv b/usr/src/lib/smbsrv/Makefile.smbsrv index aaa7149cbe..c6237dba74 100644 --- a/usr/src/lib/smbsrv/Makefile.smbsrv +++ b/usr/src/lib/smbsrv/Makefile.smbsrv @@ -22,7 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" # # Toplevel Makefile included by each subdirectory. Responsible for the 'check' @@ -42,11 +41,10 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber lint: $(SUBDIRS) +all clean clobber: $(SUBDIRS) install: install_h $(SUBDIRS) diff --git a/usr/src/lib/smbsrv/Makefile.subdirs b/usr/src/lib/smbsrv/Makefile.subdirs index 928a4e2167..8712815ec8 100644 --- a/usr/src/lib/smbsrv/Makefile.subdirs +++ b/usr/src/lib/smbsrv/Makefile.subdirs @@ -22,7 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" .KEEP_STATE: @@ -32,9 +31,8 @@ clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install install_h := TARGET = install_h -lint := TARGET = lint -all check clean clobber install install_h lint: $(SUBDIRS) +all check clean clobber install install_h: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; VERSION='$(VERSION)' $(MAKE) $(TARGET) diff --git a/usr/src/lib/smbsrv/Makefile.targ b/usr/src/lib/smbsrv/Makefile.targ index 3128bbc408..063d0eb914 100644 --- a/usr/src/lib/smbsrv/Makefile.targ +++ b/usr/src/lib/smbsrv/Makefile.targ @@ -39,5 +39,3 @@ pics/%.o: $(SRC)/common/smbsrv/%.c .KEEP_STATE: all: $(LIBS) - -lint: lintcheck diff --git a/usr/src/lib/smbsrv/libfksmbsrv/Makefile.com b/usr/src/lib/smbsrv/libfksmbsrv/Makefile.com index 7f29003239..a1c98bb5e8 100644 --- a/usr/src/lib/smbsrv/libfksmbsrv/Makefile.com +++ b/usr/src/lib/smbsrv/libfksmbsrv/Makefile.com @@ -218,10 +218,6 @@ INCS += -I$(SRC)/uts/common INCS += -I$(SRC)/common/smbsrv INCS += -I$(SRC)/common -LINTCHECKFLAGS += -erroff=E_INCONS_ARG_DECL2 -LINTCHECKFLAGS += -erroff=E_INCONS_VAL_TYPE_DECL2 -LINTCHECKFLAGS += -erroff=E_INCONS_VAL_TYPE_USED2 - LDLIBS += $(MACH_LDLIBS) LDLIBS += -lfakekernel -lidmap -lcmdutils LDLIBS += -lavl -lnvpair -lnsl -lpkcs11 -lreparse -lc diff --git a/usr/src/lib/smbsrv/libfksmbsrv/amd64/Makefile b/usr/src/lib/smbsrv/libfksmbsrv/amd64/Makefile index ee4c505848..2e00cab3b7 100644 --- a/usr/src/lib/smbsrv/libfksmbsrv/amd64/Makefile +++ b/usr/src/lib/smbsrv/libfksmbsrv/amd64/Makefile @@ -30,4 +30,4 @@ MACH_LDLIBS += -L$(ROOT)/usr/lib/smbsrv/$(MACH64) include ../Makefile.com include ../../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/smbsrv/libfksmbsrv/i386/Makefile b/usr/src/lib/smbsrv/libfksmbsrv/i386/Makefile index 600e5596ba..ae4d51121a 100644 --- a/usr/src/lib/smbsrv/libfksmbsrv/i386/Makefile +++ b/usr/src/lib/smbsrv/libfksmbsrv/i386/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/smbsrv/libfksmbsrv/sparc/Makefile b/usr/src/lib/smbsrv/libfksmbsrv/sparc/Makefile index 600e5596ba..ae4d51121a 100644 --- a/usr/src/lib/smbsrv/libfksmbsrv/sparc/Makefile +++ b/usr/src/lib/smbsrv/libfksmbsrv/sparc/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/smbsrv/libfksmbsrv/sparcv9/Makefile b/usr/src/lib/smbsrv/libfksmbsrv/sparcv9/Makefile index 5760fd3b1e..ecf7d25f78 100644 --- a/usr/src/lib/smbsrv/libfksmbsrv/sparcv9/Makefile +++ b/usr/src/lib/smbsrv/libfksmbsrv/sparcv9/Makefile @@ -32,4 +32,4 @@ include ../../../Makefile.lib.64 sparcv9_C_PICFLAGS= $(sparcv9_C_BIGPICFLAGS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/smbsrv/libmlsvc/amd64/Makefile b/usr/src/lib/smbsrv/libmlsvc/amd64/Makefile index b3c4916b0c..9dad14a083 100644 --- a/usr/src/lib/smbsrv/libmlsvc/amd64/Makefile +++ b/usr/src/lib/smbsrv/libmlsvc/amd64/Makefile @@ -22,8 +22,6 @@ # Copyright 2007 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/libmlsvc/i386/Makefile b/usr/src/lib/smbsrv/libmlsvc/i386/Makefile index 710c9eb3dd..775f89a963 100644 --- a/usr/src/lib/smbsrv/libmlsvc/i386/Makefile +++ b/usr/src/lib/smbsrv/libmlsvc/i386/Makefile @@ -22,11 +22,9 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com DYNFLAGS += -R/usr/lib/smbsrv -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/smbsrv/libmlsvc/sparc/Makefile b/usr/src/lib/smbsrv/libmlsvc/sparc/Makefile index 5f4cf20982..76bf6372d7 100644 --- a/usr/src/lib/smbsrv/libmlsvc/sparc/Makefile +++ b/usr/src/lib/smbsrv/libmlsvc/sparc/Makefile @@ -30,4 +30,4 @@ $(__GNUC)sparc_C_PICFLAGS = $(sparc_C_BIGPICFLAGS) DYNFLAGS += -R/usr/lib/smbsrv -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/smbsrv/libmlsvc/sparcv9/Makefile b/usr/src/lib/smbsrv/libmlsvc/sparcv9/Makefile index 745535f9a9..2a84a2a249 100644 --- a/usr/src/lib/smbsrv/libmlsvc/sparcv9/Makefile +++ b/usr/src/lib/smbsrv/libmlsvc/sparcv9/Makefile @@ -35,4 +35,4 @@ sparcv9_C_PICFLAGS = $(sparcv9_C_BIGPICFLAGS) DYNFLAGS += -R/usr/lib/smbsrv/$(MACH64) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) 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) diff --git a/usr/src/lib/smbsrv/libsmbns/amd64/Makefile b/usr/src/lib/smbsrv/libsmbns/amd64/Makefile index b3c4916b0c..9dad14a083 100644 --- a/usr/src/lib/smbsrv/libsmbns/amd64/Makefile +++ b/usr/src/lib/smbsrv/libsmbns/amd64/Makefile @@ -22,8 +22,6 @@ # Copyright 2007 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/libsmbns/i386/Makefile b/usr/src/lib/smbsrv/libsmbns/i386/Makefile index 710c9eb3dd..775f89a963 100644 --- a/usr/src/lib/smbsrv/libsmbns/i386/Makefile +++ b/usr/src/lib/smbsrv/libsmbns/i386/Makefile @@ -22,11 +22,9 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com DYNFLAGS += -R/usr/lib/smbsrv -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/smbsrv/libsmbns/sparc/Makefile b/usr/src/lib/smbsrv/libsmbns/sparc/Makefile index 710c9eb3dd..775f89a963 100644 --- a/usr/src/lib/smbsrv/libsmbns/sparc/Makefile +++ b/usr/src/lib/smbsrv/libsmbns/sparc/Makefile @@ -22,11 +22,9 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com DYNFLAGS += -R/usr/lib/smbsrv -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/smbsrv/libsmbns/sparcv9/Makefile b/usr/src/lib/smbsrv/libsmbns/sparcv9/Makefile index b3c4916b0c..9dad14a083 100644 --- a/usr/src/lib/smbsrv/libsmbns/sparcv9/Makefile +++ b/usr/src/lib/smbsrv/libsmbns/sparcv9/Makefile @@ -22,8 +22,6 @@ # Copyright 2007 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/libsmbrp/amd64/Makefile b/usr/src/lib/smbsrv/libsmbrp/amd64/Makefile index 01fb0733d7..04b0d8d468 100644 --- a/usr/src/lib/smbsrv/libsmbrp/amd64/Makefile +++ b/usr/src/lib/smbsrv/libsmbrp/amd64/Makefile @@ -29,4 +29,4 @@ include ../../../Makefile.lib.64 $(ROOTLIBDIR64): $(INS.dir) -install: all $(ROOTLIBDIR64) $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBDIR64) $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/smbsrv/libsmbrp/i386/Makefile b/usr/src/lib/smbsrv/libsmbrp/i386/Makefile index 99b769bbaa..2560e90a14 100644 --- a/usr/src/lib/smbsrv/libsmbrp/i386/Makefile +++ b/usr/src/lib/smbsrv/libsmbrp/i386/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com $(ROOTLIBDIR): $(INS.dir) -install: all $(ROOTLIBDIR) $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBDIR) $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/smbsrv/libsmbrp/sparc/Makefile b/usr/src/lib/smbsrv/libsmbrp/sparc/Makefile index 99b769bbaa..2560e90a14 100644 --- a/usr/src/lib/smbsrv/libsmbrp/sparc/Makefile +++ b/usr/src/lib/smbsrv/libsmbrp/sparc/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com $(ROOTLIBDIR): $(INS.dir) -install: all $(ROOTLIBDIR) $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBDIR) $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/smbsrv/libsmbrp/sparcv9/Makefile b/usr/src/lib/smbsrv/libsmbrp/sparcv9/Makefile index 89460e9b3c..1af2f90acf 100644 --- a/usr/src/lib/smbsrv/libsmbrp/sparcv9/Makefile +++ b/usr/src/lib/smbsrv/libsmbrp/sparcv9/Makefile @@ -34,4 +34,4 @@ sparcv9_C_PICFLAGS = $(sparcv9_C_BIGPICFLAGS) $(ROOTLIBDIR64): $(INS.dir) -install: all $(ROOTLIBDIR64) $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBDIR64) $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/smhba/Makefile b/usr/src/lib/smhba/Makefile index d17215194c..6aecd0c34d 100644 --- a/usr/src/lib/smhba/Makefile +++ b/usr/src/lib/smhba/Makefile @@ -34,7 +34,6 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint # definitions for install_h target HDRS= smhbaapi.h @@ -42,7 +41,7 @@ HDRDIR= common .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) # install rule for install_h target diff --git a/usr/src/lib/smhba/Makefile.com b/usr/src/lib/smhba/Makefile.com index 296cc8949a..f22d48385e 100644 --- a/usr/src/lib/smhba/Makefile.com +++ b/usr/src/lib/smhba/Makefile.com @@ -35,7 +35,7 @@ include ../../Makefile.lib HETCFILES= $(CONFIGFILE:%=$(ROOTETC)/%) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR= ../common INCS += -I$(SRCDIR) @@ -54,7 +54,6 @@ SMOFF += indenting,all_func_returns LDLIBS += -lc -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) $(ROOTETC)/%: ../common/% $(INS.file) @@ -63,6 +62,5 @@ $(ROOTETC)/%: ../common/% all: $(LIBS) $(HETCFILES) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/smhba/amd64/Makefile b/usr/src/lib/smhba/amd64/Makefile index dfeeb9953a..a4c8bc67d3 100644 --- a/usr/src/lib/smhba/amd64/Makefile +++ b/usr/src/lib/smhba/amd64/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/smhba/i386/Makefile b/usr/src/lib/smhba/i386/Makefile index 075f16dfdc..6108b18f83 100644 --- a/usr/src/lib/smhba/i386/Makefile +++ b/usr/src/lib/smhba/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/smhba/sparc/Makefile b/usr/src/lib/smhba/sparc/Makefile index 075f16dfdc..6108b18f83 100644 --- a/usr/src/lib/smhba/sparc/Makefile +++ b/usr/src/lib/smhba/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/smhba/sparcv9/Makefile b/usr/src/lib/smhba/sparcv9/Makefile index dfeeb9953a..a4c8bc67d3 100644 --- a/usr/src/lib/smhba/sparcv9/Makefile +++ b/usr/src/lib/smhba/sparcv9/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/storage/Makefile b/usr/src/lib/storage/Makefile index ec0e5bd34c..7f9504e6ea 100644 --- a/usr/src/lib/storage/Makefile +++ b/usr/src/lib/storage/Makefile @@ -31,11 +31,10 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber check := TARGET = check -lint := TARGET = lint .KEEP_STATE: -all clean clobber lint install: $(SRCSUBDIRS) +all clean clobber install: $(SRCSUBDIRS) install_h check: $(ALLSUBDIRS) diff --git a/usr/src/lib/storage/liba5k/Makefile b/usr/src/lib/storage/liba5k/Makefile index 5f5092904e..0ed87ae65d 100644 --- a/usr/src/lib/storage/liba5k/Makefile +++ b/usr/src/lib/storage/liba5k/Makefile @@ -35,14 +35,13 @@ install_h := TARGET= install_h check := TARGET= check clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint HDRS = a5k.h a_state.h exec.h rom.h HDRDIR = common/hdrs .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) check: $(CHECKHDRS) diff --git a/usr/src/lib/storage/liba5k/Makefile.com b/usr/src/lib/storage/liba5k/Makefile.com index 91c40ddda7..f7986c860a 100644 --- a/usr/src/lib/storage/liba5k/Makefile.com +++ b/usr/src/lib/storage/liba5k/Makefile.com @@ -32,27 +32,19 @@ OBJECTS = diag.o \ include ../../../Makefile.lib include ../../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common .KEEP_STATE: -COMMON_LINTFLAGS = -erroff=E_SEC_SPRINTF_UNBOUNDED_COPY -COMMON_LINTFLAGS += -erroff=E_SEC_PRINTF_VAR_FMT - -LINTFLAGS += $(COMMON_LINTFLAGS) -LINTFLAGS64 += $(COMMON_LINTFLAGS) - CERRWARN += -_gcc=-Wno-parentheses CERRWARN += $(CNOWARN_UNINIT) LDLIBS += -lc -ldevice -lg_fc -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) all: $(LIBS) -lint: lintcheck include ../../../Makefile.targ diff --git a/usr/src/lib/storage/liba5k/sparc/Makefile b/usr/src/lib/storage/liba5k/sparc/Makefile index 4d168987d0..63d3db287c 100644 --- a/usr/src/lib/storage/liba5k/sparc/Makefile +++ b/usr/src/lib/storage/liba5k/sparc/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/storage/libg_fc/Makefile b/usr/src/lib/storage/libg_fc/Makefile index a34711fa65..1c6447ae6d 100644 --- a/usr/src/lib/storage/libg_fc/Makefile +++ b/usr/src/lib/storage/libg_fc/Makefile @@ -32,19 +32,18 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint HDRS = gfc.h g_state.h g_scsi.h HDRDIR = common/hdrs .KEEP_STATE: - + install_h: $(ROOTHDRS) check: $(CHECKHDRS) -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/storage/libg_fc/Makefile.com b/usr/src/lib/storage/libg_fc/Makefile.com index 41a7abbac5..d9cbead7d3 100644 --- a/usr/src/lib/storage/libg_fc/Makefile.com +++ b/usr/src/lib/storage/libg_fc/Makefile.com @@ -37,27 +37,19 @@ OBJECTS= cmd.o \ include ../../../Makefile.lib include ../../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common LDLIBS += -lc -ldevinfo -ldevice -lnvpair -ldevid -COMMON_LINTFLAGS = -erroff=E_SEC_SPRINTF_UNBOUNDED_COPY -COMMON_LINTFLAGS += -erroff=E_SEC_PRINTF_VAR_FMT - -LINTFLAGS += $(COMMON_LINTFLAGS) -LINTFLAGS64 += $(COMMON_LINTFLAGS) - CERRWARN += -_gcc=-Wno-parentheses CERRWARN += $(CNOWARN_UNINIT) -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) .KEEP_STATE: all: $(LIBS) -lint: lintcheck include ../../../Makefile.targ diff --git a/usr/src/lib/storage/libg_fc/sparc/Makefile b/usr/src/lib/storage/libg_fc/sparc/Makefile index 7c01618599..6d8ce8465c 100644 --- a/usr/src/lib/storage/libg_fc/sparc/Makefile +++ b/usr/src/lib/storage/libg_fc/sparc/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/storage/libg_fc/sparcv9/Makefile b/usr/src/lib/storage/libg_fc/sparcv9/Makefile index b86d3f1aa6..f20c879508 100644 --- a/usr/src/lib/storage/libg_fc/sparcv9/Makefile +++ b/usr/src/lib/storage/libg_fc/sparcv9/Makefile @@ -27,6 +27,6 @@ include ../../../Makefile.lib.64 .KEEP_STATE: -all: $(LIBS) +all: $(LIBS) install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/sun_fc/Makefile b/usr/src/lib/sun_fc/Makefile index 8b938aa9da..0999da49a4 100644 --- a/usr/src/lib/sun_fc/Makefile +++ b/usr/src/lib/sun_fc/Makefile @@ -40,7 +40,6 @@ clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install install_h := TARGET= install_h -lint := TARGET= lint HDRS= sun_fc_version.h HDRDIR= common @@ -48,7 +47,7 @@ HDRDIR= common .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/sun_fc/Makefile.com b/usr/src/lib/sun_fc/Makefile.com index 68de7967ed..8866389598 100644 --- a/usr/src/lib/sun_fc/Makefile.com +++ b/usr/src/lib/sun_fc/Makefile.com @@ -156,14 +156,9 @@ $(__SUNC)CCNEEDED = $(CCEXTNEEDED) LDLIBS += $(CCNEEDED) LDLIBS += -lc -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) .KEEP_STATE: all: $(LIBS) -lint: - @echo "This section is not required to be lint clean" - @echo "C++" - include ../../Makefile.targ diff --git a/usr/src/lib/sun_sas/Makefile b/usr/src/lib/sun_sas/Makefile index 073fe728d5..f6c47b1142 100644 --- a/usr/src/lib/sun_sas/Makefile +++ b/usr/src/lib/sun_sas/Makefile @@ -33,14 +33,13 @@ clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install install_h := TARGET= install_h -lint := TARGET= lint HDRDIR= common .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/sun_sas/Makefile.com b/usr/src/lib/sun_sas/Makefile.com index 853108091f..4207bd547a 100644 --- a/usr/src/lib/sun_sas/Makefile.com +++ b/usr/src/lib/sun_sas/Makefile.com @@ -88,12 +88,10 @@ LDLIBS += -lc LDLIBS += -lkstat LDLIBS += -ldevid -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) .KEEP_STATE: all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/udapl/Makefile b/usr/src/lib/udapl/Makefile index 142425232c..1ada445929 100644 --- a/usr/src/lib/udapl/Makefile +++ b/usr/src/lib/udapl/Makefile @@ -27,7 +27,7 @@ include ../Makefile.lib SUBDIRS = libdat udapl_tavor -HDRSUBDIRS = libdat +HDRSUBDIRS = libdat all := TARGET = all clean := TARGET = clean @@ -35,12 +35,11 @@ clobber := TARGET = clobber check := TARGET = check install := TARGET = install install_h := TARGET = install_h -lint := TARGET = lint debug := TARGET = debug .KEEP_STATE: -all debug clean clobber lint: $(SUBDIRS) +all debug clean clobber: $(SUBDIRS) install: $(ROOTDIRS) $(SUBDIRS) diff --git a/usr/src/lib/udapl/libdat/Makefile b/usr/src/lib/udapl/libdat/Makefile index 6c5caac2a0..ae285cf4a9 100644 --- a/usr/src/lib/udapl/libdat/Makefile +++ b/usr/src/lib/udapl/libdat/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -42,19 +40,18 @@ HDRS = \ HDRDIR = include/dat ROOTHDRDIR = $(ROOT)/usr/include/dat -ROOTETC = $(ROOT)/etc +ROOTETC = $(ROOT)/etc ROOTETCDAT = $(ROOTETC)/dat ETCDATFILES = dat.conf ROOTETCDATFILES = $(ETCDATFILES:%=$(ROOTETCDAT)/%) -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint debug := TARGET= debug .KEEP_STATE: @@ -63,7 +60,7 @@ all debug install: $(ROOTETCDATFILES) .WAIT $(SUBDIRS) $(ROOTETCDATFILES): $(ROOTETCDAT) -clean clobber lint: $(SUBDIRS) +clean clobber: $(SUBDIRS) install_h: $(ROOTHDRDIR) .WAIT $(ROOTHDRS) diff --git a/usr/src/lib/udapl/libdat/amd64/Makefile b/usr/src/lib/udapl/libdat/amd64/Makefile index 8f6502f508..98037e49f2 100644 --- a/usr/src/lib/udapl/libdat/amd64/Makefile +++ b/usr/src/lib/udapl/libdat/amd64/Makefile @@ -23,10 +23,8 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/udapl/libdat/i386/Makefile b/usr/src/lib/udapl/libdat/i386/Makefile index af76f5ab90..18584b4da1 100644 --- a/usr/src/lib/udapl/libdat/i386/Makefile +++ b/usr/src/lib/udapl/libdat/i386/Makefile @@ -23,9 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/udapl/libdat/sparc/Makefile b/usr/src/lib/udapl/libdat/sparc/Makefile index 87230ec4fa..e129d9ceb8 100644 --- a/usr/src/lib/udapl/libdat/sparc/Makefile +++ b/usr/src/lib/udapl/libdat/sparc/Makefile @@ -23,9 +23,7 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/udapl/libdat/sparcv9/Makefile b/usr/src/lib/udapl/libdat/sparcv9/Makefile index febc6d01a2..fd924c576d 100644 --- a/usr/src/lib/udapl/libdat/sparcv9/Makefile +++ b/usr/src/lib/udapl/libdat/sparcv9/Makefile @@ -23,10 +23,8 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/udapl/udapl_tavor/Makefile b/usr/src/lib/udapl/udapl_tavor/Makefile index 71042e1c97..f19cbc3440 100644 --- a/usr/src/lib/udapl/udapl_tavor/Makefile +++ b/usr/src/lib/udapl/udapl_tavor/Makefile @@ -26,20 +26,19 @@ include $(SRC)/lib/Makefile.lib -ROOTUSR = $(ROOT)/usr -ROOTUSRSHARE = $(ROOTUSR)/share +ROOTUSR = $(ROOT)/usr +ROOTUSRSHARE = $(ROOTUSR)/share ROOTUSRSHAREDAT = $(ROOTUSRSHARE)/dat CONFFILES = SUNWudaplt.conf ROOTCONFFILES = $(CONFFILES:%=$(ROOTUSRSHAREDAT)/%) -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint debug := TARGET= debug .KEEP_STATE: @@ -48,7 +47,7 @@ all debug install: $(ROOTCONFFILES) .WAIT $(SUBDIRS) $(ROOTCONFFILES): $(ROOTUSRSHAREDAT) -clean clobber lint: $(SUBDIRS) +clean clobber: $(SUBDIRS) install_h: diff --git a/usr/src/lib/udapl/udapl_tavor/Makefile.com b/usr/src/lib/udapl/udapl_tavor/Makefile.com index e6276a203d..424d196fa5 100644 --- a/usr/src/lib/udapl/udapl_tavor/Makefile.com +++ b/usr/src/lib/udapl/udapl_tavor/Makefile.com @@ -146,8 +146,6 @@ CPPFLAGS += -I$(SRC)/uts/common/sys/ib/clients/daplt CPPFLAGS += -I$(SRC)/uts/common CPPFLAGS += -I$(SRC)/uts/common/sys/ib/clients CFLAGS += $(CCVERBOSE) -LINTFLAGS += -DDAPL_DBG -LINTFLAGS64 += -DDAPL_DBG CERRWARN += -_gcc=-Wno-parentheses CERRWARN += $(CNOWARN_UNINIT) @@ -165,7 +163,6 @@ all: $(LIBS) debug: all -lint: lintcheck pics/%.o: $(TAVORSRCDIR)/%.c $(COMPILE.c) -o $@ $< diff --git a/usr/src/lib/watchmalloc/Makefile b/usr/src/lib/watchmalloc/Makefile index a25c865700..eb72f14730 100644 --- a/usr/src/lib/watchmalloc/Makefile +++ b/usr/src/lib/watchmalloc/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -34,11 +32,10 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/watchmalloc/Makefile.com b/usr/src/lib/watchmalloc/Makefile.com index c4cb542ac3..0982c70cb5 100644 --- a/usr/src/lib/watchmalloc/Makefile.com +++ b/usr/src/lib/watchmalloc/Makefile.com @@ -49,8 +49,6 @@ SMATCH=off all: $(LIBS) -lint: - $(LINT.c) $(SRCS) $(LDLIBS) # include library targets include ../../Makefile.targ diff --git a/usr/src/man/man1m/vmstat.1m b/usr/src/man/man1m/vmstat.1m index 5c53b020fa..4b23b651fd 100644 --- a/usr/src/man/man1m/vmstat.1m +++ b/usr/src/man/man1m/vmstat.1m @@ -3,17 +3,15 @@ .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. .\" See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] -.TH VMSTAT 1M "April 14, 2015" +.TH VMSTAT 1M "May 1, 2020" .SH NAME vmstat \- report virtual memory statistics .SH SYNOPSIS -.LP .nf \fBvmstat\fR [\fB-ipqsS\fR] [\fB-T\fR u | d] [\fIdisks\fR] [\fIinterval\fR [\fIcount\fR]] .fi .SH DESCRIPTION -.LP \fBvmstat\fR reports virtual memory statistics regarding kernel thread, virtual memory, disk, trap, and \fBCPU\fR activity. .sp @@ -46,9 +44,8 @@ output, in one of the following forms: .sp .LP -See \fI\fR for device naming conventions for disks. +See \fBdisks\fR(1M) for device naming conventions for disks. .SH OPTIONS -.LP The following options are supported: .sp .ne 2 @@ -196,7 +193,6 @@ time. See \fBtime\fR(2). Specify \fBd\fR for standard date format. See .RE .SH OPERANDS -.LP The following operands are supported: .sp .ne 2 @@ -232,7 +228,6 @@ to the \fB-i\fR and \fB-s\fR options. .RE .SH EXAMPLES -.LP \fBExample 1 \fRUsing \fBvmstat\fR .sp .LP @@ -499,7 +494,6 @@ above only report actitivity on the processors in the processor set of the .RE .SH ATTRIBUTES -.LP See \fBattributes\fR(5) for descriptions of the following attributes: .sp @@ -517,11 +511,9 @@ Interface Stability See below. .LP Invocation is evolving. Human readable output is unstable. .SH SEE ALSO -.LP -\fBdate\fR(1), \fBsar\fR(1), \fBiostat\fR(1M), \fBmpstat\fR(1M), \fBsar\fR(1M), +\fBdate\fR(1), \fBsar\fR(1), \fBdisks\fR(1M), \fBiostat\fR(1M), \fBmpstat\fR(1M), \fBsar\fR(1M), \fBtime\fR(2), \fBattributes\fR(5) .SH NOTES -.LP The sum of CPU utilization might vary slightly from 100 because of rounding errors in the production of a percentage figure. .sp diff --git a/usr/src/man/man3proc/Plwp_getregs.3proc b/usr/src/man/man3proc/Plwp_getregs.3proc index e11f4f5fa2..7b7d3b4d3d 100644 --- a/usr/src/man/man3proc/Plwp_getregs.3proc +++ b/usr/src/man/man3proc/Plwp_getregs.3proc @@ -11,7 +11,7 @@ .\" .\" Copyright 2015 Joyent, Inc. .\" -.Dd May 11, 2016 +.Dd May 02, 2020 .Dt PLWP_GETREGS 3PROC .Os .Sh NAME @@ -40,13 +40,13 @@ .Fo Plwp_getregs .Fa "struct ps_prochandle *P" .Fa "lwpid_t lwpid" -.Fa "prpregset_t *gregs" +.Fa "prgregset_t gregs" .Fc .Ft int .Fo Plwp_setregs .Fa "struct ps_prochandle *P" .Fa "lwpid_t lwpid" -.Fa "const prpregset_t gregs" +.Fa "const prgregset_t gregs" .Fc .Sh DESCRIPTION The @@ -98,8 +98,8 @@ Processes may be stopped with .Xr Pstop 3PROC . The structures used for registers are described in .Xr proc 4 -and their defintions may be found in -.In sys/regset.h . +and their definitions may be found in +.In procfs.h . The definitions of these structures varies based on the architecture of the system and the running process. .Pp diff --git a/usr/src/man/man3proc/Pstopstatus.3proc b/usr/src/man/man3proc/Pstopstatus.3proc index 15f9f417f6..07a500c8a7 100644 --- a/usr/src/man/man3proc/Pstopstatus.3proc +++ b/usr/src/man/man3proc/Pstopstatus.3proc @@ -11,7 +11,7 @@ .\" .\" Copyright 2015 Joyent, Inc. .\" -.Dd May 11, 2016 +.Dd May 02, 2020 .Dt PSTOPSTATUS 3PROC .Os .Sh NAME @@ -40,10 +40,12 @@ .Ft int .Fo Pstop .Fa "struct ps_prochandle *P" +.Fa "uint_t msec" .Fc .Ft int .Fo Pwait .Fa "struct ps_prochandle *P" +.Fa "uint_t msec" .Fc .Ft int .Fo Ldstop @@ -52,10 +54,12 @@ .Ft int .Fo Lstop .Fa "struct ps_lwphandle *L" +.Fa "uint_t msec" .Fc .Ft int .Fo Lwait .Fa "struct ps_lwphandle *L" +.Fa "uint_t msec" .Fc .Sh DESCRIPTION The @@ -133,16 +137,14 @@ The function is is equivalent to calling the .Fn Pstopstatus function with the request set to -.Dv PCSTOP -and an infinite timeout. +.Dv PCSTOP . .Pp The .Fn Pwait function is is equivalent to calling the .Fn Pstopstatus function with the request set to -.Dv PCWSTOP -and an infinite timeout. +.Dv PCWSTOP . .Pp The .Fn Pdstop diff --git a/usr/src/stand/lib/Makefile b/usr/src/stand/lib/Makefile index 1548387abb..154094db33 100644 --- a/usr/src/stand/lib/Makefile +++ b/usr/src/stand/lib/Makefile @@ -28,13 +28,10 @@ include Makefile.com i386_SUBDIRS = sparc_SUBDIRS = -SUBDIRS = fakeboot fs/hsfs fs/nfs fs/ufs inet sa sock tcpstubs xdr \ +SUBDIRS = fs/hsfs fs/nfs fs/ufs inet sa sock tcpstubs xdr \ tcp $($(MACH)_SUBDIRS) -# -# Don't lint fakeboot since it doesn't have any source files. -# -LINTSUBDIRS = $(SUBDIRS:fakeboot=) +LINTSUBDIRS = $(SUBDIRS) # # We can get away with this since we're only building .a's, and by the diff --git a/usr/src/stand/lib/Makefile.com b/usr/src/stand/lib/Makefile.com index 1a68ceb21f..3c90551d8c 100644 --- a/usr/src/stand/lib/Makefile.com +++ b/usr/src/stand/lib/Makefile.com @@ -31,11 +31,10 @@ include $(SRC)/lib/Makefile.lib include $(SRC)/stand/lib/Makefile.$(MACH) SRCDIR = . -LIBS += $(LIBRARY) $(LINTLIB) +LIBS += $(LIBRARY) CFLAGS += $(CCVERBOSE) LDFLAGS = -r -LDLIBS += -lsa -lfakeboot -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) +LDLIBS += -lsa # # Reset ROOTLIBDIR to an alternate directory so that we don't clash with @@ -72,8 +71,8 @@ CMNDIR = . # the proto area since those headers match libc's implementation, and # libc is of course not available to standalone binaries. # -CPPDEFS = -D$(KARCH) -D_BOOT -D_KERNEL -D_MACHDEP -CPPINCS = -YI,$(STANDDIR)/lib/sa -I$(STANDDIR)/lib/sa \ +CPPDEFS = -D$(KARCH) -D_BOOT -D_KERNEL -D_MACHDEP +CPPINCS = -YI,$(STANDDIR)/lib/sa -I$(STANDDIR)/lib/sa \ -I$(STANDDIR) -I$(SRCDIR) -I$(CMNDIR) \ -I$(STANDDIR)/$(MACH) -I$(SYSDIR)/common $(ARCHDIRS) \ -I$(SYSDIR)/sun4 -I$(SYSDIR)/$(KARCH) diff --git a/usr/src/stand/lib/fakeboot/Makefile b/usr/src/stand/lib/fakeboot/Makefile deleted file mode 100644 index ebe3348aa5..0000000000 --- a/usr/src/stand/lib/fakeboot/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2003 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# -# For details on this atrocity see llib-lfakeboot. -# - -LIBRARY = libfakeboot.a - -include ../Makefile.com - -LIBS = $(LINTLIB) - -include ../Makefile.targ diff --git a/usr/src/stand/sys/bootsyms.h b/usr/src/stand/sys/bootsyms.h index 9f8b6c636f..d09d58854c 100644 --- a/usr/src/stand/sys/bootsyms.h +++ b/usr/src/stand/sys/bootsyms.h @@ -38,20 +38,15 @@ * workaround exists for lint's pass2, which requires definitions for all * symbols in order to properly perform cross-checks. * - * Thus, this header file was created to address two problems: + * Thus, this header file was created to address the problems: * - * 1. The "extern" problem. All files beneath stand/lib should #include - * this file rather than "extern" the symbol. Additionally, existing - * externs should be removed as convenient. + * - The "extern" problem. All files beneath stand/lib should #include + * this file rather than "extern" the symbol. Additionally, existing + * externs should be removed as convenient. * - * Of course, eventually some brave soul needs to venture over to the - * slums of psm/stand and add all the proper header files, at which - * point this file can be disposed of. - * - * 2. The lint pass2 problem. Specifically, this file is used to build - * llib-lfakeboot.ln, which is then used to properly lint the - * binaries under stand/lib. See stand/lib/llib-lfakeboot for more - * details. + * Of course, eventually some brave soul needs to venture over to the + * slums of psm/stand and add all the proper header files, at which + * point this file can be disposed of. * * Note that the set of symbols shared between stand/lib and psm/stand is * itself a moving target. As such, this file should be updated as needed diff --git a/usr/src/test/zfs-tests/tests/functional/mdb/mdb_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/mdb/mdb_001_pos.ksh index 7f6faf690e..39180c2a39 100644 --- a/usr/src/test/zfs-tests/tests/functional/mdb/mdb_001_pos.ksh +++ b/usr/src/test/zfs-tests/tests/functional/mdb/mdb_001_pos.ksh @@ -26,7 +26,8 @@ # # -# Copyright (c) 2013, 2016 by Delphix. All rights reserved. +# Copyright (c) 2013, 2017 by Delphix. All rights reserved. +# Copyright 2020 Joyent, Inc. # . $STF_SUITE/include/libtest.shlib @@ -43,7 +44,7 @@ function cleanup { - rm -f $OUTFILE + rm -f $tmpfile } verify_runnable "global" @@ -60,6 +61,7 @@ typeset bp=$(mdb -ke "$spa + $off_ub + $off_rbp =J") # dcmds and walkers skipped due to being DEBUG only or difficult to run: # ::zfs_params # ::refcount +# ::walk zms_freelist set -A dcmds "::abuf_find 1 2" \ "::arc" \ @@ -84,47 +86,25 @@ set -A dcmds "::abuf_find 1 2" \ "$spa ::print -a spa_t spa_uberblock.ub_rootbp | ::blkptr" \ "$spa ::walk metaslab" \ "$spa ::walk metaslab | ::head -1 | ::metaslab_weight" \ - "$spa ::walk metaslab | ::head -1 | ::metaslab_trace" \ + "*metaslab_alloc_trace_cache::walk kmem | ::metaslab_trace" \ "$spa ::walk zio_root | ::zio -c" \ "$spa ::walk zio_root | ::zio -r" \ - "$spa ::walk zms_freelist" "$spa ::zfs_blkstats -v" \ "::dbufs" \ "::dbufs -n mos -o mdn -l 0 -b 0" \ "::dbufs | ::dbuf" \ "::dbuf_stats" \ - "dbuf_cache ::walk multilist" + "dbuf_caches::print dbuf_cache_t cache | ::walk multilist" # # The commands above were supplied by the ZFS development team. The idea is to # do as much checking as possible without the need to hardcode addresses. # -log_assert "Verify that the ZFS mdb dcmds and walkers are working as expected." +for cmd in ${cmds[@]}; do + log_must eval "mdb -ke \"${cmd}\" >$tmpfile 2>&1" -typeset -i RET=0 - -i=0 -while (( $i < ${#dcmds[*]} )); do - log_note "Verifying: '${dcmds[i]}'" - echo "${dcmds[i]}" | mdb -k > $OUTFILE 2>&1 - RET=$? - if (( $RET != 0 )); then - log_fail "mdb '${dcmds[i]}' returned error $RET" - fi - - # # mdb prefixes all errors with "mdb: " so we check the output. - # - grep "mdb:" $OUTFILE > /dev/null 2>&1 - RET=$? - if (( $RET == 0 )); then - echo "mdb '${dcmds[i]}' contained 'mdb:'" - # Using tail limits the number of lines in the log - tail -100 $OUTFILE - log_fail "mdb walker or dcmd failed" - fi - - ((i = i + 1)) + log_mustnot grep -q "mdb:" $tmpfile done log_pass "The ZFS mdb dcmds and walkers are working as expected." |