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 /usr/src/cmd | |
| 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>
Diffstat (limited to 'usr/src/cmd')
63 files changed, 114 insertions, 194 deletions
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 |