Skip to content
Permalink
Browse files

9027 Makefiles need to specify C99 mode consistently

Reviewed by: Rich Lowe <richlowe@richlowe.net>
Approved by: Hans Rosenfeld <hans.rosenfeld@joyent.com>
  • Loading branch information...
yuripv authored and hrosenfeld committed Feb 5, 2018
1 parent 9a67df4 commit bd0ce624be4492bab2f6c53383a40618647aba28
Showing with 228 additions and 307 deletions.
  1. +1 −1 usr/src/Makefile.ast
  2. +10 −10 usr/src/Makefile.master
  3. +1 −1 usr/src/cmd/boot/bootadm/Makefile
  4. +1 −1 usr/src/cmd/boot/installboot/Makefile.com
  5. +1 −1 usr/src/cmd/boot/installgrub/Makefile
  6. +1 −1 usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile
  7. +1 −1 usr/src/cmd/cmd-inet/usr.lib/ilbd/Makefile
  8. +1 −1 usr/src/cmd/cmd-inet/usr.lib/in.mpathd/Makefile
  9. +1 −1 usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile
  10. +1 −1 usr/src/cmd/cmd-inet/usr.lib/vrrpd/Makefile
  11. +1 −1 usr/src/cmd/cmd-inet/usr.sbin/ilbadm/Makefile
  12. +1 −1 usr/src/cmd/cmd-inet/usr.sbin/ipmpstat/Makefile
  13. +1 −1 usr/src/cmd/cmd-inet/usr.sbin/ping/Makefile
  14. +1 −1 usr/src/cmd/coreadm/Makefile
  15. +1 −1 usr/src/cmd/diskinfo/Makefile
  16. +1 −1 usr/src/cmd/fm/notify/smtp-notify/Makefile.com
  17. +1 −1 usr/src/cmd/fm/notify/snmp-notify/Makefile.com
  18. +1 −1 usr/src/cmd/fs.d/nfs/lockd/Makefile
  19. +1 −1 usr/src/cmd/fs.d/reparsed/Makefile
  20. +1 −1 usr/src/cmd/fs.d/smbclnt/chacl/Makefile
  21. +1 −1 usr/src/cmd/fs.d/smbclnt/lsacl/Makefile
  22. +1 −1 usr/src/cmd/fs.d/smbclnt/mount/Makefile
  23. +1 −1 usr/src/cmd/fs.d/smbclnt/smbiod-svc/Makefile
  24. +1 −1 usr/src/cmd/fs.d/smbclnt/smbiod/Makefile
  25. +1 −1 usr/src/cmd/fs.d/smbclnt/smbutil/Makefile
  26. +1 −1 usr/src/cmd/fs.d/smbclnt/test/Makefile
  27. +5 −5 usr/src/cmd/getconf/Makefile
  28. +1 −3 usr/src/cmd/hal/addons/acpi/Makefile
  29. +1 −3 usr/src/cmd/hal/addons/cpufreq/Makefile
  30. +1 −1 usr/src/cmd/hal/addons/network-devices/Makefile
  31. +1 −1 usr/src/cmd/hal/addons/storage/Makefile
  32. +1 −3 usr/src/cmd/hal/hald-runner/Makefile
  33. +1 −1 usr/src/cmd/hal/hald/Makefile
  34. +1 −1 usr/src/cmd/hal/hald/solaris/Makefile
  35. +1 −3 usr/src/cmd/hal/probing/acpi/Makefile
  36. +1 −1 usr/src/cmd/hal/probing/network-printer/Makefile
  37. +1 −3 usr/src/cmd/hal/probing/printer/Makefile
  38. +1 −3 usr/src/cmd/hal/probing/storage/Makefile
  39. +1 −3 usr/src/cmd/hal/probing/volume/Makefile
  40. +1 −1 usr/src/cmd/hal/probing/xkb/Makefile
  41. +1 −1 usr/src/cmd/hal/tools/Makefile
  42. +1 −3 usr/src/cmd/hal/tools/sunos/Makefile
  43. +1 −1 usr/src/cmd/iconv/Makefile
  44. +1 −1 usr/src/cmd/idmap/idmapd/Makefile
  45. +1 −1 usr/src/cmd/latencytop/Makefile.com
  46. +1 −3 usr/src/cmd/ldap/Makefile
  47. +6 −6 usr/src/cmd/ldap/Makefile.com
  48. +1 −1 usr/src/cmd/ldmad/Makefile
  49. +1 −1 usr/src/cmd/mandoc/Makefile.common
  50. +1 −1 usr/src/cmd/mdb/Makefile.mdb
  51. +1 −1 usr/src/cmd/mdb/Makefile.module
  52. +1 −1 usr/src/cmd/mdb/intel/amd64/libfksmbsrv/Makefile
  53. +1 −1 usr/src/cmd/mdb/intel/amd64/libzpool/Makefile
  54. +1 −1 usr/src/cmd/mdb/intel/amd64/nsmb/Makefile
  55. +1 −1 usr/src/cmd/mdb/intel/amd64/pmcs/Makefile
  56. +1 −1 usr/src/cmd/mdb/intel/amd64/qlc/Makefile
  57. +1 −1 usr/src/cmd/mdb/intel/amd64/smbfs/Makefile
  58. +1 −1 usr/src/cmd/mdb/intel/amd64/smbsrv/Makefile
  59. +1 −1 usr/src/cmd/mdb/intel/amd64/srpt/Makefile
  60. +1 −1 usr/src/cmd/mdb/intel/amd64/zfs/Makefile
  61. +1 −1 usr/src/cmd/mdb/intel/ia32/libfksmbsrv/Makefile
  62. +1 −1 usr/src/cmd/mdb/intel/ia32/libzpool/Makefile
  63. +1 −2 usr/src/cmd/mdb/intel/modules/mdb_kb/amd64/Makefile
  64. +1 −1 usr/src/cmd/mdb/sparc/v7/libfksmbsrv/Makefile
  65. +1 −1 usr/src/cmd/mdb/sparc/v7/libzpool/Makefile
  66. +1 −1 usr/src/cmd/mdb/sparc/v9/libfksmbsrv/Makefile
  67. +1 −1 usr/src/cmd/mdb/sparc/v9/libzpool/Makefile
  68. +1 −1 usr/src/cmd/mdb/sparc/v9/nsmb/Makefile
  69. +1 −1 usr/src/cmd/mdb/sparc/v9/pmcs/Makefile
  70. +1 −1 usr/src/cmd/mdb/sparc/v9/qlc/Makefile
  71. +1 −1 usr/src/cmd/mdb/sparc/v9/smbfs/Makefile
  72. +1 −1 usr/src/cmd/mdb/sparc/v9/smbsrv/Makefile
  73. +1 −1 usr/src/cmd/mdb/sparc/v9/srpt/Makefile
  74. +1 −1 usr/src/cmd/mdb/sparc/v9/stmf_sbd/Makefile
  75. +1 −1 usr/src/cmd/mdb/sparc/v9/zfs/Makefile
  76. +1 −1 usr/src/cmd/ndmpd/Makefile
  77. +1 −1 usr/src/cmd/nvmeadm/Makefile
  78. +1 −1 usr/src/cmd/od/Makefile
  79. +1 −1 usr/src/cmd/perl/Makefile.perl
  80. +1 −1 usr/src/cmd/policykit/Makefile
  81. +1 −1 usr/src/cmd/rmmount/Makefile
  82. +1 −1 usr/src/cmd/rmvolmgr/Makefile
  83. +1 −1 usr/src/cmd/savecore/Makefile.com
  84. +2 −2 usr/src/cmd/sgs/Makefile.com
  85. +1 −1 usr/src/cmd/sgs/ar/Makefile.com
  86. +1 −1 usr/src/cmd/sgs/error/i386/Makefile
  87. +1 −1 usr/src/cmd/sgs/error/sparc/Makefile
  88. +1 −1 usr/src/cmd/sgs/gprof/Makefile.com
  89. +1 −1 usr/src/cmd/sgs/lex/Makefile.com
  90. +1 −1 usr/src/cmd/sgs/m4/i386/Makefile
  91. +1 −1 usr/src/cmd/sgs/m4/sparc/Makefile
  92. +1 −1 usr/src/cmd/sgs/prof/Makefile.com
  93. +1 −1 usr/src/cmd/sgs/tsort/i386/Makefile
  94. +1 −1 usr/src/cmd/sgs/tsort/sparc/Makefile
  95. +1 −1 usr/src/cmd/sgs/unifdef/i386/Makefile
  96. +1 −1 usr/src/cmd/sgs/unifdef/sparc/Makefile
  97. +1 −1 usr/src/cmd/sgs/yacc/Makefile.com
  98. +1 −3 usr/src/cmd/smbsrv/Makefile.smbsrv.defs
  99. +1 −1 usr/src/cmd/smbsrv/fksmbd/Makefile
  100. +1 −1 usr/src/cmd/smbsrv/smbd/Makefile
  101. +1 −1 usr/src/cmd/tail/Makefile
  102. +1 −1 usr/src/cmd/th_tools/Makefile
  103. +1 −1 usr/src/cmd/tr/Makefile
  104. +1 −1 usr/src/cmd/truss/Makefile.com
  105. +1 −1 usr/src/cmd/uuidgen/Makefile
  106. +1 −1 usr/src/cmd/volcheck/Makefile
  107. +1 −1 usr/src/cmd/volrmmount/Makefile
  108. +1 −3 usr/src/cmd/vscan/vscanadm/Makefile
  109. +1 −1 usr/src/cmd/vscan/vscand/Makefile
  110. +1 −1 usr/src/cmd/vtfontcvt/Makefile.common
  111. +1 −1 usr/src/cmd/zdb/Makefile.com
  112. +1 −1 usr/src/cmd/zfs/Makefile
  113. +1 −1 usr/src/cmd/zhack/Makefile.com
  114. +1 −1 usr/src/cmd/zinject/Makefile.com
  115. +1 −1 usr/src/cmd/zlook/Makefile.com
  116. +1 −1 usr/src/cmd/zstreamdump/Makefile
  117. +1 −1 usr/src/cmd/ztest/Makefile.com
  118. +1 −1 usr/src/lib/brand/solaris10/s10_brand/Makefile.com
  119. +1 −1 usr/src/lib/fm/libfmd_snmp/Makefile.com
  120. +1 −1 usr/src/lib/fm/libfmevent/Makefile.com
  121. +1 −1 usr/src/lib/fm/libfmnotify/Makefile.com
  122. +1 −1 usr/src/lib/fm/topo/modules/Makefile.plugin
  123. +1 −1 usr/src/lib/libads/Makefile.com
  124. +1 −1 usr/src/lib/libadutils/Makefile.com
  125. +1 −3 usr/src/lib/libbc/Makefile
  126. +1 −1 usr/src/lib/libbc/sparc/Makefile
  127. +1 −1 usr/src/lib/libbe/Makefile.com
  128. +1 −1 usr/src/lib/libc/amd64/Makefile
  129. +1 −1 usr/src/lib/libc/i386/Makefile.com
  130. +1 −1 usr/src/lib/libc/sparc/Makefile.com
  131. +1 −1 usr/src/lib/libc/sparcv9/Makefile.com
  132. +1 −1 usr/src/lib/libdisasm/Makefile.com
  133. +1 −1 usr/src/lib/libdns_sd/Makefile.com
  134. +1 −1 usr/src/lib/libdns_sd/java/Makefile.com
  135. +1 −1 usr/src/lib/libfakekernel/Makefile.com
  136. +1 −1 usr/src/lib/libfcoe/Makefile.com
  137. +1 −1 usr/src/lib/libfdisk/Makefile.com
  138. +1 −1 usr/src/lib/libficl/Makefile.com
  139. +1 −1 usr/src/lib/libidmap/Makefile.com
  140. +1 −1 usr/src/lib/libilb/Makefile.com
  141. +1 −1 usr/src/lib/libinetsvc/Makefile.com
  142. +1 −1 usr/src/lib/libipmi/Makefile.com
  143. +1 −1 usr/src/lib/libiscsit/Makefile.com
  144. +4 −4 usr/src/lib/libm/Makefile.libm.com
  145. +1 −1 usr/src/lib/libndmp/Makefile.com
  146. +1 −1 usr/src/lib/libnsctl/Makefile.com
  147. +1 −1 usr/src/lib/libnvpair/Makefile.com
  148. +1 −1 usr/src/lib/libproc/Makefile.com
  149. +1 −1 usr/src/lib/libresolv/Makefile
  150. +1 −3 usr/src/lib/librestart/Makefile.com
  151. +1 −1 usr/src/lib/libsaveargs/tests/dump/Makefile
  152. +1 −1 usr/src/lib/libscf/Makefile.com
  153. +1 −1 usr/src/lib/libshare/Makefile.com
  154. +1 −1 usr/src/lib/libsmbfs/Makefile.com
  155. +1 −1 usr/src/lib/libsrpt/Makefile.com
  156. +1 −1 usr/src/lib/libstmf/Makefile.com
  157. +1 −1 usr/src/lib/libstmfproxy/Makefile.com
  158. +1 −1 usr/src/lib/libv12n/sparc/Makefile
  159. +1 −1 usr/src/lib/libv12n/sparcv9/Makefile
  160. +1 −1 usr/src/lib/libvrrpadm/Makefile.com
  161. +1 −1 usr/src/lib/libzfs/Makefile.com
  162. +1 −1 usr/src/lib/libzfs_core/Makefile.com
  163. +1 −1 usr/src/lib/libzpool/Makefile.com
  164. +1 −3 usr/src/lib/nsswitch/mdns/Makefile.com
  165. +1 −1 usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com
  166. +1 −1 usr/src/lib/policykit/Makefile.com
  167. +1 −1 usr/src/lib/pylibbe/Makefile.com
  168. +1 −1 usr/src/lib/pysolaris/Makefile.com
  169. +1 −1 usr/src/lib/pyzfs/Makefile.com
  170. +1 −1 usr/src/lib/scsi/libscsi/Makefile.com
  171. +1 −1 usr/src/lib/scsi/libses/Makefile.defs
  172. +1 −1 usr/src/lib/scsi/libsmp/Makefile.com
  173. +1 −2 usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine
  174. +1 −2 usr/src/lib/scsi/plugins/ses/Makefile.lib
  175. +1 −1 usr/src/lib/scsi/plugins/smp/Makefile.lib
  176. +1 −2 usr/src/lib/smbsrv/Makefile.lib
  177. +2 −2 usr/src/psm/stand/bootlst/common/Makefile.com
  178. +2 −2 usr/src/psm/stand/cpr/common/Makefile.com
  179. +1 −1 usr/src/test/crypto-tests/tests/modes/aes/Makefile.subdirs
  180. +1 −1 usr/src/test/libc-tests/tests/Makefile.com
  181. +1 −1 usr/src/test/libc-tests/tests/select/Makefile
  182. +1 −1 usr/src/test/os-tests/tests/file-locking/Makefile
  183. +1 −1 usr/src/test/os-tests/tests/poll/Makefile
  184. +1 −1 usr/src/test/os-tests/tests/sigqueue/Makefile
  185. +1 −1 usr/src/test/os-tests/tests/sockfs/Makefile
  186. +1 −1 usr/src/test/os-tests/tests/spoof-ras/Makefile
  187. +1 −1 usr/src/test/zfs-tests/cmd/Makefile.subdirs
  188. +1 −1 usr/src/test/zfs-tests/tests/functional/channel_program/lua_core/Makefile
  189. +1 −1 usr/src/test/zfs-tests/tests/functional/checksum/Makefile.subdirs
  190. +1 −1 usr/src/tools/btxld/Makefile
  191. +1 −1 usr/src/tools/ctf/cvt/Makefile.com
  192. +1 −1 usr/src/uts/Makefile.uts
  193. +1 −1 usr/src/uts/i86pc/Makefile.rules
  194. +1 −1 usr/src/uts/i86xpv/Makefile.rules
  195. +1 −1 usr/src/uts/intel/bfe/Makefile
  196. +0 −1 usr/src/uts/intel/bnxe/Makefile
  197. +0 −2 usr/src/uts/intel/chxge/Makefile
  198. +0 −1 usr/src/uts/intel/cxgbe/cxgbe/Makefile
  199. +0 −1 usr/src/uts/intel/cxgbe/t4nex/Makefile
  200. +0 −3 usr/src/uts/intel/dca/Makefile
  201. +0 −1 usr/src/uts/intel/fct/Makefile
  202. +0 −1 usr/src/uts/intel/iscsit/Makefile
  203. +0 −1 usr/src/uts/intel/nsmb/Makefile
  204. +0 −1 usr/src/uts/intel/pppt/Makefile
  205. +0 −1 usr/src/uts/intel/qlge/Makefile
  206. +0 −1 usr/src/uts/intel/qlt/Makefile
  207. +1 −1 usr/src/uts/intel/sfe/Makefile
  208. +0 −1 usr/src/uts/intel/smbfs/Makefile
  209. +0 −1 usr/src/uts/intel/srpt/Makefile
  210. +0 −1 usr/src/uts/intel/stmf/Makefile
  211. +0 −1 usr/src/uts/intel/stmf_sbd/Makefile
  212. +2 −2 usr/src/uts/intel/xge/Makefile
  213. +0 −1 usr/src/uts/intel/zfs/Makefile
  214. +0 −1 usr/src/uts/intel/zut/Makefile
  215. +1 −1 usr/src/uts/sparc/Makefile.sparc
  216. +0 −1 usr/src/uts/sparc/bnxe/Makefile
  217. +0 −2 usr/src/uts/sparc/chxge/Makefile
  218. +0 −1 usr/src/uts/sparc/dca/Makefile
  219. +0 −1 usr/src/uts/sparc/fct/Makefile
  220. +0 −1 usr/src/uts/sparc/iscsit/Makefile
  221. +0 −1 usr/src/uts/sparc/nsmb/Makefile
  222. +0 −1 usr/src/uts/sparc/pppt/Makefile
  223. +0 −1 usr/src/uts/sparc/qlge/Makefile
  224. +0 −1 usr/src/uts/sparc/qlt/Makefile
  225. +1 −1 usr/src/uts/sparc/sfe/Makefile
  226. +0 −1 usr/src/uts/sparc/smbfs/Makefile
  227. +0 −1 usr/src/uts/sparc/srpt/Makefile
  228. +0 −1 usr/src/uts/sparc/stmf/Makefile
  229. +0 −1 usr/src/uts/sparc/stmf_sbd/Makefile
  230. +2 −2 usr/src/uts/sparc/xge/Makefile
  231. +0 −1 usr/src/uts/sparc/zfs/Makefile
  232. +0 −1 usr/src/uts/sparc/zut/Makefile
  233. +1 −1 usr/src/uts/sun4u/Makefile.sun4u
  234. +1 −1 usr/src/uts/sun4v/Makefile.sun4v
  235. +0 −11 usr/src/uts/sun4v/vsw/Makefile
@@ -26,7 +26,7 @@
# Override this top level flag so the compiler builds in its native
# C99 mode. This has been enabled to support the math stuff in the
# AST tools (including ksh93).
C99MODE= $(C99_ENABLE) -D_XOPEN_SOURCE=600 -D__EXTENSIONS__=1
CSTD= $(CSTD_GNU99) -D_XOPEN_SOURCE=600 -D__EXTENSIONS__=1

# silence common AST&co. warnings...
# ... about |#pragma prototyped| ...
@@ -406,11 +406,11 @@ $(RELEASE_BUILD)CERRWARN += -_gcc=-Wno-empty-body
# turn warnings into errors (C++)
CCERRWARN= -xwe

# C99 mode
C99_ENABLE= -xc99=%all
C99_DISABLE= -xc99=%none
C99MODE= $(C99_DISABLE)
C99LMODE= $(C99MODE:-xc99%=-Xc99%)
# C standard. Keep Studio flags until we get rid of lint.
CSTD_GNU89= -xc99=%none
CSTD_GNU99= -xc99=%all
CSTD= $(CSTD_GNU89)
C99LMODE= $(CSTD:-xc99%=-Xc99%)

# In most places, assignments to these macros should be appended with +=
# (CPPFLAGS.first allows values to be prepended to CPPFLAGS).
@@ -460,8 +460,8 @@ DEBUGFORMAT= -xdebugformat=stabs
# Flags used to build in debug mode for ctf generation. Bugs in the Devpro
# compilers currently prevent us from building with cc-emitted DWARF.
#
CTF_FLAGS_sparc = -g -Wc,-Qiselect-T1 $(C99MODE) $(CNOGLOBAL) $(CDWARFSTR)
CTF_FLAGS_i386 = -g $(C99MODE) $(CNOGLOBAL) $(CDWARFSTR)
CTF_FLAGS_sparc = -g -Wc,-Qiselect-T1 $(CSTD) $(CNOGLOBAL) $(CDWARFSTR)
CTF_FLAGS_i386 = -g $(CSTD) $(CNOGLOBAL) $(CDWARFSTR)

CTF_FLAGS_sparcv9 = $(CTF_FLAGS_sparc)
CTF_FLAGS_amd64 = $(CTF_FLAGS_i386)
@@ -543,19 +543,19 @@ $(SRCDBGBLD)CSOURCEDEBUGFLAGS = -g -xs
$(SRCDBGBLD)CCSOURCEDEBUGFLAGS = -g -xs

CFLAGS= $(COPTFLAG) $($(MACH)_CFLAGS) $(SPACEFLAG) $(CCMODE) \
$(ILDOFF) $(CERRWARN) $(C99MODE) $(CCUNBOUND) $(IROPTFLAG) \
$(ILDOFF) $(CERRWARN) $(CSTD) $(CCUNBOUND) $(IROPTFLAG) \
$(CGLOBALSTATIC) $(CCNOAUTOINLINE) $(CSOURCEDEBUGFLAGS) \
$(CUSERFLAGS)
CFLAGS64= $(COPTFLAG64) $($(MACH64)_CFLAGS) $(SPACEFLAG64) $(CCMODE64) \
$(ILDOFF) $(CERRWARN) $(C99MODE) $(CCUNBOUND) $(IROPTFLAG64) \
$(ILDOFF) $(CERRWARN) $(CSTD) $(CCUNBOUND) $(IROPTFLAG64) \
$(CGLOBALSTATIC) $(CCNOAUTOINLINE) $(CSOURCEDEBUGFLAGS) \
$(CUSERFLAGS64)
#
# Flags that are used to build parts of the code that are subsequently
# run on the build machine (also known as the NATIVE_BUILD).
#
NATIVE_CFLAGS= $(COPTFLAG) $($(NATIVE_MACH)_CFLAGS) $(CCMODE) \
$(ILDOFF) $(CERRWARN) $(C99MODE) $($(NATIVE_MACH)_CCUNBOUND) \
$(ILDOFF) $(CERRWARN) $(CSTD) $($(NATIVE_MACH)_CCUNBOUND) \
$(IROPTFLAG) $(CGLOBALSTATIC) $(CCNOAUTOINLINE) \
$(CSOURCEDEBUGFLAGS) $(CUSERFLAGS)

@@ -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
@@ -37,7 +37,7 @@ CPPFLAGS += -I$(SRC)/uts/common

LDLIBS += -lmd5

C99MODE= $(C99_ENABLE)
CSTD= $(CSTD_GNU99)

LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN

@@ -55,7 +55,7 @@ LINTFLAGS += \
-xerroff=E_NAME_DEF_NOT_USED2


C99MODE= $(C99_ENABLE)
CSTD= $(CSTD_GNU99)

.KEEP_STATE:

@@ -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

@@ -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
@@ -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
@@ -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

@@ -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
@@ -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
@@ -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
@@ -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
@@ -34,7 +34,7 @@ ROOTMANIFESTDIR= $(ROOTSVCSYSTEM)

CFLAGS += $(CCVERBOSE)
LDLIBS += -lproc -lscf
C99MODE=$(C99_ENABLE)
CSTD=$(CSTD_GNU99)

all: $(PROG)

@@ -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

@@ -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
@@ -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
@@ -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
@@ -38,7 +38,7 @@ CLOBBERFILES += $(TYPEPROG)

CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-unused-variable
C99MODE= $(C99_ENABLE)
CSTD= $(CSTD_GNU99)

LDLIBS += -lreparse -lnsl

@@ -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)

@@ -36,7 +36,7 @@ LDLIBS += -lsmbfs -lsec

CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-unused-label
C99MODE= $(C99_ENABLE)
CSTD= $(CSTD_GNU99)

CLOBBERFILES += $(LIBPROG)

@@ -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

@@ -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
@@ -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
@@ -39,7 +39,7 @@ POFILE= smbutil_all.po
POFILES= $(OBJS:%.o=%.po)
CLOBBERFILES+= $(POFILE) $(POFILES)

C99MODE= $(C99_ENABLE)
CSTD= $(CSTD_GNU99)

LDLIBS += -lsmbfs -lnsl

@@ -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

@@ -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:
@@ -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:

@@ -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:

@@ -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:

@@ -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:

@@ -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:

@@ -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

@@ -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:

0 comments on commit bd0ce62

Please sign in to comment.
You can’t perform that action at this time.