diff options
| author | Yuri Pankov <yuri.pankov@nexenta.com> | 2018-02-05 08:52:36 +0300 |
|---|---|---|
| committer | Hans Rosenfeld <hans.rosenfeld@joyent.com> | 2018-02-06 14:27:39 +0100 |
| commit | bd0ce624be4492bab2f6c53383a40618647aba28 (patch) | |
| tree | abf4de26cdc58c35712e9b10380643e048498772 /usr/src/cmd | |
| parent | 9a67df4bb0ad84bdbd1a1441f5ddef328cc000f0 (diff) | |
| download | illumos-joyent-bd0ce624be4492bab2f6c53383a40618647aba28.tar.gz | |
9027 Makefiles need to specify C99 mode consistently
Reviewed by: Rich Lowe <richlowe@richlowe.net>
Approved by: Hans Rosenfeld <hans.rosenfeld@joyent.com>
Diffstat (limited to 'usr/src/cmd')
115 files changed, 125 insertions, 148 deletions
diff --git a/usr/src/cmd/boot/bootadm/Makefile b/usr/src/cmd/boot/bootadm/Makefile index ad060b375c..b25c45ce04 100644 --- a/usr/src/cmd/boot/bootadm/Makefile +++ b/usr/src/cmd/boot/bootadm/Makefile @@ -51,7 +51,7 @@ CFLAGS += $(XSTRCONST) CPPFLAGS += -D_FILE_OFFSET_BITS=64 CPPFLAGS += -I$(SRC)/uts/common -I$(SRC)/common -I$(SRC)/common/ficl -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LINTFLAGS += -erroff=E_INCONS_ARG_DECL2 LINTFLAGS += -erroff=E_INCONS_VAL_TYPE_DECL2 diff --git a/usr/src/cmd/boot/installboot/Makefile.com b/usr/src/cmd/boot/installboot/Makefile.com index 566e48c42a..1cd8454078 100644 --- a/usr/src/cmd/boot/installboot/Makefile.com +++ b/usr/src/cmd/boot/installboot/Makefile.com @@ -37,7 +37,7 @@ CPPFLAGS += -I$(SRC)/uts/common LDLIBS += -lmd5 -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN diff --git a/usr/src/cmd/boot/installgrub/Makefile b/usr/src/cmd/boot/installgrub/Makefile index 56dfeac536..3269e7d7ef 100644 --- a/usr/src/cmd/boot/installgrub/Makefile +++ b/usr/src/cmd/boot/installgrub/Makefile @@ -55,7 +55,7 @@ LINTFLAGS += \ -xerroff=E_NAME_DEF_NOT_USED2 -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile b/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile index 293a4f5976..24028e7f42 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile +++ b/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile @@ -23,7 +23,7 @@ include ../../Makefile.cmd-inet OBJS= ClientCommon.o dns-sd.o SRCS= ClientCommon.c dns-sd.c -CFLAGS += $(C99_ENABLE) +CFLAGS += $(CSTD_GNU99) CPPFLAGS += -DMDNS_VERSIONSTR_NODTS LDLIBS += -lsocket -ldns_sd diff --git a/usr/src/cmd/cmd-inet/usr.lib/ilbd/Makefile b/usr/src/cmd/cmd-inet/usr.lib/ilbd/Makefile index d00653d4eb..2648c7cf05 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/ilbd/Makefile +++ b/usr/src/cmd/cmd-inet/usr.lib/ilbd/Makefile @@ -53,7 +53,7 @@ CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-unused-label -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) # I18n POFILE = $(ILBD).po diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/Makefile b/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/Makefile index 7f08f59b90..f28c630ac3 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/Makefile +++ b/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/Makefile @@ -36,7 +36,7 @@ ROOTCMDDIR = $(ROOT)/lib/inet POFILE = $(PROG).po POFILES = $(SRCS:%.c=%.po) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) # # We need access to the ancillary data features which are only available diff --git a/usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile b/usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile index 128bb637b4..e110c4ef48 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile +++ b/usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile @@ -68,7 +68,7 @@ $(PROG): $(OBJS) include ../Makefile.lib -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CPPFLAGS += -D_REENTRANT $(MDNSFLAGS) -I$(CMN_DIR) LDLIBS += -lsocket -lnsl diff --git a/usr/src/cmd/cmd-inet/usr.lib/vrrpd/Makefile b/usr/src/cmd/cmd-inet/usr.lib/vrrpd/Makefile index 12a621d55f..0039ea5f6a 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/vrrpd/Makefile +++ b/usr/src/cmd/cmd-inet/usr.lib/vrrpd/Makefile @@ -37,7 +37,7 @@ $(ROOTETC)/inet/$(CFGFILES):= FILEMODE= 644 $(ROOTETC)/inet/$(CFGFILES):= OWNER= root $(ROOTETC)/inet/$(CFGFILES):= GROUP= sys -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) # # We need access to the ancillary data features which are only available diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/Makefile index b9307b48cc..5b2f2eb275 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/Makefile +++ b/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/Makefile @@ -39,7 +39,7 @@ CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-uninitialized -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) POFILES = $(OBJS:%.o=%.po) POFILE = $(PROG)_all.po diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ipmpstat/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/ipmpstat/Makefile index a15c3fce80..cb0ca92b43 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ipmpstat/Makefile +++ b/usr/src/cmd/cmd-inet/usr.sbin/ipmpstat/Makefile @@ -28,7 +28,7 @@ ROOTUSRSBINLINKS = $(PROG:%=$(ROOTUSRSBIN)/%) include $(SRC)/cmd/Makefile.cmd -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CERRWARN += -_gcc=-Wno-uninitialized LDLIBS += -lipmp -lsocket -lsysevent -lnvpair -lofmt XGETFLAGS += -a -x $(PROG).xcl diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ping/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/ping/Makefile index 9724fff4e5..905f389570 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ping/Makefile +++ b/usr/src/cmd/cmd-inet/usr.sbin/ping/Makefile @@ -41,7 +41,7 @@ LDLIBS += -lxnet -lsocket -lnsl -lm -linetutil # These #defines are required to use SUSv3 interfaces CPPFLAGS += -D_XOPEN_SOURCE=600 -D__EXTENSIONS__ -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) # Setting the above defines to use the UNIX98 ancillary data feature # causes lint to output warnings about lint library declarations conflicting diff --git a/usr/src/cmd/coreadm/Makefile b/usr/src/cmd/coreadm/Makefile index 390212d227..38ac91763a 100644 --- a/usr/src/cmd/coreadm/Makefile +++ b/usr/src/cmd/coreadm/Makefile @@ -34,7 +34,7 @@ ROOTMANIFESTDIR= $(ROOTSVCSYSTEM) CFLAGS += $(CCVERBOSE) LDLIBS += -lproc -lscf -C99MODE=$(C99_ENABLE) +CSTD=$(CSTD_GNU99) all: $(PROG) diff --git a/usr/src/cmd/diskinfo/Makefile b/usr/src/cmd/diskinfo/Makefile index daee372303..10cda55ca7 100644 --- a/usr/src/cmd/diskinfo/Makefile +++ b/usr/src/cmd/diskinfo/Makefile @@ -20,7 +20,7 @@ SRCS= $(OBJS:%.o=%.c) include $(SRC)/cmd/Makefile.cmd include $(SRC)/cmd/Makefile.ctf -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CPPFLAGS += -I$(SRC)/lib/fm/topo diff --git a/usr/src/cmd/fm/notify/smtp-notify/Makefile.com b/usr/src/cmd/fm/notify/smtp-notify/Makefile.com index d8861ea62b..2d27ca3387 100644 --- a/usr/src/cmd/fm/notify/smtp-notify/Makefile.com +++ b/usr/src/cmd/fm/notify/smtp-notify/Makefile.com @@ -45,7 +45,7 @@ $(ROOTNOTIFYPARAMS) := FILEMODE = 0444 $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG CPPFLAGS += -I. -I../common -I../../../../../lib/fm/libfmnotify/common -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) LDLIBS += -L$(ROOT)/usr/lib/fm -lnvpair -lfmevent -lfmd_msg -lfmnotify \ -lumem diff --git a/usr/src/cmd/fm/notify/snmp-notify/Makefile.com b/usr/src/cmd/fm/notify/snmp-notify/Makefile.com index 13c78c7ea2..03905b1c76 100644 --- a/usr/src/cmd/fm/notify/snmp-notify/Makefile.com +++ b/usr/src/cmd/fm/notify/snmp-notify/Makefile.com @@ -43,7 +43,7 @@ $(ROOTNOTIFYPARAMS) := FILEMODE = 0444 $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG CPPFLAGS += -I. -I../common -I../../../../../lib/fm/libfmnotify/common -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) LDLIBS += -L$(ROOT)/usr/lib/fm -lnvpair -lfmevent -lfmd_msg -lfmnotify \ -lumem -lnetsnmp -lnetsnmpagent diff --git a/usr/src/cmd/fs.d/nfs/lockd/Makefile b/usr/src/cmd/fs.d/nfs/lockd/Makefile index ce725cd336..19c459d9f5 100644 --- a/usr/src/cmd/fs.d/nfs/lockd/Makefile +++ b/usr/src/cmd/fs.d/nfs/lockd/Makefile @@ -38,7 +38,7 @@ SRCS = $(LOCAL:%.o=%.c) ../lib/daemon.c ../lib/nfs_tbind.c \ ../lib/smfcfg.c ../lib/thrpool.c LDLIBS += -lnsl -lscf CPPFLAGS += -I../lib -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-switch diff --git a/usr/src/cmd/fs.d/reparsed/Makefile b/usr/src/cmd/fs.d/reparsed/Makefile index e61d7140f4..ed38b26723 100644 --- a/usr/src/cmd/fs.d/reparsed/Makefile +++ b/usr/src/cmd/fs.d/reparsed/Makefile @@ -38,7 +38,7 @@ CLOBBERFILES += $(TYPEPROG) CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-unused-variable -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LDLIBS += -lreparse -lnsl diff --git a/usr/src/cmd/fs.d/smbclnt/chacl/Makefile b/usr/src/cmd/fs.d/smbclnt/chacl/Makefile index 52a9d04112..f3aabe62a4 100644 --- a/usr/src/cmd/fs.d/smbclnt/chacl/Makefile +++ b/usr/src/cmd/fs.d/smbclnt/chacl/Makefile @@ -37,7 +37,7 @@ LDLIBS += -lsmbfs -lsec CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-unused-variable CERRWARN += -_gcc=-Wno-unused-label -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CLOBBERFILES += $(LIBPROG) diff --git a/usr/src/cmd/fs.d/smbclnt/lsacl/Makefile b/usr/src/cmd/fs.d/smbclnt/lsacl/Makefile index fad9235ecd..3442d7a786 100644 --- a/usr/src/cmd/fs.d/smbclnt/lsacl/Makefile +++ b/usr/src/cmd/fs.d/smbclnt/lsacl/Makefile @@ -36,7 +36,7 @@ LDLIBS += -lsmbfs -lsec CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-unused-label -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CLOBBERFILES += $(LIBPROG) diff --git a/usr/src/cmd/fs.d/smbclnt/mount/Makefile b/usr/src/cmd/fs.d/smbclnt/mount/Makefile index 0124840e23..8f61e99026 100644 --- a/usr/src/cmd/fs.d/smbclnt/mount/Makefile +++ b/usr/src/cmd/fs.d/smbclnt/mount/Makefile @@ -43,7 +43,7 @@ $(ROOTLIBFSTYPE)/mount := FILEMODE= 04555 CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-unused-label -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LDLIBS += -lsmbfs diff --git a/usr/src/cmd/fs.d/smbclnt/smbiod-svc/Makefile b/usr/src/cmd/fs.d/smbclnt/smbiod-svc/Makefile index 29155e44f8..a5dbf68bd9 100644 --- a/usr/src/cmd/fs.d/smbclnt/smbiod-svc/Makefile +++ b/usr/src/cmd/fs.d/smbclnt/smbiod-svc/Makefile @@ -37,7 +37,7 @@ SRCS= $(TYPEPROG).c POFILE= $(TYPEPROG).po CFLAGS += $(CCVERBOSE) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CPPFLAGS += -I$(SRC)/lib/libsmbfs \ -I$(SRC)/uts/common/smbclnt -I$(SRC)/uts/common diff --git a/usr/src/cmd/fs.d/smbclnt/smbiod/Makefile b/usr/src/cmd/fs.d/smbclnt/smbiod/Makefile index f54d107d49..7acbf30f86 100644 --- a/usr/src/cmd/fs.d/smbclnt/smbiod/Makefile +++ b/usr/src/cmd/fs.d/smbclnt/smbiod/Makefile @@ -37,7 +37,7 @@ SRCS= $(TYPEPROG).c POFILE= $(TYPEPROG).po CFLAGS += $(CCVERBOSE) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) # This is a multi-thread program but Nevada # no longer needs -lthread diff --git a/usr/src/cmd/fs.d/smbclnt/smbutil/Makefile b/usr/src/cmd/fs.d/smbclnt/smbutil/Makefile index 31d52961fe..5b751cce22 100644 --- a/usr/src/cmd/fs.d/smbclnt/smbutil/Makefile +++ b/usr/src/cmd/fs.d/smbclnt/smbutil/Makefile @@ -39,7 +39,7 @@ POFILE= smbutil_all.po POFILES= $(OBJS:%.o=%.po) CLOBBERFILES+= $(POFILE) $(POFILES) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LDLIBS += -lsmbfs -lnsl diff --git a/usr/src/cmd/fs.d/smbclnt/test/Makefile b/usr/src/cmd/fs.d/smbclnt/test/Makefile index 62eb716f5f..64b626f5a4 100644 --- a/usr/src/cmd/fs.d/smbclnt/test/Makefile +++ b/usr/src/cmd/fs.d/smbclnt/test/Makefile @@ -49,7 +49,7 @@ LINTLIBS= -L$(ROOTLIB) -lsmbfs CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-unused-variable -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LINTFLAGS += -erroff=E_FUNC_RET_ALWAYS_IGNOR2 diff --git a/usr/src/cmd/getconf/Makefile b/usr/src/cmd/getconf/Makefile index 6293596e58..8d5bc7041a 100644 --- a/usr/src/cmd/getconf/Makefile +++ b/usr/src/cmd/getconf/Makefile @@ -43,7 +43,7 @@ $(XPG4) := CFLAGS += -D_XOPEN_SOURCE -I$(SRC)/lib/libc/inc # XPG6MODE: Depending on the version of the compiler, the value of # __STDC_VERSION__ may differ even in the presence of the same compilation # options. The default compilation mode for Sun compilers that support the -# C99 standard is -xc99=all,no_lib. C99MODE= is equivalent to -xc99=all,no_lib. +# C99 standard is -xc99=all,no_lib. CSTD= is equivalent to -xc99=all,no_lib. # This translates to C99 semantics without the C99 library specific behaviors # and dependencies. # @@ -53,8 +53,8 @@ $(XPG4) := CFLAGS += -D_XOPEN_SOURCE -I$(SRC)/lib/libc/inc # maintain source compatibility. Neither of these cases results in the # importing of /usr/lib/values-xpg6.o, so we need to either manually import # it via linking with a local version of the object, or set -xc99=%all which -# by default imports /usr/lib/values-xpg6.o. C99MODE=C99_ENABLE is equivalent -# to -xc99=all. If C99_ENABLE is defined and we also attempt to link with a +# by default imports /usr/lib/values-xpg6.o. CSTD=CSTD_GNU99 is equivalent +# to -xc99=all. If CSTD_GNU99 is defined and we also attempt to link with a # local version of values-xpg6.o, an error will occur due to multiple # definitions for __xpg4 and __xpg6. Because /usr/lib/values-xpg6.o was # delivered in Solaris 10 and is a stable interface, there is no need to @@ -66,8 +66,8 @@ $(XPG4) := CFLAGS += -D_XOPEN_SOURCE -I$(SRC)/lib/libc/inc # the compiler only imports this by default (from /usr/lib/values-xpg4.o) # if we use the c89 utility as opposed to cc. -XPG6MODE = $(C99_ENABLE) -$(XPG6) := C99MODE = $(XPG6MODE) +XPG6MODE = $(CSTD_GNU99) +$(XPG6) := CSTD = $(XPG6MODE) $(XPG6) := CFLAGS += -D_XOPEN_SOURCE=600 -I$(SRC)/lib/libc/inc .KEEP_STATE: diff --git a/usr/src/cmd/hal/addons/acpi/Makefile b/usr/src/cmd/hal/addons/acpi/Makefile index daf306a758..e66764495c 100644 --- a/usr/src/cmd/hal/addons/acpi/Makefile +++ b/usr/src/cmd/hal/addons/acpi/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" -# PROG = hald-addon-acpi OBJS = addon-acpi.o logger.o util_helper.o acpi.o util_pm.o @@ -38,7 +36,7 @@ LDLIBS += -lc -ldbus-1 -lhal -lglib-2.0 CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../hald -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/hal/addons/cpufreq/Makefile b/usr/src/cmd/hal/addons/cpufreq/Makefile index b631fbf33b..1fdf1ad83c 100644 --- a/usr/src/cmd/hal/addons/cpufreq/Makefile +++ b/usr/src/cmd/hal/addons/cpufreq/Makefile @@ -23,8 +23,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" -# PROG = hald-addon-cpufreq OBJS = addon-cpufreq.o logger.o adt_data.o @@ -40,7 +38,7 @@ LDLIBS += -lc -ldbus-1 -lhal -lglib-2.0 -ldbus-glib-1 -lpolkit -lbsm CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../hald CPPFLAGS += -I$(ROOT)/usr/include/libpolkit -g -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/hal/addons/network-devices/Makefile b/usr/src/cmd/hal/addons/network-devices/Makefile index 4d29e23981..3ac146e39e 100644 --- a/usr/src/cmd/hal/addons/network-devices/Makefile +++ b/usr/src/cmd/hal/addons/network-devices/Makefile @@ -45,7 +45,7 @@ LDLIBS += $(ZIGNORE) -lnetsnmp CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../hald -I../../utils -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/hal/addons/storage/Makefile b/usr/src/cmd/hal/addons/storage/Makefile index e7d4797dc9..f5aa0fbbf5 100644 --- a/usr/src/cmd/hal/addons/storage/Makefile +++ b/usr/src/cmd/hal/addons/storage/Makefile @@ -36,7 +36,7 @@ LDLIBS += -lc -ldbus-1 -lhal -lnvpair -lsysevent CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../hald -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/hal/hald-runner/Makefile b/usr/src/cmd/hal/hald-runner/Makefile index f52bb65346..9f283d9468 100644 --- a/usr/src/cmd/hal/hald-runner/Makefile +++ b/usr/src/cmd/hal/hald-runner/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" -# PROG = hald-runner OBJS = main.o runner.o utils.o @@ -38,7 +36,7 @@ LDLIBS += -lc -ldbus-1 -ldbus-glib-1 -lglib-2.0 CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -UDBUS_API_SUBJECT_TO_CHANGE -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/hal/hald/Makefile b/usr/src/cmd/hal/hald/Makefile index 9352dd5e56..e61790e3e5 100644 --- a/usr/src/cmd/hal/hald/Makefile +++ b/usr/src/cmd/hal/hald/Makefile @@ -46,7 +46,7 @@ LDLIBS += -lc -lm -ldbus-1 -ldbus-glib-1 -lglib-2.0 -lgobject-2.0 \ all install $(PROG) := LDLIBS += -lexpat CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CLOBBERFILES += hald_marshal.c hald_marshal.h diff --git a/usr/src/cmd/hal/hald/solaris/Makefile b/usr/src/cmd/hal/hald/solaris/Makefile index f4513b315b..b7e0d59252 100644 --- a/usr/src/cmd/hal/hald/solaris/Makefile +++ b/usr/src/cmd/hal/hald/solaris/Makefile @@ -40,7 +40,7 @@ $(ROOTMANIFEST) := FILEMODE = 444 $(ROOTLIBSVCMETHOD)/svc-hal:= FILEMODE = 555 CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/hal/probing/acpi/Makefile b/usr/src/cmd/hal/probing/acpi/Makefile index 2bfd38d014..69190994c3 100644 --- a/usr/src/cmd/hal/probing/acpi/Makefile +++ b/usr/src/cmd/hal/probing/acpi/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" -# PROG = hald-probe-acpi OBJS = probe-acpi.o logger.o acpi.o util_pm.o @@ -38,7 +36,7 @@ LDLIBS += -lc -ldbus-1 -lhal -lglib-2.0 CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../utils -I../../hald -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/hal/probing/network-printer/Makefile b/usr/src/cmd/hal/probing/network-printer/Makefile index 80c2e6d034..f2227ec9e8 100644 --- a/usr/src/cmd/hal/probing/network-printer/Makefile +++ b/usr/src/cmd/hal/probing/network-printer/Makefile @@ -38,7 +38,7 @@ LDLIBS += $(ZIGNORE) -lnetsnmp CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../utils -I../../hald -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/hal/probing/printer/Makefile b/usr/src/cmd/hal/probing/printer/Makefile index 26903c5959..9954375a62 100644 --- a/usr/src/cmd/hal/probing/printer/Makefile +++ b/usr/src/cmd/hal/probing/printer/Makefile @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# PROG = hald-probe-printer OBJS = probe-printer.o logger.o printer.o @@ -38,7 +36,7 @@ LDLIBS += -lc -ldbus-1 -lhal CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../utils -I../../hald -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/hal/probing/storage/Makefile b/usr/src/cmd/hal/probing/storage/Makefile index 76450e1743..8b886d4c07 100644 --- a/usr/src/cmd/hal/probing/storage/Makefile +++ b/usr/src/cmd/hal/probing/storage/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" -# PROG = hald-probe-storage OBJS = probe-storage.o cdutils.o fsutils.o logger.o @@ -39,7 +37,7 @@ LDLIBS += -lc -ldbus-1 -lhal -ladm -lefi CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../utils -I../../hald -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/hal/probing/volume/Makefile b/usr/src/cmd/hal/probing/volume/Makefile index a9cd36186b..25ee9ea016 100644 --- a/usr/src/cmd/hal/probing/volume/Makefile +++ b/usr/src/cmd/hal/probing/volume/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" -# PROG = hald-probe-volume OBJS = probe-volume.o cdutils.o fsutils.o logger.o @@ -39,7 +37,7 @@ LDLIBS += -lc -ldbus-1 -lhal -lfstyp -lnvpair -ladm -lefi CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../utils -I../../hald -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/hal/probing/xkb/Makefile b/usr/src/cmd/hal/probing/xkb/Makefile index 1db618779c..8d6b1fc13c 100644 --- a/usr/src/cmd/hal/probing/xkb/Makefile +++ b/usr/src/cmd/hal/probing/xkb/Makefile @@ -37,7 +37,7 @@ LDLIBS += -lc -ldbus-1 -lhal CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../hald -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/hal/tools/Makefile b/usr/src/cmd/hal/tools/Makefile index 1c4fceb34b..6cca522969 100644 --- a/usr/src/cmd/hal/tools/Makefile +++ b/usr/src/cmd/hal/tools/Makefile @@ -72,7 +72,7 @@ $(STORAGE_METHOD_PROG) := LDLIBS += -lpolkit CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal CPPFLAGS += -I$(ROOT)/usr/include/libpolkit -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) ROOTUSRSBINPROG = $(HAL_PROG:%=$(ROOTUSRSBIN)/%) \ $(SCRIPT_BIN:%=$(ROOTUSRSBIN)/%) diff --git a/usr/src/cmd/hal/tools/sunos/Makefile b/usr/src/cmd/hal/tools/sunos/Makefile index b1b3a6dc19..51b48b865b 100644 --- a/usr/src/cmd/hal/tools/sunos/Makefile +++ b/usr/src/cmd/hal/tools/sunos/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" -# HAL_PROGS = hal-system-lcd-set-brightness-sunos \ hal-system-lcd-get-brightness-sunos @@ -43,7 +41,7 @@ $(HAL_PROGS) := LDLIBS += -lc $(ZIGNORE) -lglib-2.0 CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal CPPFLAGS += -I$(ROOT)/usr/include/libpolkit -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) ROOTCMDDIR = $(ROOTLIB_HAL)/sunos ROOTCMD = $(HAL_PROGS:%=$(ROOTCMDDIR)/%) \ diff --git a/usr/src/cmd/iconv/Makefile b/usr/src/cmd/iconv/Makefile index 02edd5238d..f4fd3c3010 100644 --- a/usr/src/cmd/iconv/Makefile +++ b/usr/src/cmd/iconv/Makefile @@ -23,7 +23,7 @@ OBJS = iconv_main.o iconv_list.o charmap.o parser.tab.o scanner.o SRCS = $(OBJS:%.o=%.c) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LDLIBS += -lcmdutils -lavl YFLAGS = -d -b parser CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE diff --git a/usr/src/cmd/idmap/idmapd/Makefile b/usr/src/cmd/idmap/idmapd/Makefile index a4ab35da95..b0d03278ca 100644 --- a/usr/src/cmd/idmap/idmapd/Makefile +++ b/usr/src/cmd/idmap/idmapd/Makefile @@ -69,7 +69,7 @@ XGETFLAGS = --foreign-user --strict -n -E --width=72 \ --omit-header --keyword=directoryError:2 \ --language=C --force-po -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) POFILE = $(PROG)_all.po RPC_MSGOUT_OPT = -DRPC_MSGOUT=idmap_rpc_msgout diff --git a/usr/src/cmd/latencytop/Makefile.com b/usr/src/cmd/latencytop/Makefile.com index a804857533..8bfc1e13a6 100644 --- a/usr/src/cmd/latencytop/Makefile.com +++ b/usr/src/cmd/latencytop/Makefile.com @@ -36,7 +36,7 @@ CERRWARN += -_gcc=-Wno-uninitialized CPPFLAGS += -DEMBED_CONFIGS -I$(ADJUNCT_PROTO)/usr/include/glib-2.0 \ -I$(ADJUNCT_PROTO)/usr/lib/glib-2.0/include -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) LDLIBS += -lcurses -ldtrace all install := LDLIBS += -lglib-2.0 diff --git a/usr/src/cmd/ldap/Makefile b/usr/src/cmd/ldap/Makefile index 6f8a440264..3815e4fdc7 100644 --- a/usr/src/cmd/ldap/Makefile +++ b/usr/src/cmd/ldap/Makefile @@ -2,8 +2,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" -# # cmd/ldap/Makefile include ../Makefile.cmd @@ -32,7 +30,7 @@ $(POFILES) := CFLAGS += -I ../../lib/libldap5/include/ldap \ -DNO_LIBLCACHE -DLDAP_REFERRALS -DNET_SSL \ -DLDAPSSLIO -DHAVE_SASL_OPTIONS \ -DSOLARIS_LDAP_CMD -$(NS_POFILES) := C99MODE = $(C99_ENABLE) +$(NS_POFILES) := CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/ldap/Makefile.com b/usr/src/cmd/ldap/Makefile.com index a50e846b61..33dd225325 100644 --- a/usr/src/cmd/ldap/Makefile.com +++ b/usr/src/cmd/ldap/Makefile.com @@ -112,9 +112,9 @@ ldaplist := LDLIBS += -lsldap ldapaddent := LDLIBS += -lsldap -lnsl -lsecdb ldapclient := LDLIBS += -lsldap -lscf -ldaplist := C99MODE = $(C99_ENABLE) -ldapaddent := C99MODE = $(C99_ENABLE) -ldapclient := C99MODE = $(C99_ENABLE) +ldaplist := CSTD = $(CSTD_GNU99) +ldapaddent := CSTD = $(CSTD_GNU99) +ldapclient := CSTD = $(CSTD_GNU99) lint := LDLIBS += -lldap @@ -177,18 +177,18 @@ clean: # Not linted Mozilla upstream commands lint: lintns_ldaplist lintns_ldapaddent lintns_ldapclient -lintns_ldaplist := C99MODE = $(C99_ENABLE) +lintns_ldaplist := CSTD = $(CSTD_GNU99) lintns_ldaplist: $(LINT.c) $(LDAPLISTSRCS:%=../ns_ldap/%) $(LDLIBS) -lsldap -lintns_ldapaddent := C99MODE = $(C99_ENABLE) +lintns_ldapaddent := CSTD = $(CSTD_GNU99) lintns_ldapaddent: $(LINT.c) $(LDAPADDENTSRCS:%=../ns_ldap/%) $(LDLIBS) -lsldap -lnsl \ -lsecdb -lintns_ldapclient := C99MODE = $(C99_ENABLE) +lintns_ldapclient := CSTD = $(CSTD_GNU99) lintns_ldapclient: $(LINT.c) $(LDAPCLIENTSRCS:%=../ns_ldap/%) $(LDLIBS) -lsldap -lscf diff --git a/usr/src/cmd/ldmad/Makefile b/usr/src/cmd/ldmad/Makefile index 9e9e30fc19..0e38ddbb00 100644 --- a/usr/src/cmd/ldmad/Makefile +++ b/usr/src/cmd/ldmad/Makefile @@ -64,7 +64,7 @@ LDLIBS += -lds -ldladm -ldevinfo -lpri INCS += -I$(ROOT)/usr/platform/sun4v/include/sys INCS += -I$(SRC)/uts/sun4v CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(INCS) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CERRWARN += -_gcc=-Wno-uninitialized LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN diff --git a/usr/src/cmd/mandoc/Makefile.common b/usr/src/cmd/mandoc/Makefile.common index 6c0187e3e0..ac5b6fe2ac 100644 --- a/usr/src/cmd/mandoc/Makefile.common +++ b/usr/src/cmd/mandoc/Makefile.common @@ -76,7 +76,7 @@ OBJS= att.o \ OBJS += compat_ohash.o CFLAGS += $(CC_VERBOSE) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CPPFLAGS += -DOSNAME="\"illumos\"" diff --git a/usr/src/cmd/mdb/Makefile.mdb b/usr/src/cmd/mdb/Makefile.mdb index 9d1d7b4d6c..852ce281ac 100644 --- a/usr/src/cmd/mdb/Makefile.mdb +++ b/usr/src/cmd/mdb/Makefile.mdb @@ -95,7 +95,7 @@ SRCS += \ $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG CPPFLAGS += -D_MDB -I. -I../.. -I../../../common -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all LDLIBS += -lcurses -lkvm -lproc -lrtld_db -lctf -lumem -ldisasm -lscf diff --git a/usr/src/cmd/mdb/Makefile.module b/usr/src/cmd/mdb/Makefile.module index bf8a3821d8..2c8da775da 100644 --- a/usr/src/cmd/mdb/Makefile.module +++ b/usr/src/cmd/mdb/Makefile.module @@ -113,7 +113,7 @@ PYLNFLAGS = -I$(ADJUNCT_PROTO)/usr/include/python$(PYTHON_VERSION) kvm_TGTFLAGS = -D_KERNEL proc_TGTFLAGS = -D_USER -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CFLAGS += $(CCVERBOSE) CFLAGS64 += $(CCVERBOSE) diff --git a/usr/src/cmd/mdb/intel/amd64/libfksmbsrv/Makefile b/usr/src/cmd/mdb/intel/amd64/libfksmbsrv/Makefile index d9bcbaf453..672b40b332 100644 --- a/usr/src/cmd/mdb/intel/amd64/libfksmbsrv/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/libfksmbsrv/Makefile @@ -45,7 +45,7 @@ CPPFLAGS.first += -I../../../../../lib/libfakekernel/common CPPFLAGS += -I../../../../../uts/common -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all dmod/%.o: $(GENUNIX_DIR)/%.c diff --git a/usr/src/cmd/mdb/intel/amd64/libzpool/Makefile b/usr/src/cmd/mdb/intel/amd64/libzpool/Makefile index f4d128dff7..b0ebe4c7c8 100644 --- a/usr/src/cmd/mdb/intel/amd64/libzpool/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/libzpool/Makefile @@ -44,7 +44,7 @@ CPPFLAGS.first = -I$(SRC)/lib/libfakekernel/common -D_FAKE_KERNEL CPPFLAGS += -I../../../../../lib/libzpool/common \ -I../../../../../uts/common/fs/zfs -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CERRWARN += -_gcc=-Wno-type-limits diff --git a/usr/src/cmd/mdb/intel/amd64/nsmb/Makefile b/usr/src/cmd/mdb/intel/amd64/nsmb/Makefile index ac91224f66..ec561246ca 100644 --- a/usr/src/cmd/mdb/intel/amd64/nsmb/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/nsmb/Makefile @@ -40,7 +40,7 @@ include ../../../Makefile.module CPPFLAGS += -I$(SRC)/uts/common/fs/smbclnt CPPFLAGS += -I$(SRC)/uts/common -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) # maybe not the best place for this, but # we need to create this directory. diff --git a/usr/src/cmd/mdb/intel/amd64/pmcs/Makefile b/usr/src/cmd/mdb/intel/amd64/pmcs/Makefile index a8e6e2cfcc..02f4962b86 100644 --- a/usr/src/cmd/mdb/intel/amd64/pmcs/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/pmcs/Makefile @@ -33,7 +33,7 @@ include $(SRC)/cmd/Makefile.cmd.64 include $(SRC)/cmd/mdb/intel/Makefile.amd64 include $(SRC)/cmd/mdb/Makefile.module -C99MODE = -xc99=%all +CSTD = $(CSTD_GNU99) CPPFLAGS += -I$(SRC)/uts/common diff --git a/usr/src/cmd/mdb/intel/amd64/qlc/Makefile b/usr/src/cmd/mdb/intel/amd64/qlc/Makefile index 5c60dfe50b..d83124d648 100644 --- a/usr/src/cmd/mdb/intel/amd64/qlc/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/qlc/Makefile @@ -41,7 +41,7 @@ CPPFLAGS += -I$(SRC)/uts/common/sys/fibre-channel/impl LINTFLAGS64 += -erroff=E_STATIC_UNUSED -erroff=E_FUNC_SET_NOT_USED LINTFLAGS64 += -erroff=E_STATIC_UNUSED -erroff=E_FUNC_ARG_UNUSED -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CERRWARN += -_gcc=-Wno-address diff --git a/usr/src/cmd/mdb/intel/amd64/smbfs/Makefile b/usr/src/cmd/mdb/intel/amd64/smbfs/Makefile index b53fa726a1..c929d80524 100644 --- a/usr/src/cmd/mdb/intel/amd64/smbfs/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/smbfs/Makefile @@ -40,7 +40,7 @@ include ../../../Makefile.module CPPFLAGS += -I$(SRC)/uts/common/fs/smbclnt CPPFLAGS += -I$(SRC)/uts/common -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) # maybe not the best place for this, but # we need to create this directory. diff --git a/usr/src/cmd/mdb/intel/amd64/smbsrv/Makefile b/usr/src/cmd/mdb/intel/amd64/smbsrv/Makefile index 3d5dcdacb8..90a7c02643 100644 --- a/usr/src/cmd/mdb/intel/amd64/smbsrv/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/smbsrv/Makefile @@ -38,7 +38,7 @@ ROOTKMOD = $(ROOT)/usr/kernel/kmdb$(MACHMODDIR) include ../../../Makefile.module -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) $(ROOTKMOD): $(INS.dir) diff --git a/usr/src/cmd/mdb/intel/amd64/srpt/Makefile b/usr/src/cmd/mdb/intel/amd64/srpt/Makefile index 1c15d3abfc..94ea5e7130 100644 --- a/usr/src/cmd/mdb/intel/amd64/srpt/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/srpt/Makefile @@ -39,5 +39,5 @@ include ../../../Makefile.module CPPFLAGS += -I$(UTSBASE)/common -I$(UTSBASE)/common/sys -I$(SRPTBASE) -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all diff --git a/usr/src/cmd/mdb/intel/amd64/zfs/Makefile b/usr/src/cmd/mdb/intel/amd64/zfs/Makefile index 870f91ad99..8224d7593d 100644 --- a/usr/src/cmd/mdb/intel/amd64/zfs/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/zfs/Makefile @@ -40,7 +40,7 @@ include ../../../common/modules/zfs/Makefile.zfs CPPFLAGS += -I../../../../../uts/common/fs/zfs CPPFLAGS += -I../../../../../uts/common/fs/zfs/lua -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CERRWARN += -_gcc=-Wno-type-limits diff --git a/usr/src/cmd/mdb/intel/ia32/libfksmbsrv/Makefile b/usr/src/cmd/mdb/intel/ia32/libfksmbsrv/Makefile index eb63922371..df59f2c513 100644 --- a/usr/src/cmd/mdb/intel/ia32/libfksmbsrv/Makefile +++ b/usr/src/cmd/mdb/intel/ia32/libfksmbsrv/Makefile @@ -44,7 +44,7 @@ CPPFLAGS.first += -I../../../../../lib/libfakekernel/common CPPFLAGS += -I../../../../../uts/common -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all dmod/%.o: $(GENUNIX_DIR)/%.c diff --git a/usr/src/cmd/mdb/intel/ia32/libzpool/Makefile b/usr/src/cmd/mdb/intel/ia32/libzpool/Makefile index 658c466248..0ed9a6d470 100644 --- a/usr/src/cmd/mdb/intel/ia32/libzpool/Makefile +++ b/usr/src/cmd/mdb/intel/ia32/libzpool/Makefile @@ -45,7 +45,7 @@ CPPFLAGS += -I../../../../../lib/libzpool/common \ -I../../../../../uts/common/fs/zfs \ -I../../../../../uts/common/fs/zfs/lua -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CERRWARN += -_gcc=-Wno-type-limits diff --git a/usr/src/cmd/mdb/intel/modules/mdb_kb/amd64/Makefile b/usr/src/cmd/mdb/intel/modules/mdb_kb/amd64/Makefile index b12a97b8e5..bae116d95e 100644 --- a/usr/src/cmd/mdb/intel/modules/mdb_kb/amd64/Makefile +++ b/usr/src/cmd/mdb/intel/modules/mdb_kb/amd64/Makefile @@ -22,7 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" MODULE = mdb_kb.so MDBTGT = kvm @@ -35,7 +34,7 @@ include ../../../../../Makefile.cmd.64 include ../../../../intel/Makefile.amd64 include ../../../../Makefile.module -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CPPFLAGS += -DMP -D_MACHDEP -D_MDB -D__xpv diff --git a/usr/src/cmd/mdb/sparc/v7/libfksmbsrv/Makefile b/usr/src/cmd/mdb/sparc/v7/libfksmbsrv/Makefile index 640aecfa3a..4136306433 100644 --- a/usr/src/cmd/mdb/sparc/v7/libfksmbsrv/Makefile +++ b/usr/src/cmd/mdb/sparc/v7/libfksmbsrv/Makefile @@ -45,7 +45,7 @@ CPPFLAGS.first += -I../../../../../lib/libfakekernel/common CPPFLAGS += -I../../../../../uts/common -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all dmod/%.o: $(GENUNIX_DIR)/%.c diff --git a/usr/src/cmd/mdb/sparc/v7/libzpool/Makefile b/usr/src/cmd/mdb/sparc/v7/libzpool/Makefile index b00ff3c0bc..f8f2b3fae3 100644 --- a/usr/src/cmd/mdb/sparc/v7/libzpool/Makefile +++ b/usr/src/cmd/mdb/sparc/v7/libzpool/Makefile @@ -43,7 +43,7 @@ CPPFLAGS += -I../../../../../lib/libzpool/common \ -I../../../../../uts/common/fs/zfs \ -I../../../../../uts/common/fs/zfs/lua -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CERRWARN += -_gcc=-Wno-type-limits diff --git a/usr/src/cmd/mdb/sparc/v9/libfksmbsrv/Makefile b/usr/src/cmd/mdb/sparc/v9/libfksmbsrv/Makefile index 480f9a8126..3d7f2e9dd4 100644 --- a/usr/src/cmd/mdb/sparc/v9/libfksmbsrv/Makefile +++ b/usr/src/cmd/mdb/sparc/v9/libfksmbsrv/Makefile @@ -46,7 +46,7 @@ CPPFLAGS.first += -I../../../../../lib/libfakekernel/common CPPFLAGS += -I../../../../../uts/common -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all dmod/%.o: $(GENUNIX_DIR)/%.c diff --git a/usr/src/cmd/mdb/sparc/v9/libzpool/Makefile b/usr/src/cmd/mdb/sparc/v9/libzpool/Makefile index 5c3b38b760..6b50bacc96 100644 --- a/usr/src/cmd/mdb/sparc/v9/libzpool/Makefile +++ b/usr/src/cmd/mdb/sparc/v9/libzpool/Makefile @@ -44,7 +44,7 @@ CPPFLAGS += -I../../../../../lib/libzpool/common \ -I../../../../../uts/common/fs/zfs \ -I../../../../../uts/common/fs/zfs/lua -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CERRWARN += -_gcc=-Wno-type-limits diff --git a/usr/src/cmd/mdb/sparc/v9/nsmb/Makefile b/usr/src/cmd/mdb/sparc/v9/nsmb/Makefile index 03b663a327..42560d80aa 100644 --- a/usr/src/cmd/mdb/sparc/v9/nsmb/Makefile +++ b/usr/src/cmd/mdb/sparc/v9/nsmb/Makefile @@ -40,7 +40,7 @@ include ../../../Makefile.module CPPFLAGS += -I$(SRC)/uts/common/fs/smbclnt CPPFLAGS += -I$(SRC)/uts/common -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) # maybe not the best place for this, but # we need to create this directory. diff --git a/usr/src/cmd/mdb/sparc/v9/pmcs/Makefile b/usr/src/cmd/mdb/sparc/v9/pmcs/Makefile index d282a060e5..2d28be38f9 100644 --- a/usr/src/cmd/mdb/sparc/v9/pmcs/Makefile +++ b/usr/src/cmd/mdb/sparc/v9/pmcs/Makefile @@ -33,7 +33,7 @@ include $(SRC)/cmd/Makefile.cmd.64 include $(SRC)/cmd/mdb/sparc/Makefile.sparcv9 include $(SRC)/cmd/mdb/Makefile.module -C99MODE = -xc99=%all +CSTD = $(CSTD_GNU99) CPPFLAGS += -I$(SRC)/uts/common diff --git a/usr/src/cmd/mdb/sparc/v9/qlc/Makefile b/usr/src/cmd/mdb/sparc/v9/qlc/Makefile index 1b5dff0286..926d1a809a 100644 --- a/usr/src/cmd/mdb/sparc/v9/qlc/Makefile +++ b/usr/src/cmd/mdb/sparc/v9/qlc/Makefile @@ -41,7 +41,7 @@ CPPFLAGS += -I$(SRC)/uts/common/sys/fibre-channel/impl LINTFLAGS64 += -erroff=E_STATIC_UNUSED -erroff=E_FUNC_SET_NOT_USED LINTFLAGS64 += -erroff=E_STATIC_UNUSED -erroff=E_FUNC_ARG_UNUSED -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CERRWARN += -_gcc=-Wno-address diff --git a/usr/src/cmd/mdb/sparc/v9/smbfs/Makefile b/usr/src/cmd/mdb/sparc/v9/smbfs/Makefile index 4aca90cff9..b89fc0cc1d 100644 --- a/usr/src/cmd/mdb/sparc/v9/smbfs/Makefile +++ b/usr/src/cmd/mdb/sparc/v9/smbfs/Makefile @@ -40,7 +40,7 @@ include ../../../Makefile.module CPPFLAGS += -I$(SRC)/uts/common/fs/smbclnt CPPFLAGS += -I$(SRC)/uts/common -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) # maybe not the best place for this, but # we need to create this directory. diff --git a/usr/src/cmd/mdb/sparc/v9/smbsrv/Makefile b/usr/src/cmd/mdb/sparc/v9/smbsrv/Makefile index 643b3c8ec7..5333130137 100644 --- a/usr/src/cmd/mdb/sparc/v9/smbsrv/Makefile +++ b/usr/src/cmd/mdb/sparc/v9/smbsrv/Makefile @@ -38,7 +38,7 @@ ROOTKMOD = $(ROOT)/usr/kernel/kmdb$(MACHMODDIR) include ../../../Makefile.module -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) $(ROOTKMOD): $(INS.dir) diff --git a/usr/src/cmd/mdb/sparc/v9/srpt/Makefile b/usr/src/cmd/mdb/sparc/v9/srpt/Makefile index 7379a27cde..75448c947d 100644 --- a/usr/src/cmd/mdb/sparc/v9/srpt/Makefile +++ b/usr/src/cmd/mdb/sparc/v9/srpt/Makefile @@ -39,5 +39,5 @@ include ../../../Makefile.module CPPFLAGS += -I$(UTSBASE)/common -I$(UTSBASE)/common/sys -I$(SRPTBASE) -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all diff --git a/usr/src/cmd/mdb/sparc/v9/stmf_sbd/Makefile b/usr/src/cmd/mdb/sparc/v9/stmf_sbd/Makefile index 0c9a088945..7a15e833f6 100644 --- a/usr/src/cmd/mdb/sparc/v9/stmf_sbd/Makefile +++ b/usr/src/cmd/mdb/sparc/v9/stmf_sbd/Makefile @@ -38,5 +38,5 @@ include ../../../Makefile.module CPPFLAGS += -I$(UTSBASE)/common -I$(UTSBASE)/common/sys -I$(STMFSBDBASE) -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all diff --git a/usr/src/cmd/mdb/sparc/v9/zfs/Makefile b/usr/src/cmd/mdb/sparc/v9/zfs/Makefile index 751c3c3571..116cc938d8 100644 --- a/usr/src/cmd/mdb/sparc/v9/zfs/Makefile +++ b/usr/src/cmd/mdb/sparc/v9/zfs/Makefile @@ -40,7 +40,7 @@ include ../../../common/modules/zfs/Makefile.zfs CPPFLAGS += -I../../../../../uts/common/fs/zfs CPPFLAGS += -I../../../../../uts/common/fs/zfs/lua -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CERRWARN += -_gcc=-Wno-type-limits diff --git a/usr/src/cmd/ndmpd/Makefile b/usr/src/cmd/ndmpd/Makefile index 3cb74257ce..4d5ed69075 100644 --- a/usr/src/cmd/ndmpd/Makefile +++ b/usr/src/cmd/ndmpd/Makefile @@ -51,7 +51,7 @@ CPPFLAGS += $(LFLAGS64) CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DDEBUG CPPFLAGS += -I. -Iinclude -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) # lint does not like unused _umem_*_init LINTFLAGS += -xerroff=E_NAME_DEF_NOT_USED2 diff --git a/usr/src/cmd/nvmeadm/Makefile b/usr/src/cmd/nvmeadm/Makefile index c042d4075f..c919c51fce 100644 --- a/usr/src/cmd/nvmeadm/Makefile +++ b/usr/src/cmd/nvmeadm/Makefile @@ -25,7 +25,7 @@ include ../Makefile.cmd CFLAGS += $(CCVERBOSE) LDLIBS += -ldevinfo -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) all: $(PROG) diff --git a/usr/src/cmd/od/Makefile b/usr/src/cmd/od/Makefile index ce45b2db8c..6f449c96d1 100644 --- a/usr/src/cmd/od/Makefile +++ b/usr/src/cmd/od/Makefile @@ -23,7 +23,7 @@ include ../Makefile.cmd CLOBBERFILES= $(PROG) -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CPPFLAGS += -D__EXTENSIONS__ -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 LINTFLAGS += -D__EXTENSIONS__ diff --git a/usr/src/cmd/perl/Makefile.perl b/usr/src/cmd/perl/Makefile.perl index 25fdc53f50..441f3de665 100644 --- a/usr/src/cmd/perl/Makefile.perl +++ b/usr/src/cmd/perl/Makefile.perl @@ -34,4 +34,4 @@ ROOTPERLEXTDIR = $(ROOTPERLLIBDIR)/auto/Sun/Solaris/$(MODULE) ROOTPERLMOD = $(ROOTPERLMODDIR)/$(MODULE).pm ROOTPERLEXT = $(ROOTPERLEXTDIR)/$(MODULE).so -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) diff --git a/usr/src/cmd/policykit/Makefile b/usr/src/cmd/policykit/Makefile index 0c91f51fe8..db571b927f 100644 --- a/usr/src/cmd/policykit/Makefile +++ b/usr/src/cmd/policykit/Makefile @@ -35,7 +35,7 @@ LDLIBS += -lpolkit $(POLICYKIT_GLIB_LDLIBS) CPPFLAGS += -I$(ROOT)/usr/include/libpolkit CPPFLAGS += $(POLICYKIT_DBUS_CPPFLAGS) $(POLICYKIT_GLIB_CPPFLAGS) CPPFLAGS += -DPACKAGE_VERSION=\"$(POLICYKIT_VERSION)\" -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CERRWARN += -_gcc=-Wno-unused-variable diff --git a/usr/src/cmd/rmmount/Makefile b/usr/src/cmd/rmmount/Makefile index a859d240e7..4a075da5ef 100644 --- a/usr/src/cmd/rmmount/Makefile +++ b/usr/src/cmd/rmmount/Makefile @@ -39,7 +39,7 @@ LDLIBS += -ldbus-1 -ldbus-glib-1 -lglib-2.0 -lhal -lhal-storage -lcontract CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal CPPFLAGS += -I$(SRC)/cmd/rmvolmgr -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-unused-variable diff --git a/usr/src/cmd/rmvolmgr/Makefile b/usr/src/cmd/rmvolmgr/Makefile index 32833c1f55..979a41cc5c 100644 --- a/usr/src/cmd/rmvolmgr/Makefile +++ b/usr/src/cmd/rmvolmgr/Makefile @@ -40,7 +40,7 @@ LDLIBS += -ldbus-1 -ldbus-glib-1 -lglib-2.0 -lhal -lhal-storage -lcontract -lscf CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-uninitialized diff --git a/usr/src/cmd/savecore/Makefile.com b/usr/src/cmd/savecore/Makefile.com index 591f33395b..ef8185d6d8 100644 --- a/usr/src/cmd/savecore/Makefile.com +++ b/usr/src/cmd/savecore/Makefile.com @@ -28,7 +28,7 @@ OBJS= savecore.o compress.o include ../../Makefile.cmd -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CFLAGS += $(CCVERBOSE) CFLAGS64 += $(CCVERBOSE) diff --git a/usr/src/cmd/sgs/Makefile.com b/usr/src/cmd/sgs/Makefile.com index 650a93e967..6964761a4e 100644 --- a/usr/src/cmd/sgs/Makefile.com +++ b/usr/src/cmd/sgs/Makefile.com @@ -41,12 +41,12 @@ ARCH = $($(MACH)_ARCH) # Setting DEBUG = -DDEBUG (or "make DEBUG=-DDEBUG ...") enables ASSERT() # checking. This is automatically enabled for DEBUG builds, not for non-debug -# builds. Unset the global C99_DISABLE flag to insure we uncover all compiler +# builds. Unset the global CSTD_GNU89 flag to insure we uncover all compiler # warnings/errors. DEBUG = $(NOT_RELEASE_BUILD)DEBUG = -DDEBUG -C99_DISABLE = $(C99_ENABLE) +CSTD_GNU89 = $(CSTD_GNU99) CFLAGS += $(CCVERBOSE) $(DEBUG) $(XFFLAG) CFLAGS64 += $(CCVERBOSE) $(DEBUG) $(XFFLAG) diff --git a/usr/src/cmd/sgs/ar/Makefile.com b/usr/src/cmd/sgs/ar/Makefile.com index 4d00f744a4..dcd81c9f7c 100644 --- a/usr/src/cmd/sgs/ar/Makefile.com +++ b/usr/src/cmd/sgs/ar/Makefile.com @@ -39,7 +39,7 @@ LLDFLAGS = '-R$$ORIGIN/../../lib' LLDFLAGS64 = '-R$$ORIGIN/../../../lib/$(MACH64)' CPPFLAGS= -I. -I../../include $(CPPFLAGS.master) -I$(ELFCAP) CFLAGS += $(CCVERBOSE) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CERRWARN += -_gcc=-Wno-uninitialized LDLIBS += -lelf $(CONVLIBDIR) $(CONV_LIB) -lsendfile diff --git a/usr/src/cmd/sgs/error/i386/Makefile b/usr/src/cmd/sgs/error/i386/Makefile index bafd104413..91b26e49bc 100644 --- a/usr/src/cmd/sgs/error/i386/Makefile +++ b/usr/src/cmd/sgs/error/i386/Makefile @@ -38,7 +38,7 @@ INCLIST= -I../common DEFLIST= -DELF CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) CFLAGS += $(CCVERBOSE) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-parentheses diff --git a/usr/src/cmd/sgs/error/sparc/Makefile b/usr/src/cmd/sgs/error/sparc/Makefile index cd3bf66bda..2023ad1a42 100644 --- a/usr/src/cmd/sgs/error/sparc/Makefile +++ b/usr/src/cmd/sgs/error/sparc/Makefile @@ -41,7 +41,7 @@ CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-parentheses -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CLEANFILES += $(LINTOUT) diff --git a/usr/src/cmd/sgs/gprof/Makefile.com b/usr/src/cmd/sgs/gprof/Makefile.com index 71f1ac66c4..cb08915388 100644 --- a/usr/src/cmd/sgs/gprof/Makefile.com +++ b/usr/src/cmd/sgs/gprof/Makefile.com @@ -41,7 +41,7 @@ INCLIST= -I../common -I../../include -I../../include/$(MACH) DEFLIST= -DELF_OBJ -DELF CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) -I$(ELFCAP) CFLAGS += $(CCVERBOSE) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LDLIBS += $(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf LINTSRCS = $(SRCS) LINTFLAGS += -x diff --git a/usr/src/cmd/sgs/lex/Makefile.com b/usr/src/cmd/sgs/lex/Makefile.com index 15169ec277..e13b98168f 100644 --- a/usr/src/cmd/sgs/lex/Makefile.com +++ b/usr/src/cmd/sgs/lex/Makefile.com @@ -44,7 +44,7 @@ include ../../../../lib/Makefile.lib SRCDIR = ../common -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CERRWARN += -_gcc=-Wno-unused-label CERRWARN += -_gcc=-Wno-uninitialized diff --git a/usr/src/cmd/sgs/m4/i386/Makefile b/usr/src/cmd/sgs/m4/i386/Makefile index 0a13a85c48..a3e69b92bb 100644 --- a/usr/src/cmd/sgs/m4/i386/Makefile +++ b/usr/src/cmd/sgs/m4/i386/Makefile @@ -50,7 +50,7 @@ INCLIST= -I../common DEFLIST= -DELF CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) CFLAGS += $(CCVERBOSE) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-unused-label diff --git a/usr/src/cmd/sgs/m4/sparc/Makefile b/usr/src/cmd/sgs/m4/sparc/Makefile index ecda17a550..dea00a256f 100644 --- a/usr/src/cmd/sgs/m4/sparc/Makefile +++ b/usr/src/cmd/sgs/m4/sparc/Makefile @@ -55,7 +55,7 @@ CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-unused-label CERRWARN += -_gcc=-Wno-uninitialized -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LINTFLAGS += $(LDLIBS) CLEANFILES += $(LINTOUT) $(BLTSRCS) diff --git a/usr/src/cmd/sgs/prof/Makefile.com b/usr/src/cmd/sgs/prof/Makefile.com index edaaa695f8..f35c626e36 100644 --- a/usr/src/cmd/sgs/prof/Makefile.com +++ b/usr/src/cmd/sgs/prof/Makefile.com @@ -41,7 +41,7 @@ INCLIST= -I../common -I../../include -I../../include/$(MACH) CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) -I$(ELFCAP) CFLAGS += $(CCVERBOSE) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CERRWARN += -_gcc=-Wno-uninitialized LDLIBS += $(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf LINTSRCS = $(SRCS) diff --git a/usr/src/cmd/sgs/tsort/i386/Makefile b/usr/src/cmd/sgs/tsort/i386/Makefile index c565d58a91..0df033fb0e 100644 --- a/usr/src/cmd/sgs/tsort/i386/Makefile +++ b/usr/src/cmd/sgs/tsort/i386/Makefile @@ -36,7 +36,7 @@ SRCS= $(OBJS:%.o=../common/%.c) DEFLIST= -DELF CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) CFLAGS += $(CCVERBOSE) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CERRWARN += -_gcc=-Wno-parentheses diff --git a/usr/src/cmd/sgs/tsort/sparc/Makefile b/usr/src/cmd/sgs/tsort/sparc/Makefile index 508983d078..6a5e794bda 100644 --- a/usr/src/cmd/sgs/tsort/sparc/Makefile +++ b/usr/src/cmd/sgs/tsort/sparc/Makefile @@ -39,7 +39,7 @@ DEFLIST= -DELF CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-parentheses -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CLEANFILES += $(LINTOUT) diff --git a/usr/src/cmd/sgs/unifdef/i386/Makefile b/usr/src/cmd/sgs/unifdef/i386/Makefile index 33f7b96b30..45fd3c3bea 100644 --- a/usr/src/cmd/sgs/unifdef/i386/Makefile +++ b/usr/src/cmd/sgs/unifdef/i386/Makefile @@ -34,7 +34,7 @@ SRCS= $(OBJS:%.o=../common/%.c) DEFLIST= -DELF_OBJ -DELF CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) CFLAGS += $(CCVERBOSE) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LINTFLAGS += $(LDLIBS) CLEANFILES += $(LINTOUT) diff --git a/usr/src/cmd/sgs/unifdef/sparc/Makefile b/usr/src/cmd/sgs/unifdef/sparc/Makefile index 0a16f4c5f0..297bfe27a5 100644 --- a/usr/src/cmd/sgs/unifdef/sparc/Makefile +++ b/usr/src/cmd/sgs/unifdef/sparc/Makefile @@ -36,7 +36,7 @@ CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-char-subscripts CERRWARN += -_gcc=-Wno-parentheses -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LINTFLAGS += $(LDLIBS) CLEANFILES += $(LINTOUT) diff --git a/usr/src/cmd/sgs/yacc/Makefile.com b/usr/src/cmd/sgs/yacc/Makefile.com index 9744f284ea..07782396a5 100644 --- a/usr/src/cmd/sgs/yacc/Makefile.com +++ b/usr/src/cmd/sgs/yacc/Makefile.com @@ -68,7 +68,7 @@ BUILD.AR= $(AR) $(ARFLAGS) $@ `$(LORDER) $(OBJS) | $(TSORT)` LINTPOUT= lint.out -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CFLAGS += $(CCVERBOSE) CFLAGS64 += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-parentheses diff --git a/usr/src/cmd/smbsrv/Makefile.smbsrv.defs b/usr/src/cmd/smbsrv/Makefile.smbsrv.defs index 3de8e3efff..050a8e6255 100644 --- a/usr/src/cmd/smbsrv/Makefile.smbsrv.defs +++ b/usr/src/cmd/smbsrv/Makefile.smbsrv.defs @@ -22,8 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # # Common definitions for all smbsrv commands @@ -36,5 +34,5 @@ LINTFLAGS += -xerroff=E_NAME_DEF_NOT_USED2 CFLAGS += $(CCVERBOSE) $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG -C99MODE = -xc99=%all +CSTD = $(CSTD_GNU99) C99LMODE = -Xc99=%all diff --git a/usr/src/cmd/smbsrv/fksmbd/Makefile b/usr/src/cmd/smbsrv/fksmbd/Makefile index ca3a8b5fb9..9a28a3c8eb 100644 --- a/usr/src/cmd/smbsrv/fksmbd/Makefile +++ b/usr/src/cmd/smbsrv/fksmbd/Makefile @@ -66,7 +66,7 @@ INCS += -I../../../common/smbsrv # Should not have to do this, but the Kerberos includes are a mess. INCS += -I $(ROOT)/usr/include/kerberosv5 -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CFLAGS += $(CCVERBOSE) diff --git a/usr/src/cmd/smbsrv/smbd/Makefile b/usr/src/cmd/smbsrv/smbd/Makefile index 7af39ef1a7..c744f73ec6 100644 --- a/usr/src/cmd/smbsrv/smbd/Makefile +++ b/usr/src/cmd/smbsrv/smbd/Makefile @@ -69,7 +69,7 @@ $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG # Should not have to do this, but the Kerberos includes are a mess. CPPFLAGS += -I $(ROOT)/usr/include/kerberosv5 -C99MODE = -xc99=%all +CSTD = $(CSTD_GNU99) C99LMODE = -Xc99=%all LDFLAGS += -R/usr/lib/smbsrv diff --git a/usr/src/cmd/tail/Makefile b/usr/src/cmd/tail/Makefile index 293920cfd1..52e433c7be 100644 --- a/usr/src/cmd/tail/Makefile +++ b/usr/src/cmd/tail/Makefile @@ -25,7 +25,7 @@ include ../Makefile.cmd CLOBBERFILES= $(PROG) CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all LINTFLAGS += -I. -erroff=E_CONSTANT_CONDITION diff --git a/usr/src/cmd/th_tools/Makefile b/usr/src/cmd/th_tools/Makefile index 28dd878fdb..ed9d5ae75a 100644 --- a/usr/src/cmd/th_tools/Makefile +++ b/usr/src/cmd/th_tools/Makefile @@ -30,7 +30,7 @@ include ../Makefile.cmd CFLAGS += -I$(SRC)/uts/common LINTFLAGS += -I$(SRC)/uts/common -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-uninitialized diff --git a/usr/src/cmd/tr/Makefile b/usr/src/cmd/tr/Makefile index 8b556040a5..0da9ab2094 100644 --- a/usr/src/cmd/tr/Makefile +++ b/usr/src/cmd/tr/Makefile @@ -26,7 +26,7 @@ include ../Makefile.cmd CLOBBERFILES= $(PROG) -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CPPFLAGS += -D_ILLUMOS_PRIVATE -I. LINTFLAGS += -D_ILLUMOS_PRIVATE -I. diff --git a/usr/src/cmd/truss/Makefile.com b/usr/src/cmd/truss/Makefile.com index 0ed14909e4..e2951b1f35 100644 --- a/usr/src/cmd/truss/Makefile.com +++ b/usr/src/cmd/truss/Makefile.com @@ -42,7 +42,7 @@ CFLAGS64 += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-switch -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LDLIBS += -lproc -lrtld_db -lc_db -lnsl -lsocket -ltsol -lnvpair CPPFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE=1 diff --git a/usr/src/cmd/uuidgen/Makefile b/usr/src/cmd/uuidgen/Makefile index 663e2dbd43..bc15966cae 100644 --- a/usr/src/cmd/uuidgen/Makefile +++ b/usr/src/cmd/uuidgen/Makefile @@ -20,7 +20,7 @@ include ../Makefile.cmd CFLAGS += $(CCVERBOSE) LDLIBS += -luuid -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/volcheck/Makefile b/usr/src/cmd/volcheck/Makefile index 762dd50c9b..8f95cb5b10 100644 --- a/usr/src/cmd/volcheck/Makefile +++ b/usr/src/cmd/volcheck/Makefile @@ -39,7 +39,7 @@ LDLIBS += -ldbus-1 -ldbus-glib-1 -lglib-2.0 -lhal -lhal-storage -lcontract CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal CPPFLAGS += -I$(SRC)/cmd/rmvolmgr -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-unused-variable diff --git a/usr/src/cmd/volrmmount/Makefile b/usr/src/cmd/volrmmount/Makefile index 5166036a04..f503dc768a 100644 --- a/usr/src/cmd/volrmmount/Makefile +++ b/usr/src/cmd/volrmmount/Makefile @@ -39,7 +39,7 @@ LDLIBS += -ldbus-1 -ldbus-glib-1 -lglib-2.0 -lhal -lhal-storage -lcontract CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal CPPFLAGS += -I$(SRC)/cmd/rmvolmgr -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-unused-variable diff --git a/usr/src/cmd/vscan/vscanadm/Makefile b/usr/src/cmd/vscan/vscanadm/Makefile index e5765bcbb2..f27f4a22e4 100755 --- a/usr/src/cmd/vscan/vscanadm/Makefile +++ b/usr/src/cmd/vscan/vscanadm/Makefile @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# -#ident "%Z%%M% %I% %E% SMI" PROG = vscanadm SRCS = vscanadm.c @@ -35,7 +33,7 @@ LDLIBS += -L$(ROOT)/usr/lib/vscan -lvscan LDFLAGS += -R/usr/lib/vscan CFLAGS += $(CCVERBOSE) -C99MODE = -xc99=%all +CSTD = $(CSTD_GNU99) C99LMODE = -Xc99=%all .KEEP_STATE: diff --git a/usr/src/cmd/vscan/vscand/Makefile b/usr/src/cmd/vscan/vscand/Makefile index 15ff0086c2..dfc363c83d 100644 --- a/usr/src/cmd/vscan/vscand/Makefile +++ b/usr/src/cmd/vscan/vscand/Makefile @@ -47,7 +47,7 @@ $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG CERRWARN += -_gcc=-Wno-switch LINTFLAGS += -mu -C99MODE = -xc99=%all +CSTD = $(CSTD_GNU99) C99LMODE = -Xc99=%all MANIFEST = vscan.xml diff --git a/usr/src/cmd/vtfontcvt/Makefile.common b/usr/src/cmd/vtfontcvt/Makefile.common index 4ce385418e..f951eef71b 100644 --- a/usr/src/cmd/vtfontcvt/Makefile.common +++ b/usr/src/cmd/vtfontcvt/Makefile.common @@ -26,4 +26,4 @@ LDLIBS += -lumem $(COMPILE.c) $< $(POST_PROCESS_O) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) diff --git a/usr/src/cmd/zdb/Makefile.com b/usr/src/cmd/zdb/Makefile.com index 78d1bb1738..1870ccd0c5 100644 --- a/usr/src/cmd/zdb/Makefile.com +++ b/usr/src/cmd/zdb/Makefile.com @@ -40,7 +40,7 @@ INCS += -I../../../common/zfs LDLIBS += -lzpool -lumem -lnvpair -lzfs -lavl -lcmdutils -lfakekernel -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CFLAGS += $(CCVERBOSE) diff --git a/usr/src/cmd/zfs/Makefile b/usr/src/cmd/zfs/Makefile index f84bcbb108..a3d61c7ee4 100644 --- a/usr/src/cmd/zfs/Makefile +++ b/usr/src/cmd/zfs/Makefile @@ -44,7 +44,7 @@ LDLIBS += -lzfs_core -lzfs -luutil -lumem -lnvpair -lsec -lidmap INCS += -I../../common/zfs -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CPPFLAGS += -D_LARGEFILE64_SOURCE=1 -D_REENTRANT $(INCS) diff --git a/usr/src/cmd/zhack/Makefile.com b/usr/src/cmd/zhack/Makefile.com index 3e7890d5d7..8a87de4ec9 100644 --- a/usr/src/cmd/zhack/Makefile.com +++ b/usr/src/cmd/zhack/Makefile.com @@ -43,7 +43,7 @@ INCS += -I../../../common/zfs LDLIBS += -lzpool -lumem -lnvpair -lzfs -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CFLAGS += $(CCVERBOSE) diff --git a/usr/src/cmd/zinject/Makefile.com b/usr/src/cmd/zinject/Makefile.com index 5bfe8bad79..a1a3baf712 100644 --- a/usr/src/cmd/zinject/Makefile.com +++ b/usr/src/cmd/zinject/Makefile.com @@ -38,7 +38,7 @@ INCS += -I../../../uts/common/fs/zfs/lua LDLIBS += -lzpool -lzfs -lnvpair -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CPPFLAGS.first = -I$(SRC)/lib/libfakekernel/common -D_FAKE_KERNEL diff --git a/usr/src/cmd/zlook/Makefile.com b/usr/src/cmd/zlook/Makefile.com index 937842724d..06627ad814 100644 --- a/usr/src/cmd/zlook/Makefile.com +++ b/usr/src/cmd/zlook/Makefile.com @@ -28,7 +28,7 @@ SRCS= ../$(PROG).c include ../../Makefile.cmd -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CFLAGS += -g $(CCVERBOSE) CFLAGS64 += -g $(CCVERBOSE) diff --git a/usr/src/cmd/zstreamdump/Makefile b/usr/src/cmd/zstreamdump/Makefile index 5b7e6b79c1..ba249bafab 100644 --- a/usr/src/cmd/zstreamdump/Makefile +++ b/usr/src/cmd/zstreamdump/Makefile @@ -35,7 +35,7 @@ INCS += -I../../common/zfs LDLIBS += -lzfs -lnvpair -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CPPFLAGS += -D_LARGEFILE64_SOURCE=1 -D_REENTRANT $(INCS) diff --git a/usr/src/cmd/ztest/Makefile.com b/usr/src/cmd/ztest/Makefile.com index 172ff02b5a..8f6c9d5ccf 100644 --- a/usr/src/cmd/ztest/Makefile.com +++ b/usr/src/cmd/ztest/Makefile.com @@ -38,7 +38,7 @@ INCS += -I../../../common/zfs LDLIBS += -lumem -lzpool -lcmdutils -lm -lnvpair -lfakekernel -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CFLAGS += -g $(CCVERBOSE) CFLAGS64 += -g $(CCVERBOSE) |