diff options
| author | Toomas Soome <tsoome@me.com> | 2020-01-17 09:49:43 -0800 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2020-02-05 19:00:00 +0200 |
| commit | 5801b0f01c3c34499a929ed96164a5a68b470945 (patch) | |
| tree | 50e06e6f9eb27ea820f4f4e711c485499aad6e86 | |
| parent | 948761701ebc8a0cf820a973780b2fbb931c4390 (diff) | |
| download | illumos-joyent-5801b0f01c3c34499a929ed96164a5a68b470945.tar.gz | |
12217 add ld assert-deflib and guidance to gate build
Reviewed by: Robert Mustacchi <rm@fingolfin.org>
Reviewed by: Gergő Mihály Doma <domag02@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>
168 files changed, 306 insertions, 531 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index 635215f56a..127680a9e9 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -42,6 +42,14 @@ ROOT= /proto # and libraries. # ADJUNCT_PROTO= +# HAVE_ADJUNCT_PROTO - ADJUNCT_PROTO is set to a non-default value +# NO_ADJUNCT_PROTO - ADJUNCT_PROTO is unset +# +# This works by replacing any value in ADJUNCT_PROTO with POUND_SIGN, which +# only happens if it has some value, and then setting HAVE_ADJUNCT_PROTO +# oppositely. +NO_ADJUNCT_PROTO=$(ADJUNCT_PROTO:%=$(POUND_SIGN)) +$(NO_ADJUNCT_PROTO)HAVE_ADJUNCT_PROTO=$(POUND_SIGN) # # Adjunct for building things that run on the build machine. @@ -813,13 +821,19 @@ CCEXTNEEDED64 = -lCrun -lCstd $(__GNUC64)CCNEEDED64 = -L$(GCCLIBDIR) -lstdc++ -lgcc_s $(__GNUC64)CCEXTNEEDED = $(CCNEEDED64) -LINK.c= $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -LINK64.c= $(CC) $(CFLAGS64) $(CPPFLAGS) $(LDFLAGS) -NORUNPATH= -norunpath -nolib -LINK.cc= $(CCC) $(CCFLAGS) $(CPPFLAGS) $(NORUNPATH) \ - $(LDFLAGS) $(CCNEEDED) -LINK64.cc= $(CCC) $(CCFLAGS64) $(CPPFLAGS) $(NORUNPATH) \ - $(LDFLAGS) $(CCNEEDED64) +# Libraries we expect to use natively on the build machine +NATIVE_LIBS= + +LDCHECKS = $(ZASSERTDEFLIB) $(ZGUIDANCE) $(ZFATALWARNINGS) +LDCHECKS += $(NATIVE_LIBS:%=$(ZASSERTDEFLIB)=%) + +LINK.c= $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(LDCHECKS) +LINK64.c= $(CC) $(CFLAGS64) $(CPPFLAGS) $(LDFLAGS) $(LDCHECKS) +NORUNPATH= -norunpath -nolib +LINK.cc= $(CCC) $(CCFLAGS) $(CPPFLAGS) $(NORUNPATH) \ + $(LDFLAGS) $(CCNEEDED) $(LDCHECKS) +LINK64.cc= $(CCC) $(CCFLAGS64) $(CPPFLAGS) $(NORUNPATH) \ + $(LDFLAGS) $(CCNEEDED64) $(LDCHECKS) # # lint macros @@ -982,6 +996,9 @@ ZRECORD= -zrecord ZREDLOCSYM= -zredlocsym ZTEXT= -ztext ZVERBOSE= -zverbose +ZASSERTDEFLIB= -zassert-deflib +ZGUIDANCE= -zguidance +ZFATALWARNINGS= -zfatal-warnings GSHARED= -G CCMT= -mt diff --git a/usr/src/cmd/availdevs/Makefile b/usr/src/cmd/availdevs/Makefile index e7fa72f930..dfa150f6c9 100644 --- a/usr/src/cmd/availdevs/Makefile +++ b/usr/src/cmd/availdevs/Makefile @@ -37,8 +37,8 @@ INCS += -I$(ADJUNCT_PROTO)/usr/include/libxml2 # it during lint, as well as turning off the warnings lint would generate. # LDLIBS += -lzfs_jni -lnvpair -lzfs +NATIVE_LIBS += libxml2.so all install := LDLIBS += -lxml2 -LINTFLAGS += -xerroff=E_NAME_USED_NOT_DEF2 CPPFLAGS += $(INCS) -D_LARGEFILE64_SOURCE=1 -D_REENTRANT $(NOT_RELEASE_BUILD) CPPFLAGS += -DDEBUG @@ -51,6 +51,4 @@ install: all $(ROOTCMD) clean: -lint: lint_PROG - include ../Makefile.targ diff --git a/usr/src/cmd/boot/bootadm/Makefile b/usr/src/cmd/boot/bootadm/Makefile index 9946fef461..014e365c27 100644 --- a/usr/src/cmd/boot/bootadm/Makefile +++ b/usr/src/cmd/boot/bootadm/Makefile @@ -45,6 +45,7 @@ POFILE= bootadm_cmd.po LDLIBS_i386= -lfdisk LDLIBS += -lficl-sys -lmd -lcryptoutil -lnvpair -lgen -ladm -lefi LDLIBS += -lscf -lz -lbe -lzfs -lofmt $(LDLIBS_$(MACH)) +NATIVE_LIBS += libz.so # Writing into string literals is incorrect. We need to match gcc's # behavior, which causes us to take SIGSEGV on such a write. diff --git a/usr/src/cmd/boot/fiocompress/Makefile b/usr/src/cmd/boot/fiocompress/Makefile index 158a9a5863..83e0633137 100644 --- a/usr/src/cmd/boot/fiocompress/Makefile +++ b/usr/src/cmd/boot/fiocompress/Makefile @@ -36,11 +36,11 @@ include ../Makefile.com .KEEP_STATE: LDLIBS += -lz +NATIVE_LIBS += libz.so CFLAGS += -I../../../uts/common -LINTFLAGS += -I../../../uts/common -SMOFF += leaks +SMOFF += leaks all: $(PROG) @@ -55,6 +55,4 @@ clean: _msg: -lint: lint_SRCS - include ../Makefile.targ diff --git a/usr/src/cmd/cdrw/Makefile b/usr/src/cmd/cdrw/Makefile index aa39fca47b..b7a64ad6d9 100644 --- a/usr/src/cmd/cdrw/Makefile +++ b/usr/src/cmd/cdrw/Makefile @@ -35,13 +35,12 @@ include ../hal/Makefile.hal SRCS= $(OBJS:.o=.c) -LDLIBS += -lhal -lsecdb -NONLINTLDLIBS = -ldbus-1 +LDLIBS += -lhal -lsecdb -ldbus-1 +NATIVE_LIBS += libdbus-1.so CFLAGS += $(CCVERBOSE) CERRWARN += $(CNOWARN_UNINIT) CERRWARN += -_gcc=-Wno-parentheses CPPFLAGS += -D_REENTRANT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(HAL_DBUS_CPPFLAGS) -LINTFLAGS += -um # not linted SMATCH=off @@ -53,7 +52,7 @@ $(ROOTBIN)/cdrw := FILEMODE = 04755 all: $(PROG) $(PROG): $(OBJS) - $(LINK.c) -o $(PROG) $(OBJS) $(LDLIBS) $(NONLINTLDLIBS) $(CFLAGS) + $(LINK.c) -o $(PROG) $(OBJS) $(LDLIBS) $(CFLAGS) $(POST_PROCESS) install: all $(ROOTPROG) @@ -61,8 +60,6 @@ install: all $(ROOTPROG) clean: $(RM) $(OBJS) -lint: lint_SRCS - $(POFILE) : $(SRCS) $(RM) $@ $(COMPILE.cpp) $(SRCS) | $(XGETTEXT) $(XGETFLAGS) - diff --git a/usr/src/cmd/cmd-crypto/Makefile b/usr/src/cmd/cmd-crypto/Makefile index c23513d431..6993d7b0d1 100644 --- a/usr/src/cmd/cmd-crypto/Makefile +++ b/usr/src/cmd/cmd-crypto/Makefile @@ -40,12 +40,11 @@ all:= TARGET= all install:= TARGET= install clean:= TARGET= clean clobber:= TARGET= clobber -lint:= TARGET= lint _msg:= TARGET= _msg .KEEP_STATE: -all clean clobber lint _msg: $(SUBDIRS1) $($(MACH)_SUBDIRS) +all clean clobber _msg: $(SUBDIRS1) $($(MACH)_SUBDIRS) install: $(SUBDIRS1) $(SUBDIRS2) $($(MACH)_SUBDIRS) diff --git a/usr/src/cmd/cmd-crypto/kmfcfg/Makefile b/usr/src/cmd/cmd-crypto/kmfcfg/Makefile index beaac6f8e7..5d026693be 100644 --- a/usr/src/cmd/cmd-crypto/kmfcfg/Makefile +++ b/usr/src/cmd/cmd-crypto/kmfcfg/Makefile @@ -51,6 +51,7 @@ CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/libxml2 \ -I$(KMFDIR)/include -I. LDLIBS += -L$(ROOT)/usr/lib -lkmf -lcryptoutil XMLLIB = -lxml2 +NATIVE_LIBS += libxml2.so .KEEP_STATE: @@ -83,6 +84,4 @@ $(DTDDIR)/%: % clean: $(RM) $(OBJS) -lint : lint_SRCS - include ../../Makefile.targ diff --git a/usr/src/cmd/cmd-crypto/tpmadm/Makefile b/usr/src/cmd/cmd-crypto/tpmadm/Makefile index cfb20a8ea5..a9a1d95aca 100644 --- a/usr/src/cmd/cmd-crypto/tpmadm/Makefile +++ b/usr/src/cmd/cmd-crypto/tpmadm/Makefile @@ -35,8 +35,8 @@ POFILE = $(PROG)_msg.po MSGFILES=$(SRCS:%.c=%.i) CPPFLAGS += -xCC -LINTFLAGS += -XCC -L$(ADJUNCT_PROTO)/usr/lib LDLIBS += -ltspi -luuid +NATIVE_LIBS += libtspi.so CLOBBERFILES = C.ln $(POFILE) $(POFILES) @@ -56,6 +56,4 @@ install : all $(ROOTPROG) clean : $(RM) $(OBJS) -lint : lint_SRCS - include ../../Makefile.targ diff --git a/usr/src/cmd/cmd-inet/usr.lib/wpad/Makefile b/usr/src/cmd/cmd-inet/usr.lib/wpad/Makefile index 5dcf9c3755..7d72bad58f 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/wpad/Makefile +++ b/usr/src/cmd/cmd-inet/usr.lib/wpad/Makefile @@ -27,17 +27,16 @@ PROG = wpad MANIFEST = wpa.xml OBJS = wpa_supplicant.o wpa.o wpa_enc.o eloop.o \ driver_wifi.o l2_packet.o -SRCS = $(OBJS:%.o=%.c) +SRCS = $(OBJS:%.o=%.c) include ../../../Makefile.cmd ROOTMANIFESTDIR = $(ROOTSVCNETWORK) -LDLIBS += -ldladm -ldlpi +LDLIBS += -ldladm -ldlpi +NATIVE_LIBS += libcrypto.so all install := LDLIBS += -lcrypto -LINTFLAGS += -u - SMOFF += all_func_returns .KEEP_STATE: @@ -57,6 +56,4 @@ check: $(CHKMANIFEST) clean: $(RM) $(OBJS) -lint: lint_SRCS - include ../../../Makefile.targ diff --git a/usr/src/cmd/dfs.cmds/sharemgr/Makefile.com b/usr/src/cmd/dfs.cmds/sharemgr/Makefile.com index 3c5567cfbe..9320e554e9 100644 --- a/usr/src/cmd/dfs.cmds/sharemgr/Makefile.com +++ b/usr/src/cmd/dfs.cmds/sharemgr/Makefile.com @@ -40,8 +40,9 @@ MYCPPFLAGS = -I../../../../lib/libfsmgt/common \ -I../.. CPPFLAGS += $(MYCPPFLAGS) LDLIBS += -lshare -lscf -lsecdb -lumem +NATIVE_LIBS += libxml2.so + all install := LDLIBS += -lxml2 -LINTFLAGS += -u CERRWARN += $(CNOWARN_UNINIT) @@ -64,8 +65,6 @@ install: all $(SHAREMGRNO64)install: $(ROOTUSRSBINPROG) -lint: lint_SRCS - clean: $(RM) $(OBJS) diff --git a/usr/src/cmd/fm/modules/common/fabric-xlate/Makefile b/usr/src/cmd/fm/modules/common/fabric-xlate/Makefile index 5395bfdf06..5e776933da 100644 --- a/usr/src/cmd/fm/modules/common/fabric-xlate/Makefile +++ b/usr/src/cmd/fm/modules/common/fabric-xlate/Makefile @@ -34,10 +34,10 @@ CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/libxml2 -I$(KMFDIR)/include -I. CPPFLAGS += -I$(SRC)/uts/sun4v/io/px INCDIRS = $(SRC)/uts/common CFLAGS += -I$(INCDIRS) -LINTFLAGS += -I$(INCDIRS) LDFLAGS += -L$(ROOT)/usr/lib/fm -R/usr/lib/fm LDLIBS += -luutil -lxml2 -L$(ROOTLIB)/fm -ltopo +NATIVE_LIBS += libxml2.so CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-switch diff --git a/usr/src/cmd/fm/notify/snmp-notify/Makefile.com b/usr/src/cmd/fm/notify/snmp-notify/Makefile.com index 03905b1c76..601af729b8 100644 --- a/usr/src/cmd/fm/notify/snmp-notify/Makefile.com +++ b/usr/src/cmd/fm/notify/snmp-notify/Makefile.com @@ -28,7 +28,6 @@ SRCS += snmp-notify.c OBJS = $(SRCS:%.c=%.o) -LINTFILES = $(SRCS:%.c=%.ln) PROG = snmp-notify ROOTLIBFM = $(ROOT)/usr/lib/fm @@ -47,13 +46,13 @@ CSTD = $(CSTD_GNU99) CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) LDLIBS += -L$(ROOT)/usr/lib/fm -lnvpair -lfmevent -lfmd_msg -lfmnotify \ -lumem -lnetsnmp -lnetsnmpagent +NATIVE_LIBS += libnetsnmp.so libnetsnmpagent.so LDFLAGS += -R/usr/lib/fm -LINTFLAGS += -mnu CERRWARN += -_gcc=-Wno-parentheses .NO_PARALLEL: -.PARALLEL: $(OBJS) $(LINTFILES) +.PARALLEL: $(OBJS) all: $(PROG) @@ -71,20 +70,11 @@ $(PROG): $(OBJS) $(CTFCONVERT_O) clean: - $(RM) $(OBJS) $(LINTFILES) + $(RM) $(OBJS) clobber: clean $(RM) $(PROG) -%.ln: ../common/%.c - $(LINT.c) -c $< - -%.ln: %.c - $(LINT.c) -c $< - -lint: $(LINTFILES) - $(LINT) $(LINTFLAGS) $(LINTFILES) - $(ROOTLIBNOTIFY): $(INS.dir) diff --git a/usr/src/cmd/geniconvtbl/Makefile b/usr/src/cmd/geniconvtbl/Makefile index d0b3c91b9d..7ed5411afb 100644 --- a/usr/src/cmd/geniconvtbl/Makefile +++ b/usr/src/cmd/geniconvtbl/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" -# # cmd/geniconvtbl/Makefile @@ -37,7 +35,6 @@ all := TARGET = all install := TARGET = install clean := TARGET = clean clobber := TARGET = clobber -lint := TARGET = lint _msg := TARGET = catalog .KEEP_STATE: @@ -46,7 +43,7 @@ _msg := TARGET = catalog all clean clobber install: $(SUBDIRS) .WAIT $(SAMPLES) -_msg lint: $(SUBDIRS) +_msg: $(SUBDIRS) $(SUBDIRS) $(SAMPLES): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/geniconvtbl/Makefile.com b/usr/src/cmd/geniconvtbl/Makefile.com index 45fb5f174e..ed65fa10e8 100644 --- a/usr/src/cmd/geniconvtbl/Makefile.com +++ b/usr/src/cmd/geniconvtbl/Makefile.com @@ -104,7 +104,7 @@ $(ITM) := sparcv9_CFLAGS += -xregs=no%appl LDLIBS += -lgen MY_NATIVE_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -I. -I.. -MY_NATIVE_LDFLAGS = $(MAPFILE.NES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%) +MY_NATIVE_LDFLAGS = $(MAPFILE.NES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%) $(ZDIRECT) $(ZLAZYLOAD) MY_NATIVE_LDLIBS = -lgen # @@ -151,18 +151,6 @@ $(POFILES): $(SRCSC) $(SRCI) $(SRCY) $(SRCL) $(COMPILE.cpp) $< > $<.i $(BUILD.po) - -lint : lint_SRCS1 lint_SRCS2 - - -lint_SRCS1: $(SRCS) - $(LINT.c) $(SRCS) $(LDLIBS) - -lint_SRCS2: $(SRCI) - $(LINT.c) $(SRCI) $(LDLIBS) - - - hdrchk: $(HDRCHECKS) cstyle: $(SRCS) @@ -177,8 +165,6 @@ clean: %.o: ../%.c $(COMPILE.c) $< - - # install rule $(ROOTDIRS32)/%: $(ROOTDIRS32) % -$(INS.file) @@ -196,4 +182,3 @@ $(ROOTLIB) $(ROOTBIN): -$(INS.dir) include ../../Makefile.targ - diff --git a/usr/src/cmd/geniconvtbl/native/Makefile b/usr/src/cmd/geniconvtbl/native/Makefile index 4f5960f0c0..bb795a07f3 100644 --- a/usr/src/cmd/geniconvtbl/native/Makefile +++ b/usr/src/cmd/geniconvtbl/native/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" -# .KEEP_STATE: @@ -38,6 +36,7 @@ CFLAGS = $(NATIVE_CFLAGS) CPPFLAGS = $(MY_NATIVE_CPPFLAGS) LDFLAGS = $(MY_NATIVE_LDFLAGS) LDLIBS = $(MY_NATIVE_LDLIBS) +NATIVE_LIBS += libgen.so libc.so POST_PROCESS = all install: $(PROG) diff --git a/usr/src/cmd/hal/addons/acpi/Makefile b/usr/src/cmd/hal/addons/acpi/Makefile index e66764495c..dd222e0d5d 100644 --- a/usr/src/cmd/hal/addons/acpi/Makefile +++ b/usr/src/cmd/hal/addons/acpi/Makefile @@ -33,6 +33,7 @@ include ../../Makefile.hal ROOTCMDDIR = $(ROOTLIB_HAL) LDLIBS += -lc -ldbus-1 -lhal -lglib-2.0 +NATIVE_LIBS += libdbus-1.so libglib-2.0.so CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../hald diff --git a/usr/src/cmd/hal/addons/cpufreq/Makefile b/usr/src/cmd/hal/addons/cpufreq/Makefile index ce5fc8d4f4..a628d4ace3 100644 --- a/usr/src/cmd/hal/addons/cpufreq/Makefile +++ b/usr/src/cmd/hal/addons/cpufreq/Makefile @@ -34,6 +34,7 @@ include ../../Makefile.hal ROOTCMDDIR = $(ROOTLIB_HAL) LDLIBS += -lc -ldbus-1 -lhal -lglib-2.0 -ldbus-glib-1 -lpolkit -lbsm +NATIVE_LIBS += libdbus-1.so libglib-2.0.so libdbus-glib-1.so CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../hald diff --git a/usr/src/cmd/hal/addons/network-devices/Makefile b/usr/src/cmd/hal/addons/network-devices/Makefile index 3ac146e39e..11133c7535 100644 --- a/usr/src/cmd/hal/addons/network-devices/Makefile +++ b/usr/src/cmd/hal/addons/network-devices/Makefile @@ -42,6 +42,7 @@ ROOTCMDDIR = $(ROOTLIB_HAL) LDLIBS += -lc -ldbus-1 -lhal -lglib-2.0 -ldbus-glib-1 LDLIBS += -lnsl -lsocket LDLIBS += $(ZIGNORE) -lnetsnmp +NATIVE_LIBS += libdbus-1.so libglib-2.0.so libdbus-glib-1.so libnetsnmp.so CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../hald -I../../utils diff --git a/usr/src/cmd/hal/addons/storage/Makefile b/usr/src/cmd/hal/addons/storage/Makefile index f5aa0fbbf5..44a0f756ed 100644 --- a/usr/src/cmd/hal/addons/storage/Makefile +++ b/usr/src/cmd/hal/addons/storage/Makefile @@ -33,6 +33,7 @@ include ../../Makefile.hal ROOTCMDDIR = $(ROOTLIB_HAL) LDLIBS += -lc -ldbus-1 -lhal -lnvpair -lsysevent +NATIVE_LIBS += libdbus-1.so CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../hald diff --git a/usr/src/cmd/hal/hald-runner/Makefile b/usr/src/cmd/hal/hald-runner/Makefile index 9f283d9468..365016b3bf 100644 --- a/usr/src/cmd/hal/hald-runner/Makefile +++ b/usr/src/cmd/hal/hald-runner/Makefile @@ -33,6 +33,7 @@ include ../Makefile.hal ROOTCMDDIR = $(ROOTLIB_HAL) LDLIBS += -lc -ldbus-1 -ldbus-glib-1 -lglib-2.0 +NATIVE_LIBS += libdbus-1.so libdbus-glib-1.so libglib-2.0.so CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -UDBUS_API_SUBJECT_TO_CHANGE diff --git a/usr/src/cmd/hal/hald/Makefile b/usr/src/cmd/hal/hald/Makefile index e61790e3e5..59c56619b2 100644 --- a/usr/src/cmd/hal/hald/Makefile +++ b/usr/src/cmd/hal/hald/Makefile @@ -42,6 +42,8 @@ ROOTCMDDIR = $(ROOTLIB_HAL) LDLIBS += -lc -lm -ldbus-1 -ldbus-glib-1 -lglib-2.0 -lgobject-2.0 \ -ldevinfo -lsysevent -lnvpair -lkstat -lcfgadm +NATIVE_LIBS += libdbus-1.so libdbus-glib-1.so libglib-2.0.so \ + libgobject-2.0.so libexpat.so all install $(PROG) := LDLIBS += -lexpat diff --git a/usr/src/cmd/hal/probing/acpi/Makefile b/usr/src/cmd/hal/probing/acpi/Makefile index 69190994c3..c54d59e3e9 100644 --- a/usr/src/cmd/hal/probing/acpi/Makefile +++ b/usr/src/cmd/hal/probing/acpi/Makefile @@ -33,6 +33,7 @@ include ../../Makefile.hal ROOTCMDDIR = $(ROOTLIB_HAL) LDLIBS += -lc -ldbus-1 -lhal -lglib-2.0 +NATIVE_LIBS += libdbus-1.so libglib-2.0.so CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../utils -I../../hald diff --git a/usr/src/cmd/hal/probing/network-printer/Makefile b/usr/src/cmd/hal/probing/network-printer/Makefile index f2227ec9e8..d2c0db20ad 100644 --- a/usr/src/cmd/hal/probing/network-printer/Makefile +++ b/usr/src/cmd/hal/probing/network-printer/Makefile @@ -35,6 +35,7 @@ ROOTCMDDIR = $(ROOTLIB_HAL) LDLIBS += -lc -ldbus-1 -lhal LDLIBS += $(ZIGNORE) -lnetsnmp +NATIVE_LIBS += libdbus-1.so libnetsnmp.so CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../utils -I../../hald diff --git a/usr/src/cmd/hal/probing/printer/Makefile b/usr/src/cmd/hal/probing/printer/Makefile index 9954375a62..81beb60f39 100644 --- a/usr/src/cmd/hal/probing/printer/Makefile +++ b/usr/src/cmd/hal/probing/printer/Makefile @@ -33,6 +33,7 @@ include ../../Makefile.hal ROOTCMDDIR = $(ROOTLIB_HAL) LDLIBS += -lc -ldbus-1 -lhal +NATIVE_LIBS += libdbus-1.so CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../utils -I../../hald diff --git a/usr/src/cmd/hal/probing/storage/Makefile b/usr/src/cmd/hal/probing/storage/Makefile index 8b886d4c07..bf6fd4083b 100644 --- a/usr/src/cmd/hal/probing/storage/Makefile +++ b/usr/src/cmd/hal/probing/storage/Makefile @@ -33,6 +33,7 @@ include ../../Makefile.hal ROOTCMDDIR = $(ROOTLIB_HAL) LDLIBS += -lc -ldbus-1 -lhal -ladm -lefi +NATIVE_LIBS += libdbus-1.so CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) diff --git a/usr/src/cmd/hal/probing/volume/Makefile b/usr/src/cmd/hal/probing/volume/Makefile index 25ee9ea016..346e2b18cb 100644 --- a/usr/src/cmd/hal/probing/volume/Makefile +++ b/usr/src/cmd/hal/probing/volume/Makefile @@ -33,6 +33,7 @@ include ../../Makefile.hal ROOTCMDDIR = $(ROOTLIB_HAL) LDLIBS += -lc -ldbus-1 -lhal -lfstyp -lnvpair -ladm -lefi +NATIVE_LIBS += libdbus-1.so CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) diff --git a/usr/src/cmd/hal/probing/xkb/Makefile b/usr/src/cmd/hal/probing/xkb/Makefile index 8d6b1fc13c..2dda8d5e9e 100644 --- a/usr/src/cmd/hal/probing/xkb/Makefile +++ b/usr/src/cmd/hal/probing/xkb/Makefile @@ -34,6 +34,7 @@ include ../../Makefile.hal ROOTCMDDIR = $(ROOTLIB_HAL) LDLIBS += -lc -ldbus-1 -lhal +NATIVE_LIBS += libdbus-1.so CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../hald diff --git a/usr/src/cmd/hal/tools/Makefile b/usr/src/cmd/hal/tools/Makefile index 6cca522969..819632270a 100644 --- a/usr/src/cmd/hal/tools/Makefile +++ b/usr/src/cmd/hal/tools/Makefile @@ -23,7 +23,7 @@ # Use is subject to license terms. # -SUBDIR = sunos +SUBDIR = sunos HAL_PROG = hal-device hal-find-by-capability hal-find-by-property \ hal-get-property hal-set-property lshal @@ -59,6 +59,7 @@ CLEANFILES += $(STORAGE_SHAREDOBJS) $(STORAGE_OBJS) hal-storage-zpool.o include ../../Makefile.cmd include ../Makefile.hal +NATIVE_LIBS += libdbus-1.so libdbus-glib-1.so libglib-2.0.so $(HAL_PROG) := LDLIBS += -lc -ldbus-1 -lhal lshal := LDLIBS += -ldbus-glib-1 -lglib-2.0 diff --git a/usr/src/cmd/hal/tools/sunos/Makefile b/usr/src/cmd/hal/tools/sunos/Makefile index 51b48b865b..0c1a339557 100644 --- a/usr/src/cmd/hal/tools/sunos/Makefile +++ b/usr/src/cmd/hal/tools/sunos/Makefile @@ -38,12 +38,13 @@ include ../../Makefile.hal $(HAL_PROGS) := LDLIBS += -lc $(ZIGNORE) -lglib-2.0 +NATIVE_LIBS += libglib-2.0.so CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal CPPFLAGS += -I$(ROOT)/usr/include/libpolkit CSTD = $(CSTD_GNU99) -ROOTCMDDIR = $(ROOTLIB_HAL)/sunos +ROOTCMDDIR = $(ROOTLIB_HAL)/sunos ROOTCMD = $(HAL_PROGS:%=$(ROOTCMDDIR)/%) \ $(HAL_SCRIPTS:%=$(ROOTCMDDIR)/%) diff --git a/usr/src/cmd/isns/Makefile b/usr/src/cmd/isns/Makefile index f96f69882e..8b1e6330a9 100644 --- a/usr/src/cmd/isns/Makefile +++ b/usr/src/cmd/isns/Makefile @@ -35,10 +35,9 @@ clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install install_h := TARGET= install_h -lint := TARGET= lint _msg := TARGET= _msg -all clean clobber install install_h lint: $(SUBDIRS) +all clean clobber install install_h: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/isns/isnsadm/Makefile b/usr/src/cmd/isns/isnsadm/Makefile index a59d2c17a8..76341b57b4 100644 --- a/usr/src/cmd/isns/isnsadm/Makefile +++ b/usr/src/cmd/isns/isnsadm/Makefile @@ -31,6 +31,7 @@ OBJS = $(SRCS:%.c=%.o) include ../../Makefile.cmd LDLIBS += -lxml2 -lscf -lc +NATIVE_LIBS += libxml2.so CFLAGS += $(CCVERBOSE) CPPFLAGS += -I. -I$(ADJUNCT_PROTO)/usr/include/libxml2 -I../isnsd POFILE = isnsadm_all.po @@ -51,8 +52,6 @@ all: $(PROG) clean: $(RM) $(OBJS) $(PROG) -lint: lint_SRCS - $(PROG): $(OBJS) $(LINK.c) -o $@ $(OBJS) $(LDLIBS) $(POST_PROCESS) diff --git a/usr/src/cmd/isns/isnsd/Makefile b/usr/src/cmd/isns/isnsd/Makefile index 8cca720f32..a29769e5ef 100644 --- a/usr/src/cmd/isns/isnsd/Makefile +++ b/usr/src/cmd/isns/isnsd/Makefile @@ -51,13 +51,10 @@ MANIFEST = isns_server.xml ROOTMANIFESTDIR = $(ROOTSVCNETWORK) $(ROOTSVCNETWORK)/isns_server.xml := FILEMODE = 0444 -CFLAGS += $(CCVERBOSE) -CPPFLAGS += -I./ -I$(ADJUNCT_PROTO)/usr/include/libxml2 +CFLAGS += $(CCVERBOSE) +CPPFLAGS += -I./ -I$(ADJUNCT_PROTO)/usr/include/libxml2 CPPFLAGS += -DTARGET_DATA_STORE=$(DATA_STORE) CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -LINTFLAGS += -xerroff=E_BAD_PTR_CAST_ALIGN -LINTFLAGS += -xerroff=E_NAME_USED_NOT_DEF2 -LINTFLAGS += -xerroff=E_CASE_FALLTHRU CERRWARN += -_gcc=-Wno-char-subscripts CERRWARN += -_gcc=-Wno-ignored-qualifiers @@ -73,6 +70,7 @@ obj.o := CERRWARN += -erroff=E_CONST_OBJ_SHOULD_HAVE_INITIZR obj.o := CERRWARN += -erroff=E_IMPLICIT_DECL_FUNC_RETURN_INT LDLIBS += -lsecdb -lsocket -lnsl -lscf -lxml2 +NATIVE_LIBS += libxml2.so .KEEP_STATE: diff --git a/usr/src/cmd/latencytop/Makefile.com b/usr/src/cmd/latencytop/Makefile.com index cc547f618f..08b826b8d7 100644 --- a/usr/src/cmd/latencytop/Makefile.com +++ b/usr/src/cmd/latencytop/Makefile.com @@ -49,6 +49,7 @@ CPPFLAGS += -DEMBED_CONFIGS -I$(ADJUNCT_PROTO)/usr/include/glib-2.0 \ -I$(ADJUNCT_PROTO)/usr/lib/glib-2.0/include CSTD = $(CSTD_GNU99) LDLIBS += -lcurses -ldtrace +NATIVE_LIBS += libglib-2.0.so all install := LDLIBS += -lglib-2.0 FILEMODE = 0555 diff --git a/usr/src/cmd/lp/filter/postscript/font/Makefile b/usr/src/cmd/lp/filter/postscript/font/Makefile index 27496b4f75..25d3ffcfd0 100644 --- a/usr/src/cmd/lp/filter/postscript/font/Makefile +++ b/usr/src/cmd/lp/filter/postscript/font/Makefile @@ -19,9 +19,6 @@ # # CDDL HEADER END # -# -# ident "%Z%%M% %I% %E% SMI" -# # Copyright 1989-2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -48,6 +45,7 @@ POFILE = lp_filter_postscript_font.po NATIVEDIR = native NATIVEPROG = $(NATIVEDIR)/$(PROG) +NATIVE_LIBS += libc.so $(NATIVEPROG) := CC=$(NATIVECC) $(NATIVEPROG) := LDLIBS= $(NATIVEPROG) := CPPFLAGS.master= diff --git a/usr/src/cmd/mandoc/Makefile.common b/usr/src/cmd/mandoc/Makefile.common index ac9df1c135..1695aaddb7 100644 --- a/usr/src/cmd/mandoc/Makefile.common +++ b/usr/src/cmd/mandoc/Makefile.common @@ -90,3 +90,4 @@ CSTD= $(CSTD_GNU99) CPPFLAGS += -DOSNAME="\"illumos\"" -D_FILE_OFFSET_BITS=64 LDLIBS += -lz +NATIVE_LIBS += libz.so diff --git a/usr/src/cmd/mdb/tools/Makefile b/usr/src/cmd/mdb/tools/Makefile index fd687be167..3ed9c7ad7d 100644 --- a/usr/src/cmd/mdb/tools/Makefile +++ b/usr/src/cmd/mdb/tools/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)/Makefile.master diff --git a/usr/src/cmd/mdb/tools/findfp/Makefile.com b/usr/src/cmd/mdb/tools/findfp/Makefile.com index 6ac7877527..16e692d598 100644 --- a/usr/src/cmd/mdb/tools/findfp/Makefile.com +++ b/usr/src/cmd/mdb/tools/findfp/Makefile.com @@ -45,7 +45,8 @@ include ../../common/Makefile.util CPPFLAGS = -I../../common -I../common CFLAGS += $(CCVERBOSE) CERRWARN += $(CNOWARN_UNINIT) -LDFLAGS = +LDFLAGS = $(ZLAZYLOAD) $(BDIRECT) +LDFLAGS += $(ZASSERTDEFLIB)=libelf.so $(ZASSERTDEFLIB)=libc.so LDLIBS = -lelf LINTFILES = $(SRCS:%.c=%.ln) @@ -55,9 +56,6 @@ install all: $(PROG) clobber clean: $(RM) $(OBJS) $(LINTFILES) $(PROG) -lint: $(LINTFILES) - $(LINT) $(LINTFLAGS) $(LINTFILES) $(LDLIBS) - $(PROG): $(OBJS) $(LINK.c) $(OBJS) -o $@ $(LDLIBS) $(POST_PROCESS) @@ -69,9 +67,3 @@ $(PROG): $(OBJS) %.o: ../common/%.c $(COMPILE.c) $< $(POST_PROCESS_O) - -%.ln: %.c - $(LINT.c) -c $< - -%.ln: ../common/%.c - $(LINT.c) -c $< diff --git a/usr/src/cmd/mdb/tools/setdynflag/Makefile b/usr/src/cmd/mdb/tools/setdynflag/Makefile index f6314b84d6..67d07e8490 100644 --- a/usr/src/cmd/mdb/tools/setdynflag/Makefile +++ b/usr/src/cmd/mdb/tools/setdynflag/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.cmd diff --git a/usr/src/cmd/mdb/tools/setdynflag/Makefile.com b/usr/src/cmd/mdb/tools/setdynflag/Makefile.com index 02807d7089..f7eb93fb8f 100644 --- a/usr/src/cmd/mdb/tools/setdynflag/Makefile.com +++ b/usr/src/cmd/mdb/tools/setdynflag/Makefile.com @@ -44,18 +44,14 @@ include ../../common/Makefile.util CPPFLAGS = -I../../common CFLAGS += $(CCVERBOSE) CERRWARN += $(CNOWARN_UNINIT) -LDFLAGS = +LDFLAGS = $(ZLAZYLOAD) $(BDIRECT) LDLIBS = -lelf - -LINTFILES = $(SRCS:%.c=%.ln) +NATIVE_LIBS += libelf.so libc.so install all: $(PROG) clobber clean: - $(RM) $(OBJS) $(LINTFILES) $(PROG) - -lint: $(LINTFILES) - $(LINT) $(LINTFLAGS) $(LINTFILES) $(LDLIBS) + $(RM) $(OBJS) $(PROG) $(PROG): $(OBJS) $(LINK.c) $(OBJS) -o $@ $(LDLIBS) @@ -64,6 +60,3 @@ $(PROG): $(OBJS) %.o: ../common/%.c $(COMPILE.c) $< $(POST_PROCESS_O) - -%.ln: ../common/%.c - $(LINT.c) -c $< diff --git a/usr/src/cmd/oawk/Makefile b/usr/src/cmd/oawk/Makefile index 0ca6be8064..5ebbaae559 100644 --- a/usr/src/cmd/oawk/Makefile +++ b/usr/src/cmd/oawk/Makefile @@ -51,13 +51,14 @@ NATIVEOBJS = $(NATIVEDIR)/makeprctab.o $(NATIVEDIR)/tmptoken.o $(MAKEPRCTAB) := CC = $(NATIVECC) $(MAKEPRCTAB) := POST_PROCESS= $(MAKEPRCTAB) := POST_PROCESS_O= +$(MAKEPRCTAB) := NATIVE_LIBS += libm.so libc.so CLEANFILES = proctab.c y.tab.h y.tab.c awk.h awk.g.c \ tmptoken.c awk.lx.c $(NATIVEOBJS) $(MAKEPRCTAB) \ temp YFLAGS = -d -XLDLIBS5CC += -lm +XLDLIBS5CC += -lm LDLIBS += -lm CPPFLAGS = -I. $(CPPFLAGS.master) CPPFLAGS += -D_FILE_OFFSET_BITS=64 @@ -78,12 +79,12 @@ SMATCH = off all : $(PROG) $(TXTS) $(PROG) : $(OBJS) - $(LINK.c) $(OBJS) -o $@ $(LDLIBS) + $(LINK.c) $(OBJS) -o $@ $(LDLIBS) $(POST_PROCESS) $(POFILE): $(POFILES) $(RM) $@ - $(CAT) $(POFILES) > $@ + $(CAT) $(POFILES) > $@ awk.g.c + awk.h : awk.g.y $(RM) awk.g.c awk.h @@ -105,7 +106,7 @@ proctab.c : $(MAKEPRCTAB) $(MAKEPRCTAB) : $(NATIVEDIR) $(NATIVEOBJS) $(LINK.c) $(NATIVEOBJS) -o $@ $(XLDLIBS5CC) -install : all $(ROOTPROG) $(ROOTLINK) +install : all $(ROOTPROG) $(ROOTLINK) $(NATIVEDIR) : -@mkdir -p $(NATIVEDIR) diff --git a/usr/src/cmd/perl/Makefile.perl b/usr/src/cmd/perl/Makefile.perl index 654b288914..76a02d61bd 100644 --- a/usr/src/cmd/perl/Makefile.perl +++ b/usr/src/cmd/perl/Makefile.perl @@ -53,3 +53,4 @@ XSUBPP64 = $(PERLBINDIR64)/perl $(PERLDIR)/lib/ExtUtils/xsubpp \ -typemap $(PERLDIR)/lib/ExtUtils/typemap CSTD = $(CSTD_GNU99) +ZGUIDANCE = diff --git a/usr/src/cmd/picl/plugins/Makefile b/usr/src/cmd/picl/plugins/Makefile index 0598b74f8e..7d3de696a7 100644 --- a/usr/src/cmd/picl/plugins/Makefile +++ b/usr/src/cmd/picl/plugins/Makefile @@ -19,9 +19,6 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -39,18 +36,17 @@ i86_MSGSUBDIRS= SUBDIRS= $(COMMON_SUBDIRS) $($(MACH)_SUBDIRS) -MSGSUBDIRS= $(COMMON_SUBDIRS) $($(MACH)_MSGSUBDIRS) +MSGSUBDIRS= $(COMMON_SUBDIRS) $($(MACH)_MSGSUBDIRS) 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) _msg: $(MSGSUBDIRS) diff --git a/usr/src/cmd/picl/plugins/Makefile.targ b/usr/src/cmd/picl/plugins/Makefile.targ index 4002c5d313..8f5914b26e 100644 --- a/usr/src/cmd/picl/plugins/Makefile.targ +++ b/usr/src/cmd/picl/plugins/Makefile.targ @@ -26,7 +26,6 @@ # # cmd/picl/plugins/Makefile.targ # -#ident "%Z%%M% %I% %E% SMI" $(ROOT_PLATFORM): $(INS.dir) @@ -45,4 +44,3 @@ $(USR_LIB_PICLDIR): $(USR_LIB_PLUGINDIR): $(USR_LIB_PICLDIR) $(INS.dir) - diff --git a/usr/src/cmd/picl/plugins/common/devtree/Makefile b/usr/src/cmd/picl/plugins/common/devtree/Makefile index b7a7eacc51..475eaab8b2 100644 --- a/usr/src/cmd/picl/plugins/common/devtree/Makefile +++ b/usr/src/cmd/picl/plugins/common/devtree/Makefile @@ -45,7 +45,6 @@ ROOTLIBDIR = $(USR_LIB_PLUGINDIR) ROOTETC = $(ROOT)/etc ROOTLIB = $(ROOT)/usr/lib -CLEANFILES= $(LINTOUT) $(LINTLIB) CLOBBERFILES += $(LIBLINKS) CPPFLAGS += -I$(SRC)/lib/libsysevent -I$(SRC)/uts/common @@ -54,12 +53,8 @@ CFLAGS += $(CCVERBOSE) $(C_PICFLAGS) CPPFLAGS += -D_REENTRANT LDLIBS += -L$(SRC)/lib/libsysevent -L$(SRC)/lib/libpicltree/$(MACH) LDLIBS += -lc -lkstat -ldevinfo -lpicltree -lnvpair -LDLIBS += -L../piclevent -L$(ROOT)/usr/lib/picl/plugins -lpiclevent -LDLIBS += -R/usr/platform/\$$PLATFORM/lib/picl/plugins -LDLIBS += -R/usr/platform/sun4u/lib/picl/plugins -LDLIBS += -R/usr/lib/picl/plugins - -LINTFLAGS += -L$(SRC)/lib/libpicltree/$(MACH) -lpicltree +$(SPARC_BLD)LDLIBS += -R/usr/platform/\$$PLATFORM/lib/picl/plugins +$(SPARC_BLD)LDLIBS += -R/usr/platform/sun4u/lib/picl/plugins .KEEP_STATE: @@ -71,12 +66,11 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: $(LIBS) $(LIBLINKS) -install: $(ROOTLIBDIR) all $(ROOTLIBS) $(ROOTLINKS) +install: $(ROOTLIBDIR) all $(ROOTLIBS) $(ROOTLINKS) _msg: $(MSGDOMAIN) $(POFILE) $(RM) $(MSGDOMAIN)/$(POFILE) @@ -93,9 +87,6 @@ $(LIBLINKS): FRC include $(SRC)/cmd/picl/plugins/Makefile.targ include $(SRC)/lib/Makefile.targ -lint : - $(LINT.c) $(SRCS) - %.so: %.o $(LINK.c) -o $@ $(GSHARED) -h $@ $< $(LDLIBS) diff --git a/usr/src/cmd/picl/plugins/common/frutree/Makefile b/usr/src/cmd/picl/plugins/common/frutree/Makefile index 5c34be5277..d2179a239f 100644 --- a/usr/src/cmd/picl/plugins/common/frutree/Makefile +++ b/usr/src/cmd/picl/plugins/common/frutree/Makefile @@ -19,9 +19,6 @@ # # CDDL HEADER END # -# -# ident "%Z%%M% %I% %E% SMI" -# # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -43,7 +40,6 @@ LIBS = $(DYNLIB) ROOTLIBDIR = $(USR_LIB_PLUGINDIR) -CLEANFILES= $(LINTOUT) $(LINTLIB) CLOBBERFILES += $(LIBLINKS) CPPFLAGS += -I../devtree @@ -54,11 +50,10 @@ LDLIBS += -L$(SRC)/cmd/picl/plugins/lib/picld_pluginutil/$(MACH) LDLIBS += -L../devtree LDLIBS += -L../memcfg LDLIBS += -L$(ROOT)/usr/lib/picl/plugins -LDLIBS += -lc -lpicltree -lpicld_pluginutil -lpicldevtree -LDLIBS += -lpiclmemcfg -$(SPARC_BLD)LDLIBS += -R/usr/platform/\$$PLATFORM/lib/picl/plugins \ - -R/usr/platform/sun4u/lib/picl/plugins -LDLIBS += -R/usr/lib/picl/plugins +LDLIBS += -lc -lpicltree -lpicld_pluginutil +$(SPARC_BLD)LDLIBS += -R/usr/platform/\$$PLATFORM/lib/picl/plugins +$(SPARC_BLD)LDLIBS += -R/usr/platform/sun4u/lib/picl/plugins +$(SPARC_BLD)LDLIBS += -R/usr/lib/picl/plugins .KEEP_STATE: @@ -68,7 +63,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg POFILE= piclfrutree.po @@ -91,9 +85,6 @@ $(LIBLINKS): FRC 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/common/piclevent/Makefile b/usr/src/cmd/picl/plugins/common/piclevent/Makefile index c1ba0e2398..1b0ad54ea2 100644 --- a/usr/src/cmd/picl/plugins/common/piclevent/Makefile +++ b/usr/src/cmd/picl/plugins/common/piclevent/Makefile @@ -54,7 +54,7 @@ ROOTLIBDIR = $(USR_LIB_PLUGINDIR) ROOTETC = $(ROOT)/etc ROOTLIB = $(ROOT)/usr/lib -CLEANFILES= $(LINTOUT) $(LINTLIB) $(MOD_OBJS) +CLEANFILES= $(MOD_OBJS) CLOBBERFILES += $(LIBLINKS) CLOBBERFILES += $(MODULES) @@ -62,11 +62,10 @@ CPPFLAGS += -I$(SRC)/lib/libsysevent -I$(SRC)/uts/sun CFLAGS += $(CCVERBOSE) $(C_PICFLAGS) CPPFLAGS += -D_REENTRANT +LDFLAGS += $(BDIRECT) LDLIBS += -L$(SRC)/lib/libsysevent -L$(SRC)/lib/libpicltree/$(MACH) LDLIBS += -lc -lpicltree -lnvpair -LINTFLAGS += -L$(SRC)/lib/libpicltree/$(MACH) -lpicltree - .KEEP_STATE: SUBDIRS= @@ -77,7 +76,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: $(LIBS) $(LIBLINKS) $(MODULES) @@ -103,9 +101,6 @@ $(LIBLINKS): FRC include $(SRC)/cmd/picl/plugins/Makefile.targ include $(SRC)/lib/Makefile.targ -lint : - $(LINT.c) $(SRCS) - %.so: %.o $(LINK.c) -o $@ $(GSHARED) -h $@ $< $(MOD_LDLIBS) diff --git a/usr/src/cmd/policykit/Makefile b/usr/src/cmd/policykit/Makefile index 8bff90c63e..ac31801139 100644 --- a/usr/src/cmd/policykit/Makefile +++ b/usr/src/cmd/policykit/Makefile @@ -33,6 +33,7 @@ include ../Makefile.cmd include $(SRC)/lib/policykit/Makefile.policykit LDLIBS += -lpolkit $(POLICYKIT_GLIB_LDLIBS) +LDFLAGS += $(POLICYKIT_GLIB_LDFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/libpolkit CPPFLAGS += $(POLICYKIT_DBUS_CPPFLAGS) $(POLICYKIT_GLIB_CPPFLAGS) diff --git a/usr/src/cmd/rcm_daemon/Makefile b/usr/src/cmd/rcm_daemon/Makefile index 6145ba954b..e508afa483 100644 --- a/usr/src/cmd/rcm_daemon/Makefile +++ b/usr/src/cmd/rcm_daemon/Makefile @@ -19,9 +19,6 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1999-2001 by Sun Microsystems, Inc. # All rights reserved. # @@ -40,7 +37,6 @@ install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber _msg := TARGET= _msg -lint := TARGET= lint install_h := TARGET= install_h #definitions for install_h target @@ -54,7 +50,7 @@ $(ROOTHDRS) := FILEMODE = 644 install: install_h $(SUBDIRS) -all lint _msg: install_h $(SUBDIRS) +all _msg: install_h $(SUBDIRS) clean clobber: $(SUBDIRS) $(SUBDIRS): FRC diff --git a/usr/src/cmd/rcm_daemon/Makefile.com b/usr/src/cmd/rcm_daemon/Makefile.com index cf9f5b0143..a091064c93 100644 --- a/usr/src/cmd/rcm_daemon/Makefile.com +++ b/usr/src/cmd/rcm_daemon/Makefile.com @@ -109,8 +109,6 @@ SCRIPT_DIR = scripts CLOBBERFILES += $(COMMON_RCM_MODS) $($(MACH)_RCM_MODS) $(RCM_DAEMON) -LINT_MODULES = $(COMMON_MOD_SRC:.c=.ln) $($(MACH)_MOD_SRC:.c=.ln) - CPPFLAGS += -I.. CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT CFLAGS += $(CCVERBOSE) $(C_PICFLAGS) @@ -126,18 +124,18 @@ SMATCH=off MAPFILES = ../common/mapfile-intf $(MAPFILE.NGB) rcm_daemon := LDFLAGS += $(MAPFILES:%=-M%) -LINTFLAGS += -u -erroff=E_FUNC_ARG_UNUSED - LDLIBS_MODULES = -SUNW_pool_rcm.so := LDLIBS_MODULES += -L$(ROOT)/usr/lib -lpool -SUNW_network_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm -SUNW_vlan_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm -SUNW_vnic_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm -SUNW_ibpart_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm -SUNW_aggr_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm -SUNW_ip_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -linetutil -ldladm -lipmp -lipadm +SUNW_pool_rcm.so := LDLIBS_MODULES += -L$(ROOT)/usr/lib -lpool -lnvpair +SUNW_network_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm -lnvpair -ldevinfo +SUNW_vlan_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm -lnvpair +SUNW_vnic_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm -lnvpair +SUNW_ibpart_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm -lnvpair +SUNW_aggr_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm -lnvpair +SUNW_ip_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -linetutil -ldladm -lipmp -lipadm -lnvpair -lsocket -lgen SUNW_ip_anon_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -linetutil -SUNW_bridge_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm +SUNW_bridge_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm -lnvpair +SUNW_mpxio_rcm.so := LDLIBS_MODULES += -ldevinfo +LDLIBS_MODULES += -L$(ROOT)/lib -lrcm -lc LDLIBS += -lgen -lelf -lrcm -lnvpair -ldevinfo -lnsl -lsocket @@ -166,7 +164,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint $(ROOTLIB_RCM_SCRIPTS) := FILEMODE = 555 @@ -187,14 +184,6 @@ install: all \ clean: $(RM) $(RCM_OBJ) $(COMMON_MOD_OBJ) $($(MACH)_MOD_OBJ) $(POFILES) -lint: $(RCM_DAEMON).ln $(LINT_MODULES) - -$(RCM_DAEMON).ln: FRC - $(LINT.c) $(RCM_SRC) $(LDLIBS) - -%.ln: FRC - $(LINT.c) $(RCM_SRC) $(@:.ln=.c) $(LDLIBS) - FRC: include ../../Makefile.targ diff --git a/usr/src/cmd/rmformat/Makefile b/usr/src/cmd/rmformat/Makefile index 87e1e2f323..571c0ae6de 100644 --- a/usr/src/cmd/rmformat/Makefile +++ b/usr/src/cmd/rmformat/Makefile @@ -40,7 +40,6 @@ CERRWARN += $(CNOWARN_UNINIT) # not linted SMATCH=off -LINTFLAGS += -u CPPFLAGS += -D_FILE_OFFSET_BITS=64 $(ROOTBIN)/rmformat := FILEMODE = 04555 @@ -58,8 +57,6 @@ install: all $(ROOTPROG) clean: $(RM) $(OBJS) -lint: lint_SRCS - $(POFILE) : $(SRCS) $(RM) $@ $(COMPILE.cpp) $(SRCS) | $(XGETTEXT) $(XGETFLAGS) - diff --git a/usr/src/cmd/rmmount/Makefile b/usr/src/cmd/rmmount/Makefile index 2723b40ba5..be87e48793 100644 --- a/usr/src/cmd/rmmount/Makefile +++ b/usr/src/cmd/rmmount/Makefile @@ -36,6 +36,7 @@ include $(SRC)/cmd/Makefile.cmd include $(SRC)/cmd/hal/Makefile.hal LDLIBS += -ldbus-1 -ldbus-glib-1 -lglib-2.0 -lhal -lhal-storage -lcontract +NATIVE_LIBS += libdbus-1.so libdbus-glib-1.so libglib-2.0.so CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal diff --git a/usr/src/cmd/rmvolmgr/Makefile b/usr/src/cmd/rmvolmgr/Makefile index 75481251ec..e2b4b87385 100644 --- a/usr/src/cmd/rmvolmgr/Makefile +++ b/usr/src/cmd/rmvolmgr/Makefile @@ -37,17 +37,19 @@ include ../hal/Makefile.hal POFILE=rmvolmgr_all.po POFILES=$(OBJS:%.o=%.po) -LDLIBS += -ldbus-1 -ldbus-glib-1 -lglib-2.0 -lhal -lhal-storage -lcontract -lscf +LDLIBS += -ldbus-1 -ldbus-glib-1 -lglib-2.0 -lhal -lhal-storage +LDLIBS += -lcontract -lscf +NATIVE_LIBS += libdbus-1.so libdbus-glib-1.so libglib-2.0.so CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal CSTD = $(CSTD_GNU99) -CERRWARN += -_gcc=-Wno-switch -CERRWARN += $(CNOWARN_UNINIT) -CERRWARN += -_gcc=-Wno-unused-variable -CERRWARN += -_gcc=-Wno-parentheses -CERRWARN += -_gcc=-Wno-unused-function +CERRWARN += -_gcc=-Wno-switch +CERRWARN += $(CNOWARN_UNINIT) +CERRWARN += -_gcc=-Wno-unused-variable +CERRWARN += -_gcc=-Wno-parentheses +CERRWARN += -_gcc=-Wno-unused-function # not linted SMATCH=off @@ -77,4 +79,3 @@ $(POFILE): $(POFILES) $(CAT) $(POFILES) > $@ include ../Makefile.targ - diff --git a/usr/src/cmd/sendmail/src/Makefile b/usr/src/cmd/sendmail/src/Makefile index 14793754fd..8791902399 100644 --- a/usr/src/cmd/sendmail/src/Makefile +++ b/usr/src/cmd/sendmail/src/Makefile @@ -30,8 +30,8 @@ PROG= sendmail -include ../../Makefile.cmd -include ../Makefile.cmd +include ../../Makefile.cmd +include ../Makefile.cmd OBJS= alias.o arpadate.o bf.o collect.o conf.o control.o convtime.o daemon.o \ deliver.o domain.o envelope.o err.o headers.o macro.o main.o map.o \ @@ -44,9 +44,10 @@ SRCS= $(OBJS:%.o=%.c) MAPFILES = $(MAPFILE.INT) $(MAPFILE.NGB) LDFLAGS += $(MAPFILES:%=-M%) -LDLIBS += ../libsmutil/libsmutil.a ../libsm/libsm.a -lresolv -lsocket \ +LDLIBS += ../libsmutil/libsmutil.a ../libsm/libsm.a -lresolv -lsocket \ -lnsl ../db/libdb.a -lldap -lsldap -lwrap -lumem \ -lssl -lcrypto -lsasl +NATIVE_LIBS += libssl.so libcrypto.so INCPATH= -I. -I../include -I../db @@ -55,9 +56,9 @@ SUNENVDEF= -DSUN_EXTENSIONS -DVENDOR_DEFAULT=VENDOR_SUN \ -DSUN_INIT_DOMAIN -DSUN_SIMPLIFIED_LDAP -D_FFR_LOCAL_DAEMON \ -D_FFR_MAIL_MACRO -CPPFLAGS = $(INCPATH) $(ENVDEF) $(SUNENVDEF) $(DBMDEF) $(CPPFLAGS.sm) +CPPFLAGS = $(INCPATH) $(ENVDEF) $(SUNENVDEF) $(DBMDEF) $(CPPFLAGS.sm) -FILEMODE= 2555 +FILEMODE= 2555 ROOTSYMLINKS= $(ROOTLIBSMTPSM)/newaliases diff --git a/usr/src/cmd/sgs/elfdump/Makefile.com b/usr/src/cmd/sgs/elfdump/Makefile.com index 968c8ae99c..9452ddde81 100644 --- a/usr/src/cmd/sgs/elfdump/Makefile.com +++ b/usr/src/cmd/sgs/elfdump/Makefile.com @@ -57,6 +57,8 @@ LDFLAGS += $(VERSREF) $(MAPOPT) $(LLDFLAGS) LDLIBS += $(ELFLIBDIR) -lelf $(LDDBGLIBDIR) -llddbg \ $(CONVLIBDIR) -lconv +NATIVE_LDFLAGS = $(LDASSERTS) $(BDIRECT) $(ZASSERTDEFLIB)=libc.so + CERRWARN += $(CNOWARN_UNINIT) # not linted diff --git a/usr/src/cmd/sgs/elfedit/Makefile.com b/usr/src/cmd/sgs/elfedit/Makefile.com index e218130693..4f35ce2513 100644 --- a/usr/src/cmd/sgs/elfedit/Makefile.com +++ b/usr/src/cmd/sgs/elfedit/Makefile.com @@ -51,6 +51,7 @@ LLDFLAGS64 = $(VAR_ELFEDIT_LLDFLAGS64) LDFLAGS += $(VERSREF) -M$(MAPFILE) $(LLDFLAGS) LDLIBS += $(ELFLIBDIR) -lelf $(LDDBGLIBDIR) -llddbg \ $(CONVLIBDIR) -lconv -ltecla +NATIVE_LIBS += libtecla.so CERRWARN += -_gcc=-Wno-switch CERRWARN += $(CNOWARN_UNINIT) diff --git a/usr/src/cmd/sgs/librtld_db/demo/Makefile.com b/usr/src/cmd/sgs/librtld_db/demo/Makefile.com index 391c1a30cb..6bb248ced9 100644 --- a/usr/src/cmd/sgs/librtld_db/demo/Makefile.com +++ b/usr/src/cmd/sgs/librtld_db/demo/Makefile.com @@ -53,7 +53,8 @@ MV = mv .PARALLEL: $(OBJS) CPPFLAGS= -I../common -I. $(CPPFLAGS.master) -LDLIBS += -lrtld_db -lelf -ll -ly +LDLIBS += $(BDIRECT) $(ZLAZYLOAD) -lrtld_db -lelf -ll -ly +NATIVE_LIBS += libelf.so liby.so libl.so CLEANFILES += $(BLTSRC) $(BLTHDR) simp libsub.so.1 diff --git a/usr/src/cmd/sgs/link_audit/Makefile.com b/usr/src/cmd/sgs/link_audit/Makefile.com index 1d122e8f8f..39e7dfb3ca 100644 --- a/usr/src/cmd/sgs/link_audit/Makefile.com +++ b/usr/src/cmd/sgs/link_audit/Makefile.com @@ -88,6 +88,8 @@ $(WHOLIB):= MAPFILES = ../common/mapfile-vers-who $(SYMBINDREP):= MAPFILES = ../common/mapfile-vers-symbindrep $(BINDLIB):= MAPFILES = ../common/mapfile-vers-bindings +$(ONPROGS):= LDFLAGS += $(LDLIBS.cmd) $(BDIRECT) + $(ROOTCCSLIB) := DIRMODE = 755 CPPFLAGS += -D_REENTRANT diff --git a/usr/src/cmd/sgs/tools/Makefile.com b/usr/src/cmd/sgs/tools/Makefile.com index be05c9f0a3..634fec820a 100644 --- a/usr/src/cmd/sgs/tools/Makefile.com +++ b/usr/src/cmd/sgs/tools/Makefile.com @@ -41,6 +41,8 @@ include $(SRC)/cmd/Makefile.cmd include $(SRC)/cmd/sgs/Makefile.com OBJECTS= piglatin.o +NATIVECC_CFLAGS = -O +NATIVE_LDFLAGS = $(LDASSERTS) $(ZASSERTDEFLIB)=libc.so $(BDIRECT) NATIVE= $(OBJECTS:%.o=%) SRCS= $(OBJECTS:%.o=../common/%.c) diff --git a/usr/src/cmd/sgs/tools/Makefile.targ b/usr/src/cmd/sgs/tools/Makefile.targ index 5d37f9bb65..76e0f3da44 100644 --- a/usr/src/cmd/sgs/tools/Makefile.targ +++ b/usr/src/cmd/sgs/tools/Makefile.targ @@ -34,7 +34,8 @@ $(ROOTDIR)/lib/%: % $(INS.file) piglatin: ../common/piglatin.c - $(NATIVECC) $(NATIVE_CFLAGS) -o $@ ../common/piglatin.c + $(NATIVECC) $(NATIVE_CFLAGS) $(NATIVE_LDFLAGS) -o $@ \ + ../common/piglatin.c %: %.o $(LINK.c) -o $@ $< $(LDLIBS) diff --git a/usr/src/cmd/spell/Makefile b/usr/src/cmd/spell/Makefile index 659481df0a..410d3df258 100644 --- a/usr/src/cmd/spell/Makefile +++ b/usr/src/cmd/spell/Makefile @@ -77,14 +77,14 @@ $(ROOTVARADMF) := FILEMODE = 0666 spellin1 hashmk1 := CC = $(NATIVECC) spellin1 hashmk1 := POST_PROCESS = spellin1 hashmk1 := CPPFLAGS = -spellin1 hashmk1 := LDFLAGS = +spellin1 hashmk1 := LDFLAGS = $(BDIRECT) $(ROOTSPELLD)/% $(ROOTVARADMD)/% : % $(INS.file) .KEEP_STATE: -all: $(PROG) $(TXTS) +all: $(PROG) $(TXTS) spellprog: $(SPELLPROGOBJ) $(LINK.c) $(SPELLPROGOBJ) -o $@ $(LDLIBS) diff --git a/usr/src/cmd/svc/configd/Makefile b/usr/src/cmd/svc/configd/Makefile index b90b64e302..7b1c8f4da1 100644 --- a/usr/src/cmd/svc/configd/Makefile +++ b/usr/src/cmd/svc/configd/Makefile @@ -85,7 +85,7 @@ $(NATIVE_BUILD)LD = $(NATIVELD) $(NATIVE_BUILD)CFLAGS = $(NATIVE_CFLAGS) $(NATIVE_BUILD)CPPFLAGS = $(MYCPPFLAGS) -I$(LIBUUTIL)/common -I$(LIBSCF)/inc $(NATIVE_BUILD)CPPFLAGS += -DNATIVE_BUILD -$(NATIVE_BUILD)LDFLAGS = +$(NATIVE_BUILD)LDFLAGS = $(BDIRECT) $(NATIVE_BUILD)LDLIBS = -L$(ADJUNCT_PROTO)/usr/lib -R$(ADJUNCT_PROTO)/usr/lib \ -L$(LIBUUTIL)/native -R $(LIBUUTIL)/native $(MYLDLIBS) diff --git a/usr/src/cmd/svc/svccfg/Makefile b/usr/src/cmd/svc/svccfg/Makefile index 2e32677477..cba4e125c9 100644 --- a/usr/src/cmd/svc/svccfg/Makefile +++ b/usr/src/cmd/svc/svccfg/Makefile @@ -92,6 +92,7 @@ CLOBBERFILES += svccfg_lex.c svccfg_grammar.c svccfg_grammar.h \ SVCCFG_EXTRA_LIBS = -lxml2 -lscf -ll -luutil -lumem -lmd5 -lnvpair $(NOT_NATIVE)SVCCFG_EXTRA_LIBS += -ltecla +NATIVE_LIBS += libxml2.so LIBSCF = $(SRC)/lib/libscf LIBTECLA = $(SRC)/lib/libtecla # just for the header @@ -111,7 +112,7 @@ $(NATIVE_BUILD)CPPFLAGS = \ -I$(LIBSCF)/inc \ -I$(LIBTECLA) \ -I$(LIBUUTIL)/common -$(NATIVE_BUILD)LDFLAGS = +$(NATIVE_BUILD)LDFLAGS = $(BDIRECT) $(NATIVE_BUILD)LDLIBS = \ -L$(LIBUUTIL)/native -R $(LIBUUTIL)/native \ -L$(LIBSCF)/native -R $(LIBSCF)/native \ diff --git a/usr/src/cmd/volcheck/Makefile b/usr/src/cmd/volcheck/Makefile index 8c2543f014..1722221227 100644 --- a/usr/src/cmd/volcheck/Makefile +++ b/usr/src/cmd/volcheck/Makefile @@ -36,6 +36,7 @@ include $(SRC)/cmd/Makefile.cmd include $(SRC)/cmd/hal/Makefile.hal LDLIBS += -ldbus-1 -ldbus-glib-1 -lglib-2.0 -lhal -lhal-storage -lcontract +NATIVE_LIBS += libdbus-1.so libdbus-glib-1.so libglib-2.0.so CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal diff --git a/usr/src/cmd/volrmmount/Makefile b/usr/src/cmd/volrmmount/Makefile index a357772d00..7906602e62 100644 --- a/usr/src/cmd/volrmmount/Makefile +++ b/usr/src/cmd/volrmmount/Makefile @@ -36,6 +36,7 @@ include $(SRC)/cmd/Makefile.cmd include $(SRC)/cmd/hal/Makefile.hal LDLIBS += -ldbus-1 -ldbus-glib-1 -lglib-2.0 -lhal -lhal-storage -lcontract +NATIVE_LIBS += libdbus-1.so libdbus-glib-1.so libglib-2.0.so CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal diff --git a/usr/src/common/mapfiles/gen/Makefile b/usr/src/common/mapfiles/gen/Makefile index 6b22b34116..f49787d1fa 100644 --- a/usr/src/common/mapfiles/gen/Makefile +++ b/usr/src/common/mapfiles/gen/Makefile @@ -31,6 +31,9 @@ include $(SRC)/Makefile.master $(__GNUC)FILES= $(MACH)_gcc_map.noexeglobs $(__SUNC)FILES= $(MACH)_cc_map.noexeglobs +NATIVE_LIBS += libc.so +LDFLAGS += $(BDIRECT) + $(__GNUC)$(BUILD64)FILES += $(MACH64)_gcc_map.noexeglobs $(__SUNC)$(BUILD64)FILES += $(MACH64)_cc_map.noexeglobs @@ -44,8 +47,6 @@ TEMPLATE2= map.noexeglobs.2.template all install: $(FILES) -lint: - clean: $(RM) $(SYMS1) $(SYMS2) $(MAIN1) $(MAIN2) diff --git a/usr/src/lib/Makefile b/usr/src/lib/Makefile index b6697c6f61..f361ae3d8b 100644 --- a/usr/src/lib/Makefile +++ b/usr/src/lib/Makefile @@ -572,13 +572,14 @@ dbusdeps: libsecdb libtsol libinetutil libscf libuutil libgen libsmbios # The following dependencies don't need to be listed below as they are built # before everything else: # libc libm libmd libmp libnsl libnvpair libsocket +../cmd/sendmail/libmilter: libsocket libnsl abi: libctf libmapmalloc libproc auditd_plugins: libbsm libsecdb libgss libmtmalloc brand: libzonecfg libmapmalloc cfgadm_plugins: libdevice libdevinfo libhotplug librcm hbaapi libkstat libscf fm: libexacct libipmi libzfs scsi libdevinfo libdevid libcfgadm \ libcontract libsysevent ../cmd/sgs/libelf libdladm libsff \ - libpcidb + libpcidb libdiskmgt $(SPARC_BLD)fm: libpri gss_mechs/mech_dh: libgss gss_mechs/mech_dummy: libgss @@ -586,17 +587,20 @@ gss_mechs/mech_krb5: libgss libresolv2 pkcs11 libkstat gss_mechs/mech_spnego: gss_mechs/mech_krb5 hal: dbusdeps krb5: gss_mechs/mech_krb5 libtecla libldap5 +libads: libnsl libadt_jni: libbsm libadutils: libldap5 libresolv2 libbe: libzfs libinstzones libuuid libgen libdevinfo libefi libficl libbsm: libinetutil libscf libsecdb libtsol libcfgadm: libdevinfo +libcontract: libnvpair libcmd: libsum libast -libcmdutils: libavl +libcmdutils: libavl libnvpair libcpc: libpctx libcrypt: libgen libctf: libdwarf libdemangle: libcustr +libdevice: libnvpair libdevid: libdevinfo libdevinfo: libsec libgen libdhcpagent: libdhcputil libuuid libdlpi libcontract @@ -610,6 +614,7 @@ libdlpi: libinetutil libdladm libds: libsysevent libdtrace: libproc libgen libctf libmapmalloc libdtrace_jni: libuutil libdtrace +libdwarf: ../cmd/sgs/libelf libefi: libuuid libsmbios libelfsign: libcryptoutil libkmf ../cmd/sgs/libelf libeti: libcurses @@ -623,11 +628,14 @@ libgrubmgmt: libdevinfo libzfs libfstyp libefi $(INTEL_BLD)libgrubmgmt: libfdisk libidmap: libavl libuutil libinetsvc: libscf +libinetutil: libsocket libinstzones: libzonecfg libcontract libipadm: libinetutil libdlpi libdhcpagent libdladm libsecdb libdhcputil +libipmi: libm libnvpair libsocket libnsl libipmp: libinetutil libipsecutil: libtecla libtsol libkmf libiscsit: libstmf libuuid +libhotplug: libnvpair libkmf: libcryptoutil pkcs11 libcustr libkvm: ../cmd/sgs/libelf libldap5: libsasl @@ -644,14 +652,16 @@ libpp: libast libproc: ../cmd/sgs/librtld_db ../cmd/sgs/libelf libctf $(INTEL_BLD)libproc: libsaveargs libproject: libpool libproc libsecdb -libprtdiag: libkstat +libprtdiag: libkstat libdevinfo libprtdiag_psr: libprtdiag libraidcfg: libdevinfo +librcm: libnvpair librestart: libuutil libscf libpool libproject libsecdb libsysevent libsasl: libgss pkcs11 libsaveargs: libdisasm -libscf: libuutil libgen libsmbios +libscf: libuutil libgen libnsl libnvpair libsmbios libsec: libavl libidmap +libsecdb: libnsl libsff: libnvpair libshare: libscf libzfs libuuid libfsmgt libsecdb libumem libsmbfs libshell: libast libcmd libdll libsecdb @@ -678,6 +688,7 @@ libvrrpadm: libdladm libscf libvscan: libscf libsecdb libzfs: libdevid libgen libuutil libadm libavl libefi libidmap \ libumem libtsol libzfs_core libcryptoutil pkcs11 libmd libcmdutils +libzfs_core: libnvpair libzfs_jni: libdiskmgt libzfs libzonecfg: libuuid libsysevent libsec libbrand libpool libscf libproc \ libuutil libbsm libsecdb diff --git a/usr/src/lib/Makefile.lib b/usr/src/lib/Makefile.lib index 1471e292c9..d36b608df9 100644 --- a/usr/src/lib/Makefile.lib +++ b/usr/src/lib/Makefile.lib @@ -127,7 +127,8 @@ SONAME= $(DYNLIB) HSONAME= -h$(SONAME) DYNFLAGS= $(HSONAME) $(ZTEXT) $(ZDEFS) $(BDIRECT) \ - $(MAPFILES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%) + $(MAPFILES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%) \ + $(LDCHECKS) LDLIBS= $(LDLIBS.lib) diff --git a/usr/src/lib/fm/libfmd_snmp/Makefile.com b/usr/src/lib/fm/libfmd_snmp/Makefile.com index e43b2a4152..dc5b046c12 100644 --- a/usr/src/lib/fm/libfmd_snmp/Makefile.com +++ b/usr/src/lib/fm/libfmd_snmp/Makefile.com @@ -40,7 +40,7 @@ include ../../../Makefile.lib include ../../Makefile.lib SRCS = $(LIBSRCS:%.c=../common/%.c) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common @@ -51,31 +51,18 @@ $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS) CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS) -# No lint libraries are delivered for Net-SNMP yet SNMPLIBS = -lnetsnmp -lnetsnmphelpers -lnetsnmpagent -lint := SNMPLIBS= +NATIVE_LIBS += libnetsnmp.so libnetsnmphelpers.so libnetsnmpagent.so LDLIBS += $(MACH_LDLIBS) LDLIBS += -lfmd_adm -luutil -lnvpair -ltopo LDLIBS += $(SNMPLIBS) LDLIBS += -lc -LINTFLAGS = -msux $(C99LMODE) -LINTFLAGS64 = -msux -m64 $(C99LMODE) - -# Net-SNMP's headers use do {} while (0) a lot -LINTCHECKFLAGS += -erroff=E_CONSTANT_CONDITION - -$(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/libldom/Makefile b/usr/src/lib/fm/libldom/Makefile index 970b336f1f..36a5ff1dce 100644 --- a/usr/src/lib/fm/libldom/Makefile +++ b/usr/src/lib/fm/libldom/Makefile @@ -31,18 +31,17 @@ HDRDIR = sparc ROOTFMHDRDIR = $(ROOT)/usr/platform/sun4v/include/sys/fm -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/libldom/Makefile.com b/usr/src/lib/fm/libldom/Makefile.com index 859a177363..49e9ad5a41 100644 --- a/usr/src/lib/fm/libldom/Makefile.com +++ b/usr/src/lib/fm/libldom/Makefile.com @@ -35,7 +35,7 @@ include ../../Makefile.lib SRCS = $(LIBSRCS:%.c=../sparc/%.c) SRCDIR = ../sparc -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) CPPFLAGS += -I. -I$(SRC)/uts/sun4v -I$(ROOT)/usr/platform/sun4v/include \ -I$(ADJUNCT_PROTO)/usr/include/libxml2 @@ -44,24 +44,15 @@ CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS) CERRWARN += -_gcc=-Wno-parentheses -$(DYNLIB) := LDLIBS += $(MACH_LDLIBS) -$(DYNLIB) := LDLIBS += -lfmd_agent -lnvpair -lscf -lmdesc -lc -lxml2 -lsocket \ - -lumem - -LINTFLAGS = -msux -LINTFLAGS64 = -msux -m64 - -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -$(LINTLIB) := LINTFLAGS = -nsvx -I$(ROOT)/usr/platform/sun4v/include -$(LINTLIB) := LINTFLAGS64 = -nsvx -m64 \ - -I$(ROOT)/usr/platform/sun4v/include +LDLIBS += $(MACH_LDLIBS) +LDLIBS += -lfmd_agent -lnvpair -lscf -lmdesc -lc -lxml2 +LDLIBS += -lsocket -lumem +NATIVE_LIBS += libxml2.so .KEEP_STATE: all: $(LIBS) -lint: $(LINTLIB) lintcheck - pics/%.o: ../$(MACH)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) diff --git a/usr/src/lib/fm/libseslog/common/mapfile-vers b/usr/src/lib/fm/libseslog/common/mapfile-vers index bfd2d7b580..fa603e1a0e 100644 --- a/usr/src/lib/fm/libseslog/common/mapfile-vers +++ b/usr/src/lib/fm/libseslog/common/mapfile-vers @@ -37,7 +37,9 @@ # MAPFILE HEADER END # -SUNWprivate_1.1 { +$mapfile_version 2 + +SYMBOL_VERSION SUNWprivate_1.1 { global: access_ses_log; local: diff --git a/usr/src/lib/fm/topo/libtopo/Makefile b/usr/src/lib/fm/topo/libtopo/Makefile index 1990c740d9..556eddfdc4 100644 --- a/usr/src/lib/fm/topo/libtopo/Makefile +++ b/usr/src/lib/fm/topo/libtopo/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.lib 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 lint: $(SUBDIRS) +all clean clobber: $(SUBDIRS) install: install_h .WAIT $(SUBDIRS) diff --git a/usr/src/lib/fm/topo/libtopo/Makefile.com b/usr/src/lib/fm/topo/libtopo/Makefile.com index d50d99434d..e3b18ffa3a 100644 --- a/usr/src/lib/fm/topo/libtopo/Makefile.com +++ b/usr/src/lib/fm/topo/libtopo/Makefile.com @@ -69,7 +69,7 @@ include ../../../../Makefile.lib include ../../../Makefile.lib SRCS = $(BUILTINSRCS:%.c=../common/%.c) $(LIBSRCS:%.c=../common/%.c) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common @@ -84,24 +84,15 @@ CERRWARN += $(CNOWARN_UNINIT) CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-parentheses -LINTFLAGS = -msux -LINTFLAGS64 = -msux -m64 - $(DYNLIB) := LDLIBS += \ -lnvpair -lelf -lumem -lxml2 -lkstat -luuid -ldevinfo \ -lsmbios -lc -ldevid -lipmi -lscf -lpcidb - -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -$(LINTLIB) := LINTFLAGS = -nsvx -$(LINTLIB) := LINTFLAGS64 = -nsvx -m64 -$(LINTLIB) := LDLIBS += -lnvpair -lumem -lc +NATIVE_LIBS += libxml2.so .KEEP_STATE: all: $(LIBS) -lint: $(LINTLIB) lintcheck - pics/%.o: ../$(MACH)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) diff --git a/usr/src/lib/hal/Makefile.com b/usr/src/lib/hal/Makefile.com index c67f2e60bf..57dff20425 100644 --- a/usr/src/lib/hal/Makefile.com +++ b/usr/src/lib/hal/Makefile.com @@ -43,9 +43,6 @@ CLOBBERFILES += $(LIBPCSRC) # all: -# no lint for 3rd party code -lint: - $(ROOTLIBPCDIR): $(INS.dir) diff --git a/usr/src/lib/hal/libhal-storage/Makefile.com b/usr/src/lib/hal/libhal-storage/Makefile.com index e02f113d22..5a3456eea6 100644 --- a/usr/src/lib/hal/libhal-storage/Makefile.com +++ b/usr/src/lib/hal/libhal-storage/Makefile.com @@ -32,9 +32,9 @@ LIBPCSRC = hal-storage.pc include ../../Makefile.com -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -ldbus-1 -lhal -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) +NATIVE_LIBS += libdbus-1.so SRCDIR = ../common @@ -54,8 +54,6 @@ ROOTMAJLINK64 = $(ROOTLIBDIR64)/$(LIBRARY:.a=.so)$(VERS_MAJ) all: $(LIBS) -lint: lintcheck - $(ROOTMAJLINK): -$(RM) $@; $(SYMLINK) $(DYNLIB) $@ diff --git a/usr/src/lib/hal/libhal/Makefile.com b/usr/src/lib/hal/libhal/Makefile.com index 48657590c7..ce4d40b37e 100644 --- a/usr/src/lib/hal/libhal/Makefile.com +++ b/usr/src/lib/hal/libhal/Makefile.com @@ -35,9 +35,9 @@ LIBPCSRC = hal.pc include ../../Makefile.com -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -ldbus-1 -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) +NATIVE_LIBS += libdbus-1.so SRCDIR = ../common diff --git a/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com b/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com index bfd7f9aef2..99814777f1 100644 --- a/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com +++ b/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com @@ -56,7 +56,7 @@ POFILES = generic.po INS.liblink= -$(RM) $@; $(SYMLINK) $(LIBLINKS)$(VERS) $@ -CPPFLAGS += -I$(SRC)/lib/krb5 \ +CPPFLAGS += -I$(SRC)/lib/krb5 \ -I$(SRC)/lib/krb5/kdb \ -I$(SRC)/lib/gss_mechs/mech_krb5/include \ -I$(SRC)/lib/gss_mechs/mech_krb5/krb5/os \ @@ -74,6 +74,7 @@ SMATCH=off CFLAGS += $(CCVERBOSE) -I.. DYNFLAGS += $(KRUNPATH) $(KMECHLIB) -znodelete LDLIBS += -L $(ROOTLIBDIR) -lcrypto -lc +NATIVE_LIBS += libcrypto.so ROOTLIBDIR= $(ROOT)/usr/lib/krb5/plugins/preauth diff --git a/usr/src/lib/libbrand/Makefile.com b/usr/src/lib/libbrand/Makefile.com index 77443eb600..ed9c811c94 100644 --- a/usr/src/lib/libbrand/Makefile.com +++ b/usr/src/lib/libbrand/Makefile.com @@ -30,11 +30,11 @@ OBJECTS= libbrand.o include ../../Makefile.lib -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) LDLIBS += -lc -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/libxml2 -I$(SRCDIR) -D_REENTRANT $(DYNLIB) := LDLIBS += -lxml2 +NATIVE_LIBS += libxml2.so SRCDIR= ../common @@ -42,8 +42,6 @@ SRCDIR= ../common all: $(LIBS) -lint: lintcheck - install: all include ../../Makefile.targ diff --git a/usr/src/lib/libc/amd64/Makefile b/usr/src/lib/libc/amd64/Makefile index 9c21615994..bc1a7d3516 100644 --- a/usr/src/lib/libc/amd64/Makefile +++ b/usr/src/lib/libc/amd64/Makefile @@ -1224,10 +1224,11 @@ $(ASSYMDEP_OBJS:%=pics/%): assym.h # assym.h build rules GENASSYM_C = genassym.c +LDFLAGS.native = $(LDASSERTS) $(ZASSERTDEFLIB)=libc.so $(BDIRECT) genassym: $(GENASSYM_C) $(NATIVECC) $(NATIVE_CFLAGS) -Iinc -I$(LIBCDIR)/inc $(CPPFLAGS.native) \ - -o $@ $(GENASSYM_C) + $(LDFLAGS.native) -o $@ $(GENASSYM_C) OFFSETS = $(LIBCDIR)/$(MACH)/offsets.in diff --git a/usr/src/lib/libc/i386/Makefile.com b/usr/src/lib/libc/i386/Makefile.com index 59fc331a79..3d1f791b6b 100644 --- a/usr/src/lib/libc/i386/Makefile.com +++ b/usr/src/lib/libc/i386/Makefile.com @@ -1302,10 +1302,12 @@ $(ASSYMDEP_OBJS:%=pics/%): assym.h # assym.h build rules GENASSYM_C = $(LIBCDIR)/$(MACH)/genassym.c +LDFLAGS.native = $(LDASSERTS) $(ZASSERTDEFLIB)=libc.so $(BDIRECT) genassym: $(GENASSYM_C) $(NATIVECC) $(NATIVE_CFLAGS) -I$(LIBCBASE)/inc -I$(LIBCDIR)/inc \ - -D__EXTENSIONS__ $(CPPFLAGS.native) -o $@ $(GENASSYM_C) + -D__EXTENSIONS__ $(CPPFLAGS.native) $(LDFLAGS.native) \ + -o $@ $(GENASSYM_C) OFFSETS = $(LIBCDIR)/$(MACH)/offsets.in diff --git a/usr/src/lib/libc/sparc/Makefile.com b/usr/src/lib/libc/sparc/Makefile.com index e8c8405c42..71be2bb7e2 100644 --- a/usr/src/lib/libc/sparc/Makefile.com +++ b/usr/src/lib/libc/sparc/Makefile.com @@ -1364,10 +1364,11 @@ $(ASSYMDEP_OBJS:%=pics/%): assym.h assym.h := CFLAGS += $(CCGDEBUG) GENASSYM_C = $(LIBCDIR)/$(MACH)/genassym.c +LDFLAGS.native = $(LDASSERTS) $(ZASSERTDEFLIB)=libc.so $(BDIRECT) genassym: $(GENASSYM_C) $(NATIVECC) $(NATIVE_CFLAGS) -I$(LIBCBASE)/inc -I$(LIBCDIR)/inc \ - $(CPPFLAGS.native) -o $@ $(GENASSYM_C) + $(CPPFLAGS.native) $(LDFLAGS.native) -o $@ $(GENASSYM_C) OFFSETS = $(LIBCDIR)/$(MACH)/offsets.in diff --git a/usr/src/lib/libc/sparcv9/Makefile.com b/usr/src/lib/libc/sparcv9/Makefile.com index 07e2878672..57e794dfc8 100644 --- a/usr/src/lib/libc/sparcv9/Makefile.com +++ b/usr/src/lib/libc/sparcv9/Makefile.com @@ -1281,10 +1281,11 @@ $(ASSYMDEP_OBJS:%=pics/%): assym.h assym.h := CFLAGS64 += $(CCGDEBUG) GENASSYM_C = $(LIBCDIR)/$(MACH)/genassym.c +LDFLAGS.native = $(LDASSERTS) $(ZASSERTDEFLIB)=libc.so $(BDIRECT) genassym: $(GENASSYM_C) $(NATIVECC) $(NATIVE_CFLAGS) -I$(LIBCBASE)/inc -I$(LIBCDIR)/inc \ - $(CPPFLAGS.native) -o $@ $(GENASSYM_C) + $(CPPFLAGS.native) $(LDFLAGS.native) -o $@ $(GENASSYM_C) OFFSETS = $(LIBCDIR)/$(MACH)/offsets.in diff --git a/usr/src/lib/libdhcputil/Makefile.com b/usr/src/lib/libdhcputil/Makefile.com index c3eaa4cf13..8746877afa 100644 --- a/usr/src/lib/libdhcputil/Makefile.com +++ b/usr/src/lib/libdhcputil/Makefile.com @@ -36,13 +36,12 @@ include ../../Makefile.lib # install this library in the root filesystem include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -lgen -linetutil -ldlpi SRCDIR = ../common SRCS = $(LOCOBJS:%.o=$(SRCDIR)/%.c) $(COMOBJS:%.o=$(COMDIR)/%.c) -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-switch @@ -56,8 +55,6 @@ SMATCH=off all: $(LIBS) -lint: lintcheck - pics/%.o: $(COMDIR)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) diff --git a/usr/src/lib/libdwarf/Makefile b/usr/src/lib/libdwarf/Makefile index e5594b685e..7658ff6565 100644 --- a/usr/src/lib/libdwarf/Makefile +++ b/usr/src/lib/libdwarf/Makefile @@ -22,11 +22,10 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber : $(SUBDIRS) +all clean clobber: $(SUBDIRS) install: $(SUBDIRS) diff --git a/usr/src/lib/libficl/Makefile.com b/usr/src/lib/libficl/Makefile.com index 1221e26b0b..ec66e3d9be 100644 --- a/usr/src/lib/libficl/Makefile.com +++ b/usr/src/lib/libficl/Makefile.com @@ -26,8 +26,7 @@ OBJECTS= dictionary.o system.o fileaccess.o float.o double.o prefix.o search.o \ include $(SRC)/lib/Makefile.lib -LIBS= $(DYNLIB) $(LINTLIB) - +LIBS= $(DYNLIB) FICLDIR= $(SRC)/common/ficl LZ4= $(SRC)/common/lz4 CSTD= $(CSTD_GNU99) @@ -43,6 +42,7 @@ CFLAGS64 += $(C_BIGPICFLAGS64) pics/vm.o := CERRWARN += -_gcc=-Wno-clobbered LDLIBS += -luuid -lz -lc -lm -lumem +NATIVE_LIBS += libz.so HEADERS= $(FICLDIR)/ficl.h $(FICLDIR)/ficltokens.h ../ficllocal.h \ $(FICLDIR)/ficlplatform/unix.h $(PNGLITE)/pnglite.h @@ -71,8 +71,6 @@ pics/%.o: $(PNGLITE)/%.c $(HEADERS) $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) -$(LINTLIB) := SRCS= ../$(LINTSRC) - all: $(LIBS) include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libkmf/libkmf/Makefile.com b/usr/src/lib/libkmf/libkmf/Makefile.com index e860567e48..86a674c87d 100644 --- a/usr/src/lib/libkmf/libkmf/Makefile.com +++ b/usr/src/lib/libkmf/libkmf/Makefile.com @@ -53,12 +53,11 @@ include $(SRC)/lib/Makefile.rootfs SRCDIR= ../common INCDIR= ../../include -LIBS= $(DYNLIB) $(LINTLIB) - -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) +LIBS= $(DYNLIB) LDLIBS += $(BERDERLIB) $(CRYPTOUTILLIB) -lmd -lpkcs11 -lnsl -lsocket -lc LDLIBS += -lcustr +NATIVE_LIBS += libxml2.so # DYNLIB libraries do not have lint libs and are not linted $(DYNLIB) := LDLIBS += -lxml2 @@ -79,6 +78,4 @@ SMATCH=off all: $(LIBS) -lint: lintcheck - include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com index 31867e3d2d..05fe0a1e2a 100644 --- a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com +++ b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com @@ -39,13 +39,7 @@ BERLIB64= $(BERLIB) OPENSSLLIBS= $(BERLIB) -lcrypto -lcryptoutil -lc OPENSSLLIBS64= $(BERLIB64) -lcrypto -lcryptoutil -lc -LINTSSLLIBS = $(BERLIB) -lcrypto -lcryptoutil -lc -LINTSSLLIBS64 = $(BERLIB64) -lcrypto -lcryptoutil -lc - -# Because of varying openssl implementations, we need to not have lint -# complain if we're being liberal in our suppression directives. -LINTFLAGS += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED -LINTFLAGS64 += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED +NATIVE_LIBS += libcrypto.so SRCDIR= ../common INCDIR= ../../include @@ -63,10 +57,7 @@ SMATCH=off PICS= $(OBJECTS:%=pics/%) -lint:= OPENSSLLIBS= $(LINTSSLLIBS) -lint:= OPENSSLLIBS64= $(LINTSSLLIBS64) - -LDLIBS32 += $(OPENSSLLIBS) +LDLIBS32 += $(OPENSSLLIBS) ROOTLIBDIR= $(ROOTFS_LIBDIR)/crypto ROOTLIBDIR64= $(ROOTFS_LIBDIR)/crypto/$(MACH64) @@ -74,9 +65,7 @@ ROOTLIBDIR64= $(ROOTFS_LIBDIR)/crypto/$(MACH64) .KEEP_STATE: LIBS = $(DYNLIB) -all: $(DYNLIB) $(LINTLIB) - -lint: lintcheck +all: $(DYNLIB) FRC: diff --git a/usr/src/lib/libnisdb/Makefile b/usr/src/lib/libnisdb/Makefile index 11f21d5100..3aef8d0739 100644 --- a/usr/src/lib/libnisdb/Makefile +++ b/usr/src/lib/libnisdb/Makefile @@ -191,6 +191,8 @@ $(CLNT_PICS) := CPPFLAGS += -I../libnsl/nis/gen LIBS = $(DYNLIB) ZDEFS= +ZGUIDANCE= + LDLIBS += -lnsl -lldap -lc # A number of interfaces are interposed by numerous applications, therefore @@ -207,7 +209,6 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: @@ -215,8 +216,6 @@ all: $(DERIVED_FILES) $(LIBS) install: all $(ROOTLIBS) $(ROOTLINKS) -lint: $(DERIVED_FILES) .WAIT lintcheck - objs/%.o pics/%.o profs/%.o: $(YPTOL_DIR)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) diff --git a/usr/src/lib/libpool/Makefile.com b/usr/src/lib/libpool/Makefile.com index 51a3e7a5a6..3ec7bb8d25 100644 --- a/usr/src/lib/libpool/Makefile.com +++ b/usr/src/lib/libpool/Makefile.com @@ -41,12 +41,12 @@ include ../../Makefile.lib # Adding -lxml2 to LDLIBS would cause lint to complain as there is no .ln file # for libxml2, so add it to DYNFLAGS DYNFLAGS += -lxml2 +NATIVE_LIBS += libxml2.so -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lscf -lnvpair -lexacct -lc SRCDIR = ../common -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CPPFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64 \ @@ -63,6 +63,4 @@ SMATCH=off all: $(LIBS) -lint: lintcheck - include ../../Makefile.targ diff --git a/usr/src/lib/libscf/Makefile b/usr/src/lib/libscf/Makefile index 41ce640a2d..f6f84bfd52 100644 --- a/usr/src/lib/libscf/Makefile +++ b/usr/src/lib/libscf/Makefile @@ -37,7 +37,6 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint HDRDIR = inc HDRS = libscf.h libscf_priv.h @@ -55,8 +54,6 @@ XGETFLAGS += -a all clean clobber install: native $(SUBDIRS) -lint: $(SUBDIRS) - $(POFILE): pofile_MSGFILES install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libscf/Makefile.com b/usr/src/lib/libscf/Makefile.com index a534abf962..44e3ac716b 100644 --- a/usr/src/lib/libscf/Makefile.com +++ b/usr/src/lib/libscf/Makefile.com @@ -38,7 +38,7 @@ OBJECTS = \ include ../../Makefile.lib include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) $(NOT_NATIVE)NATIVE_BUILD = $(POUND_SIGN) $(NATIVE_BUILD)VERS = @@ -49,7 +49,6 @@ LDLIBS += -luutil -lc -lgen -lnvpair LDLIBS += $(LDLIBS_$(MACH)) SRCDIR = ../common -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) COMDIR = ../../../common/svc @@ -75,7 +74,7 @@ MY_NATIVE_CPPFLAGS =\ -DNATIVE_BUILD $(DTEXTDOM) \ -I../inc -I$(COMDIR) -I$(LIBUUTIL)/common -I$(ROOTHDRDIR) MY_NATIVE_LDLIBS = -L$(LIBUUTIL)/native -R$(LIBUUTIL)/native -luutil -lc -lgen \ - -lnsl -lnvpair + -lnvpair MY_NATIVE_LDLIBS_i386 = -lsmbios MY_NATIVE_LDLIBS += $(MY_NATIVE_LDLIBS_$(MACH)) @@ -83,6 +82,4 @@ MY_NATIVE_LDLIBS += $(MY_NATIVE_LDLIBS_$(MACH)) all: -lint: lintcheck - include ../../Makefile.targ diff --git a/usr/src/lib/libscf/native/Makefile b/usr/src/lib/libscf/native/Makefile index 003d633014..540a99f15a 100644 --- a/usr/src/lib/libscf/native/Makefile +++ b/usr/src/lib/libscf/native/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" -# NOT_NATIVE = $(POUND_SIGN) # tell Makefile.com we're native @@ -36,6 +34,7 @@ CFLAGS = $(NATIVE_CFLAGS) CPPFLAGS = $(MY_NATIVE_CPPFLAGS) LDFLAGS = LDLIBS = $(MY_NATIVE_LDLIBS) +NATIVE_LIBS += libsmbios.so libnvpair.so libgen.so libc.so all: libuutil .WAIT $(LIBS) diff --git a/usr/src/lib/libshare/Makefile.com b/usr/src/lib/libshare/Makefile.com index efc6613377..fb7d28f694 100644 --- a/usr/src/lib/libshare/Makefile.com +++ b/usr/src/lib/libshare/Makefile.com @@ -35,12 +35,10 @@ include ../../Makefile.lib SRCDIR = ../common LIBSRCS = $(LIBOBJS:%.o=$(SRCDIR)/%.c) -# we don't want to lint the sharetab and nfs_sec files -lintcheck := SRCS = $(LIBSRCS) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -lnsl -lscf -lzfs -luuid -lxml2 -lnvpair -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) +NATIVE_LIBS += libxml2.so #add nfs/lib directory as part of the include path CFLAGS += $(CCVERBOSE) @@ -59,8 +57,6 @@ CPPFLAGS += -D_REENTRANT -I$(NFSLIB_DIR) \ all: $(LIBS) -lint: lintcheck - pics/%.o: $(NFSLIB_DIR)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) diff --git a/usr/src/lib/libshare/autofs/Makefile.com b/usr/src/lib/libshare/autofs/Makefile.com index 30c604222b..ada5bdfe56 100644 --- a/usr/src/lib/libshare/autofs/Makefile.com +++ b/usr/src/lib/libshare/autofs/Makefile.com @@ -37,12 +37,10 @@ ROOTLIBDIR = $(ROOT)/usr/lib/fs/autofs ROOTLIBDIR64 = $(ROOT)/usr/lib/fs/autofs/$(MACH64) LIBSRCS = $(LIBOBJS:%.o=$(SRCDIR)/%.c) -# we don't want to lint the sources for OTHOBJS since they are pre-existing files -# that are not lint free. -lintcheck := SRCS = $(LIBSRCS) LIBS = $(DYNLIB) LDLIBS += -lshare -lscf -lumem -lc -lxml2 +NATIVE_LIBS += libxml2.so #add nfs/lib directory as part of the include path CFLAGS += $(CCVERBOSE) @@ -55,7 +53,7 @@ SMATCH=off CPPFLAGS += -D_REENTRANT -I$(AUTOFSSMFLIB_DIR) \ -I$(ADJUNCT_PROTO)/usr/include/libxml2 \ - -I$(SRCDIR)../common + -I$(SRCDIR)../common .KEEP_STATE: @@ -63,8 +61,6 @@ all: $(LIBS) install: $(ROOTLIBDIR) $(ROOTLIBDIR64) all -lint: lintcheck - pics/%.o: $(AUTOFSSMFLIB_DIR)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) diff --git a/usr/src/lib/libshare/autofs/mapfile-vers b/usr/src/lib/libshare/autofs/mapfile-vers index 68f89cf89f..71a63e2c32 100644 --- a/usr/src/lib/libshare/autofs/mapfile-vers +++ b/usr/src/lib/libshare/autofs/mapfile-vers @@ -36,10 +36,11 @@ # MAPFILE HEADER END # -SUNWprivate_1.1 { +$mapfile_version 2 + +SYMBOL_VERSION SUNWprivate_1.1 { global: sa_plugin_ops; local: *; }; - diff --git a/usr/src/lib/libshare/nfs/Makefile.com b/usr/src/lib/libshare/nfs/Makefile.com index e6e9ca01b4..c0384a5ed6 100644 --- a/usr/src/lib/libshare/nfs/Makefile.com +++ b/usr/src/lib/libshare/nfs/Makefile.com @@ -38,12 +38,10 @@ ROOTLIBDIR = $(ROOT)/usr/lib/fs/nfs ROOTLIBDIR64 = $(ROOT)/usr/lib/fs/nfs/$(MACH64) LIBSRCS = $(LIBOBJS:%.o=$(SRCDIR)/%.c) -# we don't want to lint the sources for OTHOBJS since they are pre-existing files -# that are not lint free. -lintcheck := SRCS = $(LIBSRCS) LIBS = $(DYNLIB) LDLIBS += -lshare -lnsl -lscf -lumem -lc -lxml2 +NATIVE_LIBS += libxml2.so #add nfs/lib directory as part of the include path CFLAGS += $(CCVERBOSE) @@ -63,8 +61,6 @@ all: $(LIBS) install: all -lint: lintcheck - pics/%.o: $(NFSLIB_DIR)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) diff --git a/usr/src/lib/libshare/smb/Makefile.com b/usr/src/lib/libshare/smb/Makefile.com index c0e735cda7..0d6e9f30cf 100644 --- a/usr/src/lib/libshare/smb/Makefile.com +++ b/usr/src/lib/libshare/smb/Makefile.com @@ -43,10 +43,10 @@ ROOTLIBDIR = $(ROOT)/usr/lib/fs/smb ROOTLIBDIR64 = $(ROOT)/usr/lib/fs/smb/$(MACH64) LIBSRCS = $(LIBOBJS:%.o=$(SRCDIR)/%.c) -lintcheck := SRCS = $(LIBSRCS) LIBS = $(DYNLIB) LDLIBS += -lshare -lscf -luuid -ldlpi -lnsl -lnvpair -lxml2 -lumem -lc +NATIVE_LIBS += libxml2.so CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-char-subscripts @@ -65,8 +65,6 @@ all: $(LIBS) install: all -lint: lintcheck - pics/smb_door_client.o: $(SMBBASE_DIR)/smb_door_client.c $(COMPILE.c) -o $@ $(SMBBASE_DIR)/smb_door_client.c $(POST_PROCESS_O) diff --git a/usr/src/lib/libshare/smbfs/Makefile.com b/usr/src/lib/libshare/smbfs/Makefile.com index c07e975163..a99d41b53a 100644 --- a/usr/src/lib/libshare/smbfs/Makefile.com +++ b/usr/src/lib/libshare/smbfs/Makefile.com @@ -39,6 +39,7 @@ LIBSRCS = $(LIBOBJS:%.o=$(SRCDIR)/%.c) LIBS = $(DYNLIB) LDLIBS += -lshare -lscf -lumem -luuid -lc -lxml2 -lsmbfs +NATIVE_LIBS += libxml2.so CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-switch @@ -52,8 +53,6 @@ all: $(LIBS) install: $(ROOTLIBDIR) $(ROOTLIBDIR64) all -lint: lintcheck - $(ROOTLIBDIR): $(INS.dir) diff --git a/usr/src/lib/libuutil/native/Makefile b/usr/src/lib/libuutil/native/Makefile index 8f30530f51..0f381ee291 100644 --- a/usr/src/lib/libuutil/native/Makefile +++ b/usr/src/lib/libuutil/native/Makefile @@ -34,6 +34,7 @@ CFLAGS = $(NATIVE_CFLAGS) CPPFLAGS = -I. $(MY_NATIVE_CPPFLAGS) LDFLAGS = LDLIBS = $(MY_NATIVE_LDLIBS) +NATIVE_LIBS += libc.so # # We must use the build's avl headers, to match the common avl.c diff --git a/usr/src/lib/libzfs/Makefile.com b/usr/src/lib/libzfs/Makefile.com index 577fa2fbca..ba69fc44ca 100644 --- a/usr/src/lib/libzfs/Makefile.com +++ b/usr/src/lib/libzfs/Makefile.com @@ -61,7 +61,7 @@ include ../../Makefile.lib # libzfs must be installed in the root filesystem for mount(1M) include ../../Makefile.rootfs -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) SRCDIR = ../common @@ -81,28 +81,16 @@ $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG # not linted SMATCH=off -# There's no lint library for zlib, so only include this when building -$(DYNLIB) := LDLIBS += -lz - -LINTFLAGS += -erroff=E_STATIC_UNUSED -LINTFLAGS64 += -erroff=E_STATIC_UNUSED +LDLIBS += -lz +NATIVE_LIBS += libz.so SRCS= $(OBJS_COMMON:%.o=$(SRCDIR)/%.c) \ $(OBJS_SHARED:%.o=$(SRC)/common/zfs/%.c) -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) - -# lint complains about unused inline functions, even though -# they are "inline", not "static inline", with "extern inline" -# implementations and usage in libzpool. -LINTFLAGS += -erroff=E_STATIC_UNUSED -LINTFLAGS64 += -erroff=E_STATIC_UNUSED .KEEP_STATE: all: $(LIBS) -lint: lintcheck - pics/%.o: ../../../common/zfs/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) diff --git a/usr/src/lib/libzfs_jni/Makefile.com b/usr/src/lib/libzfs_jni/Makefile.com index 693542d081..7d2d4bca6c 100644 --- a/usr/src/lib/libzfs_jni/Makefile.com +++ b/usr/src/lib/libzfs_jni/Makefile.com @@ -40,7 +40,7 @@ OBJECTS= libzfs_jni_dataset.o \ include ../../Makefile.lib -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) INCS += -I$(JAVA_ROOT)/include \ -I$(JAVA_ROOT)/include/solaris @@ -53,12 +53,9 @@ CERRWARN += -_gcc=-Wno-switch SMOFF += all_func_returns SRCDIR = ../common -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) .KEEP_STATE: all: $(LIBS) -lint: lintcheck - include ../../Makefile.targ diff --git a/usr/src/lib/libzonecfg/Makefile.com b/usr/src/lib/libzonecfg/Makefile.com index 38a30b3446..aa7dea9cc9 100644 --- a/usr/src/lib/libzonecfg/Makefile.com +++ b/usr/src/lib/libzonecfg/Makefile.com @@ -28,22 +28,20 @@ OBJECTS= libzonecfg.o getzoneent.o scratchops.o include ../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -lsocket -luuid -lnvpair -lsysevent -lsec -lbrand \ -lpool -lscf -lproc -luutil -lbsm -lsecdb # DYNLIB libraries do not have lint libs and are not linted $(DYNLIB) := LDLIBS += -lxml2 +NATIVE_LIBS += libxml2.so SRCDIR = ../common CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/libxml2 -I$(SRCDIR) -D_REENTRANT CERRWARN += $(CNOWARN_UNINIT) CERRWARN += -_gcc=-Wno-parentheses -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) .KEEP_STATE: all: $(LIBS) -lint: lintcheck - include ../../Makefile.targ diff --git a/usr/src/lib/libzpool/Makefile.com b/usr/src/lib/libzpool/Makefile.com index 9861d99912..82406fe3f7 100644 --- a/usr/src/lib/libzpool/Makefile.com +++ b/usr/src/lib/libzpool/Makefile.com @@ -71,6 +71,7 @@ CFLAGS += $(CCGDEBUG) $(CCVERBOSE) $(CNOGLOBAL) CFLAGS64 += $(CCGDEBUG) $(CCVERBOSE) $(CNOGLOBAL) LDLIBS += -lcmdutils -lumem -lavl -lnvpair -lz -lc -lsysevent -lmd \ -lfakekernel -lzfs +NATIVE_LIBS += libz.so CPPFLAGS.first = -I$(SRC)/lib/libfakekernel/common CPPFLAGS += $(INCS) -DDEBUG -D_FAKE_KERNEL diff --git a/usr/src/lib/policykit/Makefile b/usr/src/lib/policykit/Makefile index b60b67f7a1..fee4bbf9fe 100644 --- a/usr/src/lib/policykit/Makefile +++ b/usr/src/lib/policykit/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 $(SRC)/lib/policykit/Makefile.policykit diff --git a/usr/src/lib/policykit/Makefile.policykit b/usr/src/lib/policykit/Makefile.policykit index e7f2d8a2da..1cecbeb513 100644 --- a/usr/src/lib/policykit/Makefile.policykit +++ b/usr/src/lib/policykit/Makefile.policykit @@ -30,8 +30,9 @@ POLICYKIT_VERSION = 0.2 POLICYKIT_DBUS_CPPFLAGS = -DDBUS_API_SUBJECT_TO_CHANGE \ -I$(ADJUNCT_PROTO)/usr/include/dbus-1.0 \ -I$(ADJUNCT_PROTO)/usr/lib/dbus-1.0/include -POLICYKIT_GLIB_CPPFLAGS = -I$(ADJUNCT_PROTO)/usr/include/glib-2.0 \ +POLICYKIT_GLIB_CPPFLAGS = -I$(ADJUNCT_PROTO)/usr/include/glib-2.0 \ -I$(ADJUNCT_PROTO)/usr/lib/glib-2.0/include POLICYKIT_DBUS_LDLIBS = -ldbus-1 POLICYKIT_GLIB_LDLIBS = -lglib-2.0 +NATIVE_LIBS += libglib-2.0.so diff --git a/usr/src/lib/pylibbe/Makefile.com b/usr/src/lib/pylibbe/Makefile.com index 0776d0dea6..07bacdad88 100644 --- a/usr/src/lib/pylibbe/Makefile.com +++ b/usr/src/lib/pylibbe/Makefile.com @@ -45,6 +45,7 @@ LDLIBS += -lbe -lnvpair -lc CFLAGS += $(CCVERBOSE) CPPFLAGS += -D_FILE_OFFSET_BITS=64 -I../../libbe/common \ -I$(ADJUNCT_PROTO)/usr/include/python$(PYVER)$(PYSUFFIX) +NATIVE_LIBS += libpython$(PYVER)$(PYSUFFIX).so .KEEP_STATE: @@ -54,6 +55,4 @@ all: $(PYOBJS) $(LIBS) install: all $(ROOTPYBEFILES) -lint: lintcheck - include ../../Makefile.targ diff --git a/usr/src/lib/pysolaris/Makefile.com b/usr/src/lib/pysolaris/Makefile.com index 31165206c7..a678360e59 100644 --- a/usr/src/lib/pysolaris/Makefile.com +++ b/usr/src/lib/pysolaris/Makefile.com @@ -44,6 +44,7 @@ C99LMODE= -Xc99=%all LIBS = $(DYNLIB) LDLIBS += -lc -lsec -lidmap -lpython$(PYVER)$(PYSUFFIX) +NATIVE_LIBS += libpython$(PYVER)$(PYSUFFIX).so CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-unused-variable CPPFLAGS += \ @@ -59,6 +60,4 @@ $(ROOTLIBDIR)/%: % $(ROOTLIBDIR)/%: ../common/% $(INS.pyfile) -lint: lintcheck - include ../../Makefile.targ diff --git a/usr/src/lib/pyzfs/Makefile.com b/usr/src/lib/pyzfs/Makefile.com index a7ebf4fe41..7473b27ba9 100644 --- a/usr/src/lib/pyzfs/Makefile.com +++ b/usr/src/lib/pyzfs/Makefile.com @@ -47,6 +47,7 @@ C99LMODE= -Xc99=%all LIBS = $(DYNLIB) LDLIBS += -lc -lnvpair -lpython$(PYVER)$(PYSUFFIX) -lzfs +NATIVE_LIBS += libpython$(PYVER)$(PYSUFFIX).so CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-unused-variable CPPFLAGS += \ @@ -73,6 +74,4 @@ $(ROOTLIBDIR64)/%: % $(ROOTLIBDIR64)/%: ../common/% $(INS.pyfile) -lint: lintcheck - include ../../Makefile.targ diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_diff/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_diff/Makefile index d72a08c6f9..e308d129c7 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_diff/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_diff/Makefile @@ -27,7 +27,7 @@ include $(SRC)/cmd/Makefile.cmd $(TARGETDIR)/$(PROG) := FILEMODE = 0555 CPPFLAGS = -D__EXTENSIONS__ -LDLIBS = -lsocket +LDLIBS += -lsocket $(PROG): $(OBJS) $(LINK.c) $(OBJS) -o $@ $(LDLIBS) diff --git a/usr/src/tools/Makefile.tools b/usr/src/tools/Makefile.tools index 3659548cee..6e51622e65 100644 --- a/usr/src/tools/Makefile.tools +++ b/usr/src/tools/Makefile.tools @@ -54,7 +54,9 @@ CPPFLAGS= -D_TS_ERRNO ELFSIGN_O= $(TRUE) LDLIBS= LDFLAGS= $(MAPFILE.NES:%=-M%) $(MAPFILE.NED:%=-M%) \ - $(MAPFILE.PGA:%=-M%) + $(MAPFILE.PGA:%=-M%) \ + $(ZASSERTDEFLIB)=libc.so \ + $(BDIRECT) # Unset CW_LINKER so we run the default. We don't set LD here to avoid taking # the journey through LD_ALTEXEC unnecessarily. diff --git a/usr/src/tools/btxld/Makefile b/usr/src/tools/btxld/Makefile index 1d18254a59..599cf5f406 100644 --- a/usr/src/tools/btxld/Makefile +++ b/usr/src/tools/btxld/Makefile @@ -28,6 +28,7 @@ MAN1ONBLDFILES= btxld.1onbld SRCS= btxld.c elfh.c version.c $(UTILS_SRC) $(EINFO_SRC) $(EXTRA_SRC) OBJS= btxld.o elfh.o version.o bblk_einfo.o mboot_extra.o boot_utils.o LDLIBS += -lmd5 +NATIVE_LIBS += libmd5.so CSTD= $(CSTD_GNU99) CPPFLAGS += -I$(SRC)/uts/common -I$(COMMON_SRC) diff --git a/usr/src/tools/chk4ubin/Makefile b/usr/src/tools/chk4ubin/Makefile index 5da362350e..1c9d61fcd9 100644 --- a/usr/src/tools/chk4ubin/Makefile +++ b/usr/src/tools/chk4ubin/Makefile @@ -30,8 +30,7 @@ PROG = chk4ubin DYNFLAGS += '-R$$ORIGIN/../../lib/$(MACH)' LDLIBS += -lelf - -LINTFLAGS += -ux +NATIVE_LIBS += libelf.so .KEEP_STATE: @@ -39,8 +38,6 @@ all: $(PROG) install: all .WAIT $(ROOTONBLDMACHPROG) -lint: lint_PROG - clean: $(RM) $(PROG) diff --git a/usr/src/tools/cpcgen/Makefile b/usr/src/tools/cpcgen/Makefile index ec38f80e3d..13da2e0017 100644 --- a/usr/src/tools/cpcgen/Makefile +++ b/usr/src/tools/cpcgen/Makefile @@ -19,6 +19,7 @@ OBJS = cpcgen.o json_nvlist.o custr.o include ../Makefile.tools LDLIBS += -lnvpair +NATIVE_LIBS += libnvpair.so CPPFLAGS += -I$(SRC)/lib/json_nvlist/ -I$(SRC)/lib/libcustr/common all: $(PROG) diff --git a/usr/src/tools/cscope-fast/Makefile b/usr/src/tools/cscope-fast/Makefile index 1cf70de8f4..f675cf0c34 100644 --- a/usr/src/tools/cscope-fast/Makefile +++ b/usr/src/tools/cscope-fast/Makefile @@ -28,7 +28,7 @@ PROG= cscope-fast -OBJS= main.o dir.o crossref.o scanner.o lookup.o command.o display.o \ +OBJS= main.o dir.o crossref.o scanner.o lookup.o command.o display.o \ find.o edit.o exec.o help.o history.o input.o menu.o alloc.o \ cgrep.o compath.o invlib.o logdir.o \ mouse.o mygetenv.o mygetwd.o mypopen.o \ @@ -56,6 +56,7 @@ SMATCH=off CFLAGS += $(CCVERBOSE) LDLIBS += -lcurses -ll +NATIVE_LIBS += libcurses.so libl.so .KEEP_STATE: diff --git a/usr/src/tools/ctf/ctfconvert/Makefile.com b/usr/src/tools/ctf/ctfconvert/Makefile.com index 33268bd979..dd79ce02b0 100644 --- a/usr/src/tools/ctf/ctfconvert/Makefile.com +++ b/usr/src/tools/ctf/ctfconvert/Makefile.com @@ -16,10 +16,12 @@ include ../../Makefile.ctf CFLAGS += $(CCVERBOSE) LDLIBS += -lctf -lelf +NATIVE_LIBS += libelf.so libc.so LDFLAGS = \ -L$(ROOTONBLDLIBMACH) \ '-R$$ORIGIN/../../lib/$(MACH)' \ + $(BDIRECT) $(ZLAZYLOAD) CPPFLAGS += -include ../../common/ctf_headers.h diff --git a/usr/src/tools/ctf/ctfdiff/Makefile.com b/usr/src/tools/ctf/ctfdiff/Makefile.com index 3c5e19fb6e..6ceb863e66 100644 --- a/usr/src/tools/ctf/ctfdiff/Makefile.com +++ b/usr/src/tools/ctf/ctfdiff/Makefile.com @@ -16,10 +16,12 @@ include ../../Makefile.ctf CFLAGS += $(CCVERBOSE) LDLIBS += -lctf +NATIVE_LIBS += libc.so LDFLAGS = \ -L$(ROOTONBLDLIBMACH) \ '-R$$ORIGIN/../../lib/$(MACH)' \ + $(BDIRECT) CPPFLAGS += -include ../../common/ctf_headers.h diff --git a/usr/src/tools/ctf/ctfdump/Makefile.com b/usr/src/tools/ctf/ctfdump/Makefile.com index 66e7a170c4..3efd986e16 100644 --- a/usr/src/tools/ctf/ctfdump/Makefile.com +++ b/usr/src/tools/ctf/ctfdump/Makefile.com @@ -19,10 +19,12 @@ CSTD = $(CSTD_GNU99) C99LMODE = -Xc99=%all CFLAGS += $(CCVERBOSE) LDLIBS += -lctf +NATIVE_LIBS += libctf.so libc.so LDFLAGS = \ -L$(ROOTONBLDLIBMACH) \ '-R$$ORIGIN/../../lib/$(MACH)' \ + $(BDIRECT) CPPFLAGS += -include ../../common/ctf_headers.h diff --git a/usr/src/tools/ctf/ctfmerge/Makefile.com b/usr/src/tools/ctf/ctfmerge/Makefile.com index a073007cb4..84eb3c5969 100644 --- a/usr/src/tools/ctf/ctfmerge/Makefile.com +++ b/usr/src/tools/ctf/ctfmerge/Makefile.com @@ -21,6 +21,7 @@ LDFLAGS += \ -L$(ROOTONBLDLIBMACH) \ '-R$$ORIGIN/../../lib/$(MACH)' \ +NATIVE_LIBS += libelf.so CPPFLAGS += -include ../../common/ctf_headers.h CERRWARN += -_gcc=-Wno-unused-variable CERRWARN += $(CNOWARN_UNINIT) diff --git a/usr/src/tools/ctf/dwarf/Makefile.com b/usr/src/tools/ctf/dwarf/Makefile.com index 52aedda3a7..374dee98f1 100644 --- a/usr/src/tools/ctf/dwarf/Makefile.com +++ b/usr/src/tools/ctf/dwarf/Makefile.com @@ -83,6 +83,7 @@ SMATCH=off DYNFLAGS += '-R$$ORIGIN/../../lib/$(MACH)' LDLIBS = -lelf -lc +NATIVE_LIBS += libelf.so libc.so .KEEP_STATE: .PARALLEL: diff --git a/usr/src/tools/ctf/libctf/Makefile.com b/usr/src/tools/ctf/libctf/Makefile.com index 89769c5521..31b5d19f4d 100644 --- a/usr/src/tools/ctf/libctf/Makefile.com +++ b/usr/src/tools/ctf/libctf/Makefile.com @@ -26,6 +26,7 @@ CPPFLAGS += -I$(SRC)/lib/libctf/common/ \ -DCTF_OLD_VERSIONS \ -DCTF_TOOLS_BUILD LDLIBS += -lc -lelf -L$(ROOTONBLDLIBMACH) -ldwarf -lavl +NATIVE_LIBS += libelf.so libavl.so libc.so DYNFLAGS += '-R$$ORIGIN/../../lib/$(MACH)' .KEEP_STATE: diff --git a/usr/src/tools/ctf/stabs/Makefile.com b/usr/src/tools/ctf/stabs/Makefile.com index 97d9cddb77..901acd2584 100644 --- a/usr/src/tools/ctf/stabs/Makefile.com +++ b/usr/src/tools/ctf/stabs/Makefile.com @@ -39,16 +39,15 @@ SRCS = \ include ../../Makefile.ctf LDLIBS += -lctf +NATIVE_LIBS += libctf.so OBJS = $(SRCS:%.c=%.o) -LINTFILES = $(SRCS:%.c=%.ln) -LINTFLAGS = -mnux -L$(ROOT)/usr/lib CERRWARN += $(CNOWARN_UNINIT) CERRWARN += -_gcc=-Wno-unused .NO_PARALLEL: -.PARALLEL: $(OBJS) $(LINTFILES) +.PARALLEL: $(OBJS) all: $(PROG) @@ -66,10 +65,4 @@ install: $(ROOTONBLDMACHPROG) clean: $(RM) $(OBJS) $(LINTFILES) -%.ln: ../common/%.c - $(LINT.c) -c $< - -lint: $(LINTFILES) - $(LINT) $(LINTFLAGS) $(LINTFILES) $(LDLIBS) - include ../../Makefile.ctf.targ diff --git a/usr/src/tools/cw/Makefile b/usr/src/tools/cw/Makefile index 00099cb2e5..0d0908a6a5 100644 --- a/usr/src/tools/cw/Makefile +++ b/usr/src/tools/cw/Makefile @@ -44,9 +44,12 @@ $(__GNUC)CFLAGS= -O -D__sun -Wall -Wno-unknown-pragmas -Werror \ $(__SUNC)CFLAGS= -xspace -Xa -xildoff -errtags=yes -errwarn=%all \ -xc99=%all -W0,-xglobalstatic -v - -$(__GNUC)LDLIBS += -lc +$(__GNUC)LDLIBS += -Wl,-zassert-deflib=libc.so -lc $(__GNUC)LDFLAGS= $(MAPFILE.NES:%=-Wl,-M%) +$(__GNUC)ZASSERTDEFLIB = -Wl,-zassert-deflib +$(__GNUC)ZFATALWARNINGS = -Wl,-zfatal-warnings +$(__GNUC)ZGUIDANCE = -Wl,-zguidance +LDFLAGS += -Wl,$(ZDIRECT) $(ROOTONBLDMAN1ONBLDFILES) := FILEMODE= 644 CSTD= $(CSTD_GNU99) diff --git a/usr/src/tools/install.bin/Makefile b/usr/src/tools/install.bin/Makefile index 6f20638a56..4643068a48 100644 --- a/usr/src/tools/install.bin/Makefile +++ b/usr/src/tools/install.bin/Makefile @@ -34,6 +34,7 @@ CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-type-limits CPPFLAGS += -I../protocmp LDLIBS += -lgen +NATIVE_LIBS += libgen.so CLEANFILES += $(OBJS) # Assume we don't have the install.bin available yet diff --git a/usr/src/tools/make/bin/Makefile b/usr/src/tools/make/bin/Makefile index 0a65f0a4c2..e67decf357 100644 --- a/usr/src/tools/make/bin/Makefile +++ b/usr/src/tools/make/bin/Makefile @@ -37,6 +37,7 @@ include ../Makefile.com LDLIBS += ../lib/mksh/libmksh.a ../lib/vroot/libvroot.a LDLIBS += ../lib/bsd/libbsd.a -lc -lnsl -lumem +NATIVE_LIBS += libnsl.so libumem.so CPPFLAGS += -D_FILE_OFFSET_BITS=64 diff --git a/usr/src/tools/make/lib/makestate/Makefile.com b/usr/src/tools/make/lib/makestate/Makefile.com index 338cdf7a27..a503ef5775 100644 --- a/usr/src/tools/make/lib/makestate/Makefile.com +++ b/usr/src/tools/make/lib/makestate/Makefile.com @@ -25,6 +25,7 @@ LIBS = $(DYNLIB) SRCDIR = $(SRC)/cmd/make/lib/makestate MAPFILES = $(SRCDIR)/mapfile-vers LDLIBS += -lc +NATIVE_LIBS += libc.so FILEMODE= 755 diff --git a/usr/src/tools/makesoftcore/Makefile b/usr/src/tools/makesoftcore/Makefile index 36c60aa8d3..44b3f09b8d 100644 --- a/usr/src/tools/makesoftcore/Makefile +++ b/usr/src/tools/makesoftcore/Makefile @@ -26,6 +26,7 @@ CPPFLAGS += -I../../uts/common OBJS= makesoftcore.o lz4.o SRCS= makesoftcore.c $(LZ4)/lz4.c LDLIBS= -lumem +NATIVE_LIBS += libumem.so # not linted SMOFF += all_func_returns @@ -40,7 +41,7 @@ clean: $(RM) $(PROG) $(OBJS) $(PROG): $(OBJS) - $(LINK.c) $(OBJS) -o $@ $(LDLIBS) + $(LINK.c) -o $@ $(OBJS) $(LDLIBS) $(POST_PROCESS) %.o: $(SOFTCORE)/%.c diff --git a/usr/src/tools/sgs/ld/Makefile b/usr/src/tools/sgs/ld/Makefile index fc802dea0e..b8e7b32ffd 100644 --- a/usr/src/tools/sgs/ld/Makefile +++ b/usr/src/tools/sgs/ld/Makefile @@ -27,6 +27,7 @@ include ../../Makefile.tools include $(SGSHOME)/ld/Makefile.com LDLIBS = -L../libconv -L$(ROOTONBLDLIBMACH) -lld -lelf -lconv +NATIVE_LIBS += libc.so CPPFLAGS = $(NATIVE_CPPFLAGS) CFLAGS = $(NATIVE_CFLAGS) MAPFILES = $(SRCDIR)/common/mapfile-intf diff --git a/usr/src/tools/sgs/libelf/Makefile b/usr/src/tools/sgs/libelf/Makefile index 2ee8dfeb48..d90cb937c0 100644 --- a/usr/src/tools/sgs/libelf/Makefile +++ b/usr/src/tools/sgs/libelf/Makefile @@ -31,6 +31,7 @@ CONVLIBDIR = -L../libconv CPPFLAGS = $(NATIVE_CPPFLAGS) CFLAGS = $(NATIVE_CFLAGS) SGSMSGTARG += $(SGSMSG32) +NATIVE_LIBS += libc.so CW_LINKER = .KEEP_STATE: diff --git a/usr/src/tools/sgs/libld/Makefile b/usr/src/tools/sgs/libld/Makefile index bc5ebb73e8..2760ed34dc 100644 --- a/usr/src/tools/sgs/libld/Makefile +++ b/usr/src/tools/sgs/libld/Makefile @@ -37,6 +37,7 @@ CPPFLAGS = $(NATIVE_CPPFLAGS) -DUSE_LIBLD_MALLOC -I$(SRC)/lib/libc/inc \ -I$(SRC)/uts/common/krtld -I$(SRC)/uts/sparc \ $(VAR_LIBLD_CPPFLAGS) LDLIBS += -L$(ROOTONBLDLIBMACH) -L../libconv -lconv -llddbg -lelf -lc +NATIVE_LIBS += libc.so DYNFLAGS += $(VERSREF) '-R$$ORIGIN' CFLAGS = $(NATIVE_CFLAGS) diff --git a/usr/src/tools/sgs/liblddbg/Makefile b/usr/src/tools/sgs/liblddbg/Makefile index f2bdd55c81..b15dd2f33c 100644 --- a/usr/src/tools/sgs/liblddbg/Makefile +++ b/usr/src/tools/sgs/liblddbg/Makefile @@ -34,7 +34,8 @@ CPPFLAGS = $(NATIVE_CPPFLAGS) -I$(SRC)/lib/libc/inc CFLAGS = $(NATIVE_CFLAGS) DYNFLAGS += -L../libconv SGSMSGTARG += $(SGSMSG32) -CW_LINKER= +NATIVE_LIBS += libc.so +CW_LINKER = all: $(DYNLIB) $(LIBLINKS) diff --git a/usr/src/tools/sgs/sgsmsg/Makefile b/usr/src/tools/sgs/sgsmsg/Makefile index e808245030..ecde42eb3c 100644 --- a/usr/src/tools/sgs/sgsmsg/Makefile +++ b/usr/src/tools/sgs/sgsmsg/Makefile @@ -54,6 +54,7 @@ FILEMODE= 0755 CPPFLAGS = $(NATIVE_CPPFLAGS) CFLAGS = $(NATIVE_CFLAGS) +NATIVE_LIBS += libc.so CW_LINKER = # not linted diff --git a/usr/src/tools/smatch/Makefile b/usr/src/tools/smatch/Makefile index 902c874624..8b3e401b93 100644 --- a/usr/src/tools/smatch/Makefile +++ b/usr/src/tools/smatch/Makefile @@ -31,7 +31,12 @@ sparc_CC = $(GNUC_ROOT)/bin/gcc i386_SMATCHFLAGS = -msave-args sparc_SMATCHFLAGS = +# When we use builtins, then ld's -zguidance will complain that libm is +# unused on x86 because the compiler will replace ceil(3M) with its own copy. +# However, on SPARC, it doesn't. So for now we disable builtins to make it +# consistent. CFLAGS = -O -m64 -std=gnu99 -nodefaultlibs -D__sun $($(MACH)_SMATCHFLAGS) +CFLAGS += -fno-builtin CFLAGS += -Wall -Wno-unknown-pragmas -Wno-psabi SMATCHDATADIR = $(ROOTONBLDSHARE)/smatch @@ -40,7 +45,8 @@ CFLAGS += -DSMATCHDATADIR='"$(SMATCHDATADIR)"' CFLAGS += -DGCC_BASE='"/no/such/dir"' CFLAGS += -DMULTIARCH_TRIPLET=NULL -LDLIBS += -lsqlite3 -lcrypto -lm -lgcc -lc +LDCHECKS = -Wl,$(ZASSERTDEFLIB) -Wl,$(ZGUIDANCE) -Wl,$(ZFATALWARNINGS) +LDLIBS += -Wl,$(ZLAZYLOAD) -Wl,$(ZDIRECT) -lsqlite3 -lcrypto -lgcc -lm -lc LDFLAGS = $(MAPFILE.NES:%=-Wl,-M%) LDFLAGS += -L$(NATIVE_ADJUNCT)/lib -R$(NATIVE_ADJUNCT)/lib diff --git a/usr/src/tools/stabs/Makefile b/usr/src/tools/stabs/Makefile index 4fea2c5c60..7b00f489d0 100644 --- a/usr/src/tools/stabs/Makefile +++ b/usr/src/tools/stabs/Makefile @@ -23,8 +23,6 @@ # Copyright (c) 1996-1998 by Sun Microsystems, Inc. # All rights reserved. # -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.tools @@ -32,7 +30,6 @@ all:= TARGET= all install:= TARGET= install clean:= TARGET= clean clobber:= TARGET= clobber -lint:= TARGET= lint SUBDIRS_sparc = sparc @@ -45,7 +42,6 @@ all: $(SUBDIRS) install: $(SUBDIRS) clean: $(SUBDIRS) clobber: $(SUBDIRS) -lint: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/tools/stabs/sparc/Makefile b/usr/src/tools/stabs/sparc/Makefile index 56f04afba0..671caf6b7b 100644 --- a/usr/src/tools/stabs/sparc/Makefile +++ b/usr/src/tools/stabs/sparc/Makefile @@ -29,12 +29,11 @@ STABS_SRC = .. # Define the module and object file sets. # STABS_PROG = stabs # name doesn't conflict with Makefile.master STABS -PROG = stabs # name doesn't conflict with Makefile.master STABS +PROG = stabs # name doesn't conflict with Makefile.master STABS STABS_SRCS = $(STABS_SRC)/main.c $(STABS_SRC)/stabs.c \ $(STABS_SRC)/forth.c $(STABS_SRC)/genassym.c \ $(STABS_SRC)/squander.c STABS_OBJS = $(STABS_SRCS:$(STABS_SRC)/%.c=%.o) -LINTS = $(STABS_OBJS:%.o=%.ln) SRCS = $(STABS_SRCS) OBJECTS = $(STABS_OBJS) @@ -50,7 +49,10 @@ FILEMODE = 555 CFLAGS += $(CCVERBOSE) -INC_PATH = -I$(STABS_SRC) +INC_PATH = -I$(STABS_SRC) + +LDLIBS += -lm +NATIVE_LIBS += libm.so # # Default build targets. @@ -63,17 +65,11 @@ all: $(STABS_PROG) install: all .WAIT $(ROOTONBLDMACHPROG) -lint: $(SRCS) - @$(LINT) $(LINTFLAGS) $(SRCS) - clean: $(RM) $(CLEANFILES) -clean.lint: - $(RM) $(LINTS) - $(STABS_PROG): $(STABS_OBJS) - $(LINK.c) -o $@ $(STABS_OBJS) -lm + $(LINK.c) -o $@ $(STABS_OBJS) $(LDLIBS) $(POST_PROCESS) %.o: $(STABS_SRC)/%.c diff --git a/usr/src/tools/tic/Makefile b/usr/src/tools/tic/Makefile index eae6ad29b0..90235be144 100644 --- a/usr/src/tools/tic/Makefile +++ b/usr/src/tools/tic/Makefile @@ -31,6 +31,7 @@ include $(SRC)/tools/Makefile.tools include $(CMDDIR)/Makefile.common MAPFILES= $(CMDDIR)/$(MAPFILE.INT) +NATIVE_LIBS += libcurses.so .KEEP_STATE: diff --git a/usr/src/tools/tokenize/Makefile b/usr/src/tools/tokenize/Makefile index e1ee198e9e..b9c4b0f94a 100644 --- a/usr/src/tools/tokenize/Makefile +++ b/usr/src/tools/tokenize/Makefile @@ -41,6 +41,7 @@ MAPFILES = DYNFLAGS += $(ZINTERPOSE) LDLIBS = -lc +NATIVE_LIBS += libc.so ASFLAGS += -P -D_ASM diff --git a/usr/src/tools/vtfontcvt/Makefile b/usr/src/tools/vtfontcvt/Makefile index 1da0698b5e..49e996a908 100644 --- a/usr/src/tools/vtfontcvt/Makefile +++ b/usr/src/tools/vtfontcvt/Makefile @@ -18,6 +18,7 @@ CMDDIR= $(SRC)/cmd/vtfontcvt include ../Makefile.tools include $(CMDDIR)/Makefile.common +NATIVE_LIBS += libumem.so CPPFLAGS += -I../../uts/common .KEEP_STATE: diff --git a/usr/src/ucbcmd/Makefile.ucbcmd b/usr/src/ucbcmd/Makefile.ucbcmd index 5eb4ee73e7..d8d43c44d2 100644 --- a/usr/src/ucbcmd/Makefile.ucbcmd +++ b/usr/src/ucbcmd/Makefile.ucbcmd @@ -68,7 +68,8 @@ LDLIBS = $(LDLIBS.cmd) LDFLAGS.cmd = \ $(ENVLDFLAGS1) $(ENVLDFLAGS2) $(ENVLDFLAGS3) \ - $(MAPFILE.NES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%) + $(MAPFILE.NES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%) \ + $(BDIRECT) LDFLAGS = $(LDFLAGS.cmd) diff --git a/usr/src/ucbcmd/basename/Makefile b/usr/src/ucbcmd/basename/Makefile index b364c97a47..483e4e3056 100644 --- a/usr/src/ucbcmd/basename/Makefile +++ b/usr/src/ucbcmd/basename/Makefile @@ -19,9 +19,6 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1989 by Sun Microsystems, Inc. # @@ -33,12 +30,10 @@ FILEMODE= 755 .KEEP_STATE: -all: $(PROG) +all: $(PROG) install: all $(ROOTPROG) clean: -lint: lint_PROG - include ../Makefile.ucbtarg diff --git a/usr/src/ucbcmd/biff/Makefile b/usr/src/ucbcmd/biff/Makefile index 1fdf222478..749259a458 100644 --- a/usr/src/ucbcmd/biff/Makefile +++ b/usr/src/ucbcmd/biff/Makefile @@ -19,9 +19,6 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" /* SVr4.0 -# PROG= biff @@ -31,12 +28,10 @@ FILEMODE= 755 .KEEP_STATE: -all: $(PROG) +all: $(PROG) install: all $(ROOTPROG) clean: -lint: lint_PROG - include ../Makefile.ucbtarg diff --git a/usr/src/ucbcmd/chown/Makefile b/usr/src/ucbcmd/chown/Makefile index 7c1ba6f850..a27c3e0259 100644 --- a/usr/src/ucbcmd/chown/Makefile +++ b/usr/src/ucbcmd/chown/Makefile @@ -43,6 +43,4 @@ install: all $(ROOTPROG) clean: -lint: lint_PROG - include ../Makefile.ucbtarg diff --git a/usr/src/ucbcmd/df/Makefile b/usr/src/ucbcmd/df/Makefile index 84ca9221c4..ae2b7aa0cc 100644 --- a/usr/src/ucbcmd/df/Makefile +++ b/usr/src/ucbcmd/df/Makefile @@ -19,13 +19,10 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1989 by Sun Microsystems, Inc. # -PROG= df +PROG= df include ../Makefile.ucbcmd @@ -33,12 +30,10 @@ FILEMODE= 755 .KEEP_STATE: -all: $(PROG) +all: $(PROG) install: all $(ROOTPROG) clean: -lint: - include ../Makefile.ucbtarg diff --git a/usr/src/ucbcmd/du/Makefile b/usr/src/ucbcmd/du/Makefile index c90380447e..39369a00c6 100644 --- a/usr/src/ucbcmd/du/Makefile +++ b/usr/src/ucbcmd/du/Makefile @@ -19,13 +19,10 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1989 by Sun Microsystems, Inc. # -PROG= du +PROG= du include ../Makefile.ucbcmd @@ -33,12 +30,10 @@ FILEMODE= 755 .KEEP_STATE: -all: $(PROG) +all: $(PROG) install: all $(ROOTPROG) clean: -lint: - include ../Makefile.ucbtarg diff --git a/usr/src/ucbcmd/echo/Makefile b/usr/src/ucbcmd/echo/Makefile index ccfdb759a0..60aced26a3 100644 --- a/usr/src/ucbcmd/echo/Makefile +++ b/usr/src/ucbcmd/echo/Makefile @@ -19,9 +19,6 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1989 by Sun Microsystems, Inc. # @@ -33,12 +30,10 @@ FILEMODE= 755 .KEEP_STATE: -all: $(PROG) +all: $(PROG) install: all $(ROOTPROG) clean: -lint: lint_PROG - include ../Makefile.ucbtarg diff --git a/usr/src/ucbcmd/expr/Makefile b/usr/src/ucbcmd/expr/Makefile index 83bc7561ed..cf2cc48442 100644 --- a/usr/src/ucbcmd/expr/Makefile +++ b/usr/src/ucbcmd/expr/Makefile @@ -36,12 +36,10 @@ LDFLAGS += $(MAPFILE.NGB:%=-M%) .KEEP_STATE: -all: $(PROG) +all: $(PROG) install: all $(ROOTPROG) clean: -lint: lint_PROG - include ../Makefile.ucbtarg diff --git a/usr/src/ucbcmd/fastboot/Makefile b/usr/src/ucbcmd/fastboot/Makefile index da92928022..9cb0a20835 100644 --- a/usr/src/ucbcmd/fastboot/Makefile +++ b/usr/src/ucbcmd/fastboot/Makefile @@ -19,8 +19,6 @@ # # CDDL HEADER END # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -37,6 +35,4 @@ install: all $(ROOTBIN) $(ROOTPROG) clean: -lint: - include ../Makefile.ucbtarg diff --git a/usr/src/ucbcmd/fasthalt/Makefile b/usr/src/ucbcmd/fasthalt/Makefile index 1ef17093f1..66025c5674 100644 --- a/usr/src/ucbcmd/fasthalt/Makefile +++ b/usr/src/ucbcmd/fasthalt/Makefile @@ -19,8 +19,6 @@ # # CDDL HEADER END # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -37,6 +35,4 @@ install: all $(ROOTBIN) $(ROOTPROG) clean: -lint: - include ../Makefile.ucbtarg diff --git a/usr/src/ucbcmd/file/Makefile b/usr/src/ucbcmd/file/Makefile index 582d15ce4f..9e83bf47d6 100644 --- a/usr/src/ucbcmd/file/Makefile +++ b/usr/src/ucbcmd/file/Makefile @@ -19,8 +19,6 @@ # # CDDL HEADER END # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -37,6 +35,4 @@ install: all $(ROOTBIN) $(ROOTPROG) clean: -lint: - include ../Makefile.ucbtarg diff --git a/usr/src/ucbcmd/from/Makefile b/usr/src/ucbcmd/from/Makefile index 4471e6379b..45595273d3 100644 --- a/usr/src/ucbcmd/from/Makefile +++ b/usr/src/ucbcmd/from/Makefile @@ -33,12 +33,10 @@ CERRWARN += -_gcc=-Wno-parentheses .KEEP_STATE: -all: $(PROG) +all: $(PROG) install: all $(ROOTPROG) clean: -lint: lint_PROG - include ../Makefile.ucbtarg diff --git a/usr/src/ucbcmd/groups/Makefile b/usr/src/ucbcmd/groups/Makefile index c0759fe2dd..1db116ac01 100644 --- a/usr/src/ucbcmd/groups/Makefile +++ b/usr/src/ucbcmd/groups/Makefile @@ -34,12 +34,10 @@ CERRWARN += -_gcc=-Wno-parentheses .KEEP_STATE: -all: $(PROG) +all: $(PROG) install: all $(ROOTPROG) clean: -lint: lint_PROG - include ../Makefile.ucbtarg diff --git a/usr/src/ucbcmd/install.d/Makefile b/usr/src/ucbcmd/install.d/Makefile index fef3ba8707..cd69c3230d 100644 --- a/usr/src/ucbcmd/install.d/Makefile +++ b/usr/src/ucbcmd/install.d/Makefile @@ -45,7 +45,7 @@ POFILE= install.po .KEEP_STATE: -all: $(PROG) +all: $(PROG) $(PROG): $(PROGSRC) $(LINK.c) $(PROGSRC) -o $@ $(LDLIBS) @@ -57,6 +57,4 @@ install: all $(ROOTPROG) clean: -lint: lint_PROG - include ../Makefile.ucbtarg diff --git a/usr/src/ucbcmd/ln/Makefile b/usr/src/ucbcmd/ln/Makefile index 3eed7f4896..8fdea53749 100644 --- a/usr/src/ucbcmd/ln/Makefile +++ b/usr/src/ucbcmd/ln/Makefile @@ -35,12 +35,10 @@ CERRWARN += -_gcc=-Wno-unused-label .KEEP_STATE: -all: $(PROG) +all: $(PROG) install: all $(ROOTPROG) clean: -lint: lint_PROG - include ../Makefile.ucbtarg diff --git a/usr/src/ucbcmd/ls/Makefile b/usr/src/ucbcmd/ls/Makefile index d14cba8845..c2deebfe5f 100644 --- a/usr/src/ucbcmd/ls/Makefile +++ b/usr/src/ucbcmd/ls/Makefile @@ -38,12 +38,10 @@ FILEMODE= 755 .KEEP_STATE: -all: $(PROG) +all: $(PROG) install: all $(ROOTPROG) clean: -lint: lint_PROG - include ../Makefile.ucbtarg diff --git a/usr/src/ucbcmd/mkstr/Makefile b/usr/src/ucbcmd/mkstr/Makefile index d4a73d44f2..0689c0d1e6 100644 --- a/usr/src/ucbcmd/mkstr/Makefile +++ b/usr/src/ucbcmd/mkstr/Makefile @@ -41,6 +41,4 @@ install: all $(ROOTPROG) clean: -lint: lint_PROG - include ../Makefile.ucbtarg diff --git a/usr/src/ucbcmd/printenv/Makefile b/usr/src/ucbcmd/printenv/Makefile index 4fa3e209de..15053d4a82 100644 --- a/usr/src/ucbcmd/printenv/Makefile +++ b/usr/src/ucbcmd/printenv/Makefile @@ -19,9 +19,6 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1989 by Sun Microsystems, Inc. # @@ -33,12 +30,10 @@ FILEMODE= 755 .KEEP_STATE: -all: $(PROG) +all: $(PROG) install: all $(ROOTPROG) clean: -lint: lint_PROG - include ../Makefile.ucbtarg diff --git a/usr/src/ucbcmd/rusage/Makefile b/usr/src/ucbcmd/rusage/Makefile index 23b44d6b90..82305f8e2b 100644 --- a/usr/src/ucbcmd/rusage/Makefile +++ b/usr/src/ucbcmd/rusage/Makefile @@ -52,7 +52,5 @@ install: all $(ROOTPROG) clean: -lint: lint_PROG - include ../Makefile.ucbtarg diff --git a/usr/src/ucbcmd/sed/Makefile b/usr/src/ucbcmd/sed/Makefile index 1a801f689c..9c3f25db01 100644 --- a/usr/src/ucbcmd/sed/Makefile +++ b/usr/src/ucbcmd/sed/Makefile @@ -46,9 +46,7 @@ $(PROG): $(OBJS) install: all $(ROOTPROG) -clean: +clean: $(RM) $(OBJS) -lint: lint_SRCS - include ../Makefile.ucbtarg diff --git a/usr/src/ucbcmd/shutdown/Makefile b/usr/src/ucbcmd/shutdown/Makefile index b170ea6df8..56a070b65e 100644 --- a/usr/src/ucbcmd/shutdown/Makefile +++ b/usr/src/ucbcmd/shutdown/Makefile @@ -45,7 +45,7 @@ XGETFLAGS += -a -x shutdown.xcl .KEEP_STATE: -all: $(PROG) +all: $(PROG) $(PROG): $(PROGOBJS) $(LINK.c) $(PROGOBJS) -o $@ $(LDLIBS) @@ -56,6 +56,4 @@ install: all $(ROOTPROG) clean: $(RM) $(PROGOBJS) -lint: lint_PROG - include ../Makefile.ucbtarg diff --git a/usr/src/ucbcmd/stty/Makefile b/usr/src/ucbcmd/stty/Makefile index 2e4da9e793..cc66a9f5ae 100644 --- a/usr/src/ucbcmd/stty/Makefile +++ b/usr/src/ucbcmd/stty/Makefile @@ -36,7 +36,7 @@ CERRWARN += -_gcc=-Wno-parentheses .KEEP_STATE: -all: $(PROG) +all: $(PROG) $(PROG): $(OBJS) $(LINK.c) $(OBJS) -o $@ $(LDLIBS) @@ -47,6 +47,4 @@ install: all $(ROOTPROG) clean: -$(RM) $(OBJS) -lint: lint_PROG - include ../Makefile.ucbtarg diff --git a/usr/src/ucbcmd/sum/Makefile b/usr/src/ucbcmd/sum/Makefile index 4d9b9a556e..85001fc61e 100644 --- a/usr/src/ucbcmd/sum/Makefile +++ b/usr/src/ucbcmd/sum/Makefile @@ -19,9 +19,6 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1989,1996 by Sun Microsystems, Inc. # All rights reserved. # @@ -35,12 +32,10 @@ CPPFLAGS += -D_FILE_OFFSET_BITS=64 .KEEP_STATE: -all: $(PROG) +all: $(PROG) install: all $(ROOTPROG) clean: -lint: lint_PROG - include ../Makefile.ucbtarg diff --git a/usr/src/ucbcmd/test/Makefile b/usr/src/ucbcmd/test/Makefile index 1d07eb4854..61239d2a68 100644 --- a/usr/src/ucbcmd/test/Makefile +++ b/usr/src/ucbcmd/test/Makefile @@ -36,12 +36,10 @@ CERRWARN += -_gcc=-Wno-parentheses .KEEP_STATE: -all: $(PROG) +all: $(PROG) install: all $(ROOTPROG) clean: -lint: lint_PROG - include ../Makefile.ucbtarg diff --git a/usr/src/ucbcmd/touch/Makefile b/usr/src/ucbcmd/touch/Makefile index 798988d2e4..bf8266257c 100644 --- a/usr/src/ucbcmd/touch/Makefile +++ b/usr/src/ucbcmd/touch/Makefile @@ -35,12 +35,10 @@ CERRWARN += -_gcc=-Wno-implicit-function-declaration .KEEP_STATE: -all: $(PROG) +all: $(PROG) install: all $(ROOTPROG) clean: -lint: lint_PROG - include ../Makefile.ucbtarg diff --git a/usr/src/ucbcmd/tr/Makefile b/usr/src/ucbcmd/tr/Makefile index b7465117bb..2e6e97f6f4 100644 --- a/usr/src/ucbcmd/tr/Makefile +++ b/usr/src/ucbcmd/tr/Makefile @@ -34,12 +34,10 @@ CERRWARN += -_gcc=-Wno-parentheses .KEEP_STATE: -all: $(PROG) +all: $(PROG) install: all $(ROOTPROG) clean: -lint: lint_PROG - include ../Makefile.ucbtarg diff --git a/usr/src/ucbcmd/tset/Makefile b/usr/src/ucbcmd/tset/Makefile index 50dc7c0409..7c6dbe5e90 100644 --- a/usr/src/ucbcmd/tset/Makefile +++ b/usr/src/ucbcmd/tset/Makefile @@ -59,6 +59,4 @@ $(ROOTSYMLINK): clean: -lint: lint_PROG - include ../Makefile.ucbtarg diff --git a/usr/src/ucbcmd/users/Makefile b/usr/src/ucbcmd/users/Makefile index e1c9c18914..7933ae5fa7 100644 --- a/usr/src/ucbcmd/users/Makefile +++ b/usr/src/ucbcmd/users/Makefile @@ -19,9 +19,6 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1989 by Sun Microsystems, Inc. # @@ -33,12 +30,10 @@ FILEMODE= 755 .KEEP_STATE: -all: $(PROG) +all: $(PROG) install: all $(ROOTPROG) clean: -lint: lint_PROG - include ../Makefile.ucbtarg diff --git a/usr/src/ucbcmd/vipw/Makefile b/usr/src/ucbcmd/vipw/Makefile index 2df968d9b7..7ace49a99e 100644 --- a/usr/src/ucbcmd/vipw/Makefile +++ b/usr/src/ucbcmd/vipw/Makefile @@ -51,6 +51,4 @@ install: all $(ROOTPROG) clean: -lint: lint_PROG - include ../Makefile.ucbtarg diff --git a/usr/src/ucbcmd/whereis/Makefile b/usr/src/ucbcmd/whereis/Makefile index decddebb18..444e4571a3 100644 --- a/usr/src/ucbcmd/whereis/Makefile +++ b/usr/src/ucbcmd/whereis/Makefile @@ -39,6 +39,4 @@ install: all $(ROOTPROG) clean: -lint: lint_PROG - include ../Makefile.ucbtarg diff --git a/usr/src/ucbcmd/whoami/Makefile b/usr/src/ucbcmd/whoami/Makefile index 02cb1a6811..86fb30ebfc 100644 --- a/usr/src/ucbcmd/whoami/Makefile +++ b/usr/src/ucbcmd/whoami/Makefile @@ -19,9 +19,6 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -30,21 +27,16 @@ PROG= whoami include ../Makefile.ucbcmd -CFLAGS += $(CCVERBOSE) - XGETFLAGS += -a -x rmdir.xcl - FILEMODE= 755 .KEEP_STATE: -all: $(PROG) +all: $(PROG) install: all $(ROOTPROG) clean: -lint: lint_PROG - include ../Makefile.ucbtarg |