diff options
Diffstat (limited to 'usr/src')
28 files changed, 89 insertions, 99 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index a54ede319d..18e681f6bf 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -733,7 +733,7 @@ COMPILE.java= $(JAVAC) $(JAVAFLAGS) -classpath $(CLASSPATH) # CCNEEDED = -lC CCEXTNEEDED = -lCrun -lCstd -$(__GNUC)CCNEEDED = -L$(GCCLIBDIR) -R$(GCCLIBDIR) -lstdc++ -lgcc_s +$(__GNUC)CCNEEDED = -L$(GCCLIBDIR) -lstdc++ -lgcc_s $(__GNUC)CCEXTNEEDED = $(CCNEEDED) LINK.c= $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) diff --git a/usr/src/Makefile.master.64 b/usr/src/Makefile.master.64 index 5bfd0e6b76..09169831a1 100644 --- a/usr/src/Makefile.master.64 +++ b/usr/src/Makefile.master.64 @@ -84,7 +84,7 @@ BUILD.SO= $(CC) $(CFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) \ MAPFILECLASS= -64 CCNEEDED = -lCrun -$(__GNUC64)CCNEEDED = -L$(GCCLIBDIR) -R$(GCCLIBDIR) -lstdc++ +$(__GNUC64)CCNEEDED = -L$(GCCLIBDIR) -lstdc++ $(__GNUC64)CCNEEDED += -lgcc_s BUILDCCC.SO= $(CCC) $(CCFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) \ diff --git a/usr/src/cmd/availdevs/Makefile b/usr/src/cmd/availdevs/Makefile index 1ca23b0fe9..e7fa72f930 100644 --- a/usr/src/cmd/availdevs/Makefile +++ b/usr/src/cmd/availdevs/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" -# PROG= availdevs diff --git a/usr/src/cmd/avs/dsstat/Makefile b/usr/src/cmd/avs/dsstat/Makefile index 11ddd8c9a9..8a865c34a7 100644 --- a/usr/src/cmd/avs/dsstat/Makefile +++ b/usr/src/cmd/avs/dsstat/Makefile @@ -44,7 +44,7 @@ CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-unused-label CERRWARN += -_gcc=-Wno-clobbered -LDLIBS += -L/usr/lib -lkstat +LDLIBS += -lkstat LINTFLAGS += -Xa -n -s -x -m -u -Dlint -errhdr=%user LINTFLAGS += -erroff=E_SEC_PRINTF_VAR_FMT -erroff=E_SEC_SPRINTF_UNBOUNDED_COPY LINTDIR = $(KBASE)/lintdir diff --git a/usr/src/cmd/cmd-crypto/kmfcfg/Makefile b/usr/src/cmd/cmd-crypto/kmfcfg/Makefile index 2200fcc0d7..beaac6f8e7 100644 --- a/usr/src/cmd/cmd-crypto/kmfcfg/Makefile +++ b/usr/src/cmd/cmd-crypto/kmfcfg/Makefile @@ -47,7 +47,7 @@ POFILES = $(OBJS:%.o=%.po) POFILE = $(PROG)_msg.po MSGFILES = $(SRCS:%.c=%.i) -CPPFLAGS += -I$(ADJUNCT_PROTO)//usr/include/libxml2 \ +CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/libxml2 \ -I$(KMFDIR)/include -I. LDLIBS += -L$(ROOT)/usr/lib -lkmf -lcryptoutil XMLLIB = -lxml2 diff --git a/usr/src/cmd/latencytop/Makefile.com b/usr/src/cmd/latencytop/Makefile.com index 32e74087c8..f3815d7fae 100644 --- a/usr/src/cmd/latencytop/Makefile.com +++ b/usr/src/cmd/latencytop/Makefile.com @@ -36,7 +36,8 @@ CPPFLAGS += -DEMBED_CONFIGS -I$(ADJUNCT_PROTO)/usr/include/glib-2.0 \ -I$(ADJUNCT_PROTO)/usr/lib/glib-2.0/include CERRWARN += -_gcc=-Wno-uninitialized -CPPFLAGS += -DEMBED_CONFIGS -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include +CPPFLAGS += -DEMBED_CONFIGS -I$(ADJUNCT_PROTO)/usr/include/glib-2.0 \ + -I$(ADJUNCT_PROTO)/usr/lib/glib-2.0/include C99MODE = $(C99_ENABLE) LDLIBS += -lcurses -ldtrace all install := LDLIBS += -lglib-2.0 diff --git a/usr/src/cmd/lvm/metassist/controller/Makefile b/usr/src/cmd/lvm/metassist/controller/Makefile index 8581a74bca..137b867eaf 100644 --- a/usr/src/cmd/lvm/metassist/controller/Makefile +++ b/usr/src/cmd/lvm/metassist/controller/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" -# METASSIST_TOPLEVEL = .. diff --git a/usr/src/cmd/lvm/metassist/xml/Makefile b/usr/src/cmd/lvm/metassist/xml/Makefile index 1a3963030a..6d2a321797 100644 --- a/usr/src/cmd/lvm/metassist/xml/Makefile +++ b/usr/src/cmd/lvm/metassist/xml/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" -# METASSIST_TOPLEVEL = .. diff --git a/usr/src/cmd/mdb/common/mdb/mdb.c b/usr/src/cmd/mdb/common/mdb/mdb.c index 6f2df6f533..5c1c5fc84a 100644 --- a/usr/src/cmd/mdb/common/mdb/mdb.c +++ b/usr/src/cmd/mdb/common/mdb/mdb.c @@ -21,6 +21,8 @@ /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + */ +/* * Copyright (c) 2012 by Delphix. All rights reserved. * Copyright (c) 2012 Joyent, Inc. All rights reserved. */ @@ -952,9 +954,8 @@ mdb_call(uintmax_t addr, uintmax_t count, uint_t flags) } else { mdb_intr_enable(); - status = mdb_call_idcmd(cp->c_dcmd, addr, count, flags, - &cp->c_argv, &cp->c_addrv, cp->c_vcbs); - mdb.m_lastret = status; + mdb.m_lastret = mdb_call_idcmd(cp->c_dcmd, addr, count, + flags, &cp->c_argv, &cp->c_addrv, cp->c_vcbs); mdb_intr_disable(); } diff --git a/usr/src/cmd/mdb/common/mdb/mdb_ctf.c b/usr/src/cmd/mdb/common/mdb/mdb_ctf.c index 3128f95766..a8fa2e7ea5 100644 --- a/usr/src/cmd/mdb/common/mdb/mdb_ctf.c +++ b/usr/src/cmd/mdb/common/mdb/mdb_ctf.c @@ -1716,7 +1716,7 @@ mdb_ctf_synthetics_create_base(int kind) if (mdb.m_synth == NULL) { mdb_printf("synthetic types disabled: ctf create failed\n"); - return (DCMD_ERR); + return (1); } switch (kind) { @@ -1747,14 +1747,12 @@ mdb_ctf_synthetics_create_base(int kind) if (err == CTF_ERR) { mdb_dprintf(MDB_DBG_CTF, "couldn't add synthetic " "type: %s\n", synp->syn_name); - err = set_errno(ctf_to_errno(ctf_errno(cp))); goto discard; } } if (ctf_update(cp) == CTF_ERR) { mdb_dprintf(MDB_DBG_CTF, "failed to update synthetic types\n"); - err = set_errno(ctf_to_errno(ctf_errno(cp))); goto discard; } @@ -1763,7 +1761,6 @@ mdb_ctf_synthetics_create_base(int kind) if (id == CTF_ERR) { mdb_dprintf(MDB_DBG_CTF, "cailed to lookup %s: %s\n", sytp->syt_src, ctf_errmsg(ctf_errno(cp))); - err = set_errno(ctf_to_errno(ctf_errno(cp))); goto discard; } if (ctf_add_typedef(cp, CTF_ADD_ROOT, sytp->syt_targ, id) == @@ -1771,14 +1768,12 @@ mdb_ctf_synthetics_create_base(int kind) mdb_dprintf(MDB_DBG_CTF, "couldn't add typedef %s " "%s: %s\n", sytp->syt_targ, sytp->syt_src, ctf_errmsg(ctf_errno(cp))); - err = set_errno(ctf_to_errno(ctf_errno(cp))); goto discard; } } if (ctf_update(cp) == CTF_ERR) { mdb_dprintf(MDB_DBG_CTF, "failed to update synthetic types\n"); - err = set_errno(ctf_to_errno(ctf_errno(cp))); goto discard; } @@ -1805,7 +1800,7 @@ mdb_ctf_add_typedef(const char *name, const mdb_ctf_id_t *p, mdb_ctf_id_t *new) if (mdb.m_synth == NULL) { mdb_printf("synthetic types disabled: ctf create failed\n"); - return (DCMD_ERR); + return (1); } if (mdb_ctf_lookup_by_name(name, &tid) == 0) { @@ -1847,7 +1842,7 @@ mdb_ctf_add_struct(const char *name, mdb_ctf_id_t *rid) if (mdb.m_synth == NULL) { mdb_printf("synthetic types disabled: ctf create failed\n"); - return (DCMD_ERR); + return (1); } if (name != NULL && mdb_ctf_lookup_by_name(name, &tid) == 0) { @@ -1883,7 +1878,7 @@ mdb_ctf_add_union(const char *name, mdb_ctf_id_t *rid) if (mdb.m_synth == NULL) { mdb_printf("synthetic types disabled: ctf create failed\n"); - return (DCMD_ERR); + return (1); } if (name != NULL && mdb_ctf_lookup_by_name(name, &tid) == 0) { @@ -1971,7 +1966,7 @@ mdb_ctf_add_array(const mdb_ctf_arinfo_t *marp, mdb_ctf_id_t *rid) if (mdb.m_synth == NULL) { mdb_printf("synthetic types disabled: ctf create failed\n"); - return (DCMD_ERR); + return (1); } car.ctr_nelems = marp->mta_nelems; @@ -2027,7 +2022,7 @@ mdb_ctf_add_pointer(const mdb_ctf_id_t *p, mdb_ctf_id_t *rid) if (mdb.m_synth == NULL) { mdb_printf("synthetic types disabled: ctf create failed\n"); - return (DCMD_ERR); + return (1); } id = ctf_add_type(mdb.m_synth, mcip->mci_fp, mcip->mci_id); @@ -2073,7 +2068,7 @@ mdb_ctf_type_delete(const mdb_ctf_id_t *id) if (mcip->mci_fp != mdb.m_synth) { mdb_warn("bad ctf_file_t, expected synth container\n"); - return (DCMD_ERR); + return (1); } ret = ctf_delete_type(mcip->mci_fp, mcip->mci_id); @@ -2116,12 +2111,12 @@ mdb_ctf_synthetics_from_file(const char *file) if (syn == NULL) { mdb_warn("synthetic types disabled: ctf create failed\n"); - return (DCMD_ERR); + return (1); } if ((fp = mdb_ctf_open(file, &ret)) == NULL) { mdb_warn("failed to parse ctf data in %s", file); - return (DCMD_ERR); + return (1); } ret = DCMD_OK; @@ -2141,7 +2136,7 @@ mdb_ctf_synthetics_from_file(const char *file) cleanup: ctf_close(fp); - if (ret != DCMD_OK) + if (ret != 0) (void) ctf_discard(syn); return (ret); } diff --git a/usr/src/cmd/mdb/common/mdb/mdb_typedef.c b/usr/src/cmd/mdb/common/mdb/mdb_typedef.c index 748250b50d..be6411596c 100644 --- a/usr/src/cmd/mdb/common/mdb/mdb_typedef.c +++ b/usr/src/cmd/mdb/common/mdb/mdb_typedef.c @@ -1,27 +1,50 @@ /* - * CDDL HEADER START + * This file and its contents are supplied under the terms of the + * Common Development and Distribution License ("CDDL"), version 1.0. + * You may only use this file in accordance with the terms of version + * 1.0 of the CDDL. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END + * A full copy of the text of the CDDL should have accompanied this + * source. A copy of the CDDL is also available via the Internet at + * http://www.illumos.org/license/CDDL. */ + /* * Copyright (c) 2013 Joyent, Inc. All rights reserved. */ +/* + * ::typedef exists to allow a user to create and import auxiliary CTF + * information for the currently running target. ::typedef is similar to the C + * typedef keyword. However, ::typedef has no illusions of grandeur. It is not a + * standards complaint version of C's typedef. For specifics on what it does and + * does not support, please see the help message for ::typedef later on in this + * file. + * + * In addition to allowing the user to create types, it has a notion of a + * built-in set of types that a compiler might provide. Currently ::typedef + * supports both the standard illumos 32-bit and 64-bit environments, mainly + * LP32 and LP64. These are not present by default; it is up to the user to + * request that they be inserted. + * + * To facilitate this, ::typedef adds all of its type information to an + * auxiliary CTF container that is a part of the global mdb state. This is + * abstracted away from ::typedef by the mdb_ctf_* apis. This container is + * referred to as the synthetic container, as it holds these synthetic types. + * The synthetic container does not have a parent CTF container. This is rather + * important to its operation, as a user can end up referencing types that come + * from many different such containers (eg. different kernel modules). As such, + * whenever a type is referenced that we do not know about, we search all of the + * CTF containers that mdb knows about it. If we find it, then that type is + * imported (along with all of its dependent types) into the synthetic + * container. + * + * Finally, ::typedef can source CTF information from external files with the -r + * option. This will copy in every type from their container into the synthetic + * container, because of this the parent and child relationship between + * containers with parents cannot be maintained. + */ + #include <mdb/mdb_modapi.h> #include <mdb/mdb_ctf.h> #include <mdb/mdb_list.h> @@ -64,16 +87,16 @@ typedef_valid_identifier(const char *str) return (1); if (*str != '_' && - (*str < 0x41 || *str > 0x5a) && - (*str < 0x61 || *str > 0x7a)) + (*str < 'A' || *str > 'Z') && + (*str < 'a' || *str > 'z')) return (1); str++; while (*str != '\0') { if (*str != '_' && - (*str < 0x30 || *str > 0x39) && - (*str < 0x41 || *str > 0x5a) && - (*str < 0x61 || *str > 0x7a)) + (*str < '0' || *str > '9') && + (*str < 'A' || *str > 'Z') && + (*str < 'a' || *str > 'z')) return (1); str++; } @@ -132,7 +155,6 @@ typedef_join_strings(int nstr, const mdb_arg_t *args, int flags) static int typedef_list(void) { - (void) mdb_ctf_type_iter(MDB_CTF_SYNTHETIC_ITER, typedef_list_cb, NULL); return (DCMD_OK); diff --git a/usr/src/cmd/mdb/common/mdb/mdb_typedef.h b/usr/src/cmd/mdb/common/mdb/mdb_typedef.h index 28f91b7987..25721f8b9f 100644 --- a/usr/src/cmd/mdb/common/mdb/mdb_typedef.h +++ b/usr/src/cmd/mdb/common/mdb/mdb_typedef.h @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * This file and its contents are supplied under the terms of the + * Common Development and Distribution License ("CDDL"), version 1.0. + * You may only use this file in accordance with the terms of version + * 1.0 of the CDDL. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END + * A full copy of the text of the CDDL should have accompanied this + * source. A copy of the CDDL is also available via the Internet at + * http://www.illumos.org/license/CDDL. */ + /* * Copyright (c) 2012 Joyent, Inc. All rights reserved. */ - #ifndef _MDB_TYPEDEF_H #define _MDB_TYPEDEF_H diff --git a/usr/src/cmd/zonestat/zonestatd/Makefile b/usr/src/cmd/zonestat/zonestatd/Makefile index 833103e197..169e995585 100644 --- a/usr/src/cmd/zonestat/zonestatd/Makefile +++ b/usr/src/cmd/zonestat/zonestatd/Makefile @@ -33,10 +33,9 @@ ROOTMANIFESTDIR = $(ROOTSVCSYSTEM) SRCS = zonestatd.c -CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/libxml2 -LDLIBS += -lkstat -lpool -lexacct -lscf \ - -lcontract -lcmdutils -lumem -CPPFLAGS += -I/usr/include/libxml2 +CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/libxml2 +LDLIBS += -lkstat -lpool -lexacct -lscf \ + -lcontract -lcmdutils -lumem LINTFLAGS += -u CERRWARN += -_gcc=-Wno-parentheses diff --git a/usr/src/lib/libbrand/Makefile.com b/usr/src/lib/libbrand/Makefile.com index 0fceb70aac..77443eb600 100644 --- a/usr/src/lib/libbrand/Makefile.com +++ b/usr/src/lib/libbrand/Makefile.com @@ -22,7 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" LIBRARY= libbrand.a VERS= .1 diff --git a/usr/src/lib/libldap5/amd64/Makefile b/usr/src/lib/libldap5/amd64/Makefile index abf5a7d5f8..82a354b822 100644 --- a/usr/src/lib/libldap5/amd64/Makefile +++ b/usr/src/lib/libldap5/amd64/Makefile @@ -2,8 +2,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# PR_MDUSOBJS = os_SunOS_x86.o diff --git a/usr/src/lib/libldap5/i386/Makefile b/usr/src/lib/libldap5/i386/Makefile index b9e154c6fc..500155684a 100644 --- a/usr/src/lib/libldap5/i386/Makefile +++ b/usr/src/lib/libldap5/i386/Makefile @@ -2,8 +2,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # lib/libldap5/i386/Makefile # diff --git a/usr/src/lib/libldap5/sparc/Makefile b/usr/src/lib/libldap5/sparc/Makefile index dcfe21adce..b650c81920 100644 --- a/usr/src/lib/libldap5/sparc/Makefile +++ b/usr/src/lib/libldap5/sparc/Makefile @@ -2,8 +2,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # lib/libldap5/sparc/Makefile # diff --git a/usr/src/lib/libldap5/sparcv9/Makefile b/usr/src/lib/libldap5/sparcv9/Makefile index b3b78410e5..a36300f4ba 100644 --- a/usr/src/lib/libldap5/sparcv9/Makefile +++ b/usr/src/lib/libldap5/sparcv9/Makefile @@ -2,8 +2,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # lib/libldap5/sparcv9/Makefile # diff --git a/usr/src/lib/libshare/Makefile.com b/usr/src/lib/libshare/Makefile.com index b5f057d694..d827b7eac4 100644 --- a/usr/src/lib/libshare/Makefile.com +++ b/usr/src/lib/libshare/Makefile.com @@ -47,7 +47,8 @@ CPPFLAGS += -D_REENTRANT -I$(NFSLIB_DIR) \ CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-switch -CPPFLAGS += -D_REENTRANT -I$(NFSLIB_DIR) -I/usr/include/libxml2 +CPPFLAGS += -D_REENTRANT -I$(NFSLIB_DIR) \ + -I$(ADJUNCT_PROTO)/usr/include/libxml2 .KEEP_STATE: diff --git a/usr/src/lib/libshare/autofs/Makefile.com b/usr/src/lib/libshare/autofs/Makefile.com index 0538ec55fa..bbc3759e01 100644 --- a/usr/src/lib/libshare/autofs/Makefile.com +++ b/usr/src/lib/libshare/autofs/Makefile.com @@ -51,8 +51,9 @@ CPPFLAGS += -D_REENTRANT -I$(AUTOFSSMFLIB_DIR) \ CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-unused-variable CERRWARN += -_gcc=-Wno-uninitialized -CPPFLAGS += -D_REENTRANT -I$(AUTOFSSMFLIB_DIR) -I/usr/include/libxml2 \ - -I$(SRCDIR)../common +CPPFLAGS += -D_REENTRANT -I$(AUTOFSSMFLIB_DIR) \ + -I$(ADJUNCT_PROTO)/usr/include/libxml2 \ + -I$(SRCDIR)../common .KEEP_STATE: diff --git a/usr/src/lib/libshare/nfs/Makefile.com b/usr/src/lib/libshare/nfs/Makefile.com index 44e661bbe2..7a4da89955 100644 --- a/usr/src/lib/libshare/nfs/Makefile.com +++ b/usr/src/lib/libshare/nfs/Makefile.com @@ -52,8 +52,8 @@ CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-unused-variable CERRWARN += -_gcc=-Wno-uninitialized -CPPFLAGS += -D_REENTRANT -I$(NFSLIB_DIR) -I/usr/include/libxml2 \ - -I$(SRCDIR)/../common +CPPFLAGS += -D_REENTRANT -I$(NFSLIB_DIR) \ + -I$(ADJUNCT_PROTO)/usr/include/libxml2 -I$(SRCDIR)/../common .KEEP_STATE: diff --git a/usr/src/lib/libshare/smb/Makefile.com b/usr/src/lib/libshare/smb/Makefile.com index 3fe65dff3c..d731566338 100644 --- a/usr/src/lib/libshare/smb/Makefile.com +++ b/usr/src/lib/libshare/smb/Makefile.com @@ -52,8 +52,8 @@ CFLAGS += $(CCVERBOSE) CPPFLAGS += -D_REENTRANT -I$(ADJUNCT_PROTO)/usr/include/libxml2 CERRWARN += -_gcc=-Wno-char-subscripts CERRWARN += -_gcc=-Wno-switch -CPPFLAGS += -D_REENTRANT -I/usr/include/libxml2 \ - -I$(SRCDIR)/../common +CPPFLAGS += -D_REENTRANT -I$(ADJUNCT_PROTO)/usr/include/libxml2 \ + -I$(SRCDIR)/../common $(ENABLE_SMB_PRINTING) CPPFLAGS += -DHAVE_CUPS .KEEP_STATE: diff --git a/usr/src/lib/libshare/smbfs/Makefile.com b/usr/src/lib/libshare/smbfs/Makefile.com index fbd4b80000..0f439bf004 100644 --- a/usr/src/lib/libshare/smbfs/Makefile.com +++ b/usr/src/lib/libshare/smbfs/Makefile.com @@ -45,8 +45,8 @@ CPPFLAGS += -D_REENTRANT -I$(ADJUNCT_PROTO)/usr/include/libxml2 \ -I$(SRCDIR)/../common -I$(SRC)/lib/libsmbfs -I$(SRC)/uts/common CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-uninitialized -CPPFLAGS += -D_REENTRANT -I/usr/include/libxml2 -I$(SRCDIR)/../common \ - -I$(SRC)/lib/libsmbfs -I$(SRC)/uts/common +CPPFLAGS += -D_REENTRANT -I$(ADJUNCT_PROTO)/usr/include/libxml2 \ + -I$(SRCDIR)/../common -I$(SRC)/lib/libsmbfs -I$(SRC)/uts/common .KEEP_STATE: diff --git a/usr/src/lib/libzonecfg/Makefile.com b/usr/src/lib/libzonecfg/Makefile.com index ce29f58a9b..0bee2fc908 100644 --- a/usr/src/lib/libzonecfg/Makefile.com +++ b/usr/src/lib/libzonecfg/Makefile.com @@ -36,7 +36,6 @@ $(DYNLIB) := LDLIBS += -lxml2 SRCDIR = ../common CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/libxml2 -I$(SRCDIR) -D_REENTRANT -CPPFLAGS += -I/usr/include/libxml2 -I$(SRCDIR) -D_REENTRANT CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-parentheses $(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) diff --git a/usr/src/lib/lvm/libsvm/Makefile.com b/usr/src/lib/lvm/libsvm/Makefile.com index 2457a10b69..dbcd2a7295 100644 --- a/usr/src/lib/lvm/libsvm/Makefile.com +++ b/usr/src/lib/lvm/libsvm/Makefile.com @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY= libsvm.a VERS= .1 diff --git a/usr/src/lib/policykit/Makefile.policykit b/usr/src/lib/policykit/Makefile.policykit index eca0c0d026..e7f2d8a2da 100644 --- a/usr/src/lib/policykit/Makefile.policykit +++ b/usr/src/lib/policykit/Makefile.policykit @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # Definitions common for PolicyKit # diff --git a/usr/src/lib/pysolaris/Makefile.com b/usr/src/lib/pysolaris/Makefile.com index 0e5b385bd8..a6194a9a2a 100644 --- a/usr/src/lib/pysolaris/Makefile.com +++ b/usr/src/lib/pysolaris/Makefile.com @@ -46,7 +46,7 @@ LDLIBS += -lc -lsec -lidmap -lpython2.6 CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/python2.6 CERRWARN += -_gcc=-Wno-unused-variable -CPPFLAGS += -I/usr/include/python2.6 +CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/python2.6 .KEEP_STATE: diff --git a/usr/src/lib/pyzfs/Makefile.com b/usr/src/lib/pyzfs/Makefile.com index a565ed8059..2f042c5f31 100644 --- a/usr/src/lib/pyzfs/Makefile.com +++ b/usr/src/lib/pyzfs/Makefile.com @@ -49,7 +49,7 @@ LDLIBS += -lc -lnvpair -lpython2.6 -lzfs CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/python2.6 CERRWARN += -_gcc=-Wno-unused-variable -CPPFLAGS += -I/usr/include/python2.6 +CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/python2.6 CPPFLAGS += -I../../../uts/common/fs/zfs CPPFLAGS += -I../../../common/zfs |