diff options
Diffstat (limited to 'usr/src/lib/cfgadm_plugins')
73 files changed, 218 insertions, 1854 deletions
diff --git a/usr/src/lib/cfgadm_plugins/ac/Makefile.com b/usr/src/lib/cfgadm_plugins/ac/Makefile.com index c7aa48aadc..a191402d23 100644 --- a/usr/src/lib/cfgadm_plugins/ac/Makefile.com +++ b/usr/src/lib/cfgadm_plugins/ac/Makefile.com @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# 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. @@ -20,12 +19,11 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # -# lib/ac/Makefile.com include $(SRC)/lib/cfgadm_plugins/Makefile.com @@ -53,13 +51,11 @@ USR_PSM_LIB_CFG_DIR_64 = $(USR_PSM_LIB_CFG_DIR)/$(MACH64) ROOTLIBDIR= $(USR_PSM_LIB_CFG_DIR) ROOTLIBDIR64= $(USR_PSM_LIB_CFG_DIR_64) -MAPFILE= ../common/mapfile-vers -SRCS= $(OBJECTS:%.o=../common/%.c) +SRCDIR = ../common LIBS = $(DYNLIB) CFLAGS += $(CCVERBOSE) -DYNFLAGS += -M $(MAPFILE) LDLIBS += -lc CPPFLAGS += -I$(ROOT)/usr/platform/$(PLATFORM)/include @@ -70,8 +66,6 @@ all: $(LIBS) lint: lintcheck -$(DYNLIB): $(MAPFILE) - # Create target directories $(USR_PSM_DIR): $(LINKED_DIRS) -$(INS.dir.root.sys) diff --git a/usr/src/lib/cfgadm_plugins/ib/Makefile b/usr/src/lib/cfgadm_plugins/ib/Makefile index 83ac985cd4..822ed3efc5 100644 --- a/usr/src/lib/cfgadm_plugins/ib/Makefile +++ b/usr/src/lib/cfgadm_plugins/ib/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# 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. @@ -20,16 +19,16 @@ # CDDL HEADER END # # -# Copyright 2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # -# lib/cfgadm_plugins/ib/Makefile include ../../Makefile.lib -SUBDIRS= spec .WAIT $(MACH) $(BUILD64) $(MACH64) +SUBDIRS = $(MACH) +$(BUILD64)SUBDIRS += $(MACH64) all := TARGET= all clean := TARGET= clean @@ -53,7 +52,7 @@ CP= cp all clean clobber delete install lint package: $(SUBDIRS) -$(MACH) $(MACH64) spec: FRC +$(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) _msg: $(MSGDOMAIN) $(POFILE) diff --git a/usr/src/lib/cfgadm_plugins/ib/Makefile.com b/usr/src/lib/cfgadm_plugins/ib/Makefile.com index a0f4ec3e54..659d07eaa7 100644 --- a/usr/src/lib/cfgadm_plugins/ib/Makefile.com +++ b/usr/src/lib/cfgadm_plugins/ib/Makefile.com @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# 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. @@ -20,13 +19,11 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # -# lib/cfgadm_plugins/ib/Makefile.com -# LIBRARY= ib.a VERS= .1 @@ -36,14 +33,10 @@ OBJECTS= cfga_ib.o cfga_rcm.o cfga_conf.o # include library definitions include ../../../Makefile.lib +SRCDIR = ../common ROOTLIBDIR= $(ROOT)/usr/lib/cfgadm ROOTLIBDIR64= $(ROOTLIBDIR)/$(MACH64) -MAPFILE= $(MAPDIR)/mapfile -CLOBBERFILES += $(MAPFILE) - -SRCS= $(OBJECTS:%.o=../common/%.c) - LIBS= $(DYNLIB) LINTFLAGS += -DDEBUG @@ -52,7 +45,6 @@ LINTFLAGS64 += -DDEBUG CFLAGS += $(CCVERBOSE) CFLAGS64 += $(CCVERBOSE) -DYNFLAGS += -M $(MAPFILE) LDLIBS += -lc -ldevice -ldevinfo -lrcm -lnvpair .KEEP_STATE: @@ -61,11 +53,6 @@ all: $(LIBS) lint: lintcheck -$(DYNLIB): $(MAPFILE) - -$(MAPFILE): - @cd $(MAPDIR); $(MAKE) mapfile - # Install rules $(ROOTLIBDIR)/%: % $(ROOTLIBDIR) diff --git a/usr/src/lib/cfgadm_plugins/ib/amd64/Makefile b/usr/src/lib/cfgadm_plugins/ib/amd64/Makefile index b0e26c2283..4b07c3a63e 100644 --- a/usr/src/lib/cfgadm_plugins/ib/amd64/Makefile +++ b/usr/src/lib/cfgadm_plugins/ib/amd64/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# 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. @@ -20,15 +19,12 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/ib/amd64/Makefile +# ident "%Z%%M% %I% %E% SMI" # -MAPDIR= ../spec/amd64 include ../Makefile.com include ../../../Makefile.lib.64 diff --git a/usr/src/lib/cfgadm_plugins/sata/spec/Makefile b/usr/src/lib/cfgadm_plugins/ib/common/mapfile-vers index be85571cfa..986c2b9b75 100644 --- a/usr/src/lib/cfgadm_plugins/sata/spec/Makefile +++ b/usr/src/lib/cfgadm_plugins/ib/common/mapfile-vers @@ -18,14 +18,21 @@ # # CDDL HEADER END # - # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" - # -# lib/cfgadm_plugins/sata/spec/Makefile -include $(SRC)/lib/Makefile.spec.arch +SUNWprivate_1.1 { + global: + cfga_change_state; + cfga_help; + cfga_list_ext; + cfga_private_func; + cfga_test; + cfga_version; + local: + *; +}; diff --git a/usr/src/lib/cfgadm_plugins/ib/i386/Makefile b/usr/src/lib/cfgadm_plugins/ib/i386/Makefile index 8022c2a063..25e03c3f72 100644 --- a/usr/src/lib/cfgadm_plugins/ib/i386/Makefile +++ b/usr/src/lib/cfgadm_plugins/ib/i386/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# 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. @@ -20,15 +19,12 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/ib/i386/Makefile +# ident "%Z%%M% %I% %E% SMI" # -MAPDIR= ../spec/i386 include ../Makefile.com .KEEP_STATE: diff --git a/usr/src/lib/cfgadm_plugins/ib/sparc/Makefile b/usr/src/lib/cfgadm_plugins/ib/sparc/Makefile index fa95546e40..25e03c3f72 100644 --- a/usr/src/lib/cfgadm_plugins/ib/sparc/Makefile +++ b/usr/src/lib/cfgadm_plugins/ib/sparc/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# 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. @@ -20,15 +19,12 @@ # CDDL HEADER END # # -# Copyright 2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/ib/sparc/Makefile +# ident "%Z%%M% %I% %E% SMI" # -MAPDIR= ../spec/sparc include ../Makefile.com .KEEP_STATE: diff --git a/usr/src/lib/cfgadm_plugins/ib/sparcv9/Makefile b/usr/src/lib/cfgadm_plugins/ib/sparcv9/Makefile index c340752bb3..a0aa2c59c4 100644 --- a/usr/src/lib/cfgadm_plugins/ib/sparcv9/Makefile +++ b/usr/src/lib/cfgadm_plugins/ib/sparcv9/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# 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. @@ -20,15 +19,12 @@ # CDDL HEADER END # # -# Copyright 2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/ib/sparcv9/Makefile +# ident "%Z%%M% %I% %E% SMI" # -MAPDIR= ../spec/sparcv9 include ../Makefile.com include ../../../Makefile.lib.64 diff --git a/usr/src/lib/cfgadm_plugins/ib/spec/Makefile b/usr/src/lib/cfgadm_plugins/ib/spec/Makefile deleted file mode 100644 index 33f7f7a082..0000000000 --- a/usr/src/lib/cfgadm_plugins/ib/spec/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -# -# Copyright 2003 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/ib/spec/Makefile - -include $(SRC)/lib/Makefile.spec.arch diff --git a/usr/src/lib/cfgadm_plugins/ib/spec/Makefile.targ b/usr/src/lib/cfgadm_plugins/ib/spec/Makefile.targ deleted file mode 100644 index 93ae557a05..0000000000 --- a/usr/src/lib/cfgadm_plugins/ib/spec/Makefile.targ +++ /dev/null @@ -1,36 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -# -# Copyright 2003 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/ib/spec/Makefile.targ - -LIBRARY= ib.a -VERS= .1 - -OBJECTS= cfga_ib.o - -TRANSCPP = -SPECCPP = diff --git a/usr/src/lib/cfgadm_plugins/ib/spec/amd64/Makefile b/usr/src/lib/cfgadm_plugins/ib/spec/amd64/Makefile deleted file mode 100644 index 4d70ca12b2..0000000000 --- a/usr/src/lib/cfgadm_plugins/ib/spec/amd64/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -# -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/ib/spec/i386/Makefile -# - -.KEEP_STATE: - -# To enable apptrace, comment out the next line -DISABLE_APPTRACE= $(POUND_SIGN) - -include ../Makefile.targ -include $(SRC)/lib/Makefile.lib -include $(SRC)/lib/Makefile.lib.64 -include $(SRC)/lib/Makefile.spec - -$(DISABLE_APPTRACE)install: $(ROOTABILIB64) diff --git a/usr/src/lib/cfgadm_plugins/ib/spec/cfga_ib.spec b/usr/src/lib/cfgadm_plugins/ib/spec/cfga_ib.spec deleted file mode 100644 index 55396bf6d9..0000000000 --- a/usr/src/lib/cfgadm_plugins/ib/spec/cfga_ib.spec +++ /dev/null @@ -1,76 +0,0 @@ -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/ib/spec/cfga_ib.spec - -function cfga_change_state -include <sys/param.h>, <config_admin.h> -declaration cfga_err_t cfga_change_state(cfga_cmd_t, const char *, \ - const char *, struct cfga_confirm *, \ - struct cfga_msg *, char **, cfga_flags_t) -arch sparc sparcv9 -version SUNWprivate_1.1 -end - -function cfga_help -include <sys/param.h>, <config_admin.h> -declaration cfga_err_t cfga_help(struct cfga_msg *, const char *, \ - cfga_flags_t) -arch sparc sparcv9 -version SUNWprivate_1.1 -end - -function cfga_list_ext -include <sys/param.h>, <config_admin.h> -declaration cfga_err_t cfga_list_ext(const char *, \ - struct cfga_list_data **, int *, const char *, \ - const char *, char **, cfga_flags_t) -arch sparc sparcv9 -version SUNWprivate_1.1 -end - -function cfga_private_func -include <sys/param.h>, <config_admin.h> -declaration cfga_err_t cfga_private_func(const char *, const char *, \ - const char *, struct cfga_confirm *, \ - struct cfga_msg *, char **, cfga_flags_t) -arch sparc sparcv9 -version SUNWprivate_1.1 -end - -function cfga_test -include <sys/param.h>, <config_admin.h> -declaration cfga_err_t cfga_test(const char *, const char *, \ - struct cfga_msg *, char **, cfga_flags_t) -arch sparc sparcv9 -version SUNWprivate_1.1 -end - -data cfga_version -declaration int cfga_version -arch sparc sparcv9 -version SUNWprivate_1.1 -end diff --git a/usr/src/lib/cfgadm_plugins/ib/spec/i386/Makefile b/usr/src/lib/cfgadm_plugins/ib/spec/i386/Makefile deleted file mode 100644 index b00af9887a..0000000000 --- a/usr/src/lib/cfgadm_plugins/ib/spec/i386/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -# -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/ib/spec/i386/Makefile -# - -.KEEP_STATE: - -# To enable apptrace, comment out the next line -DISABLE_APPTRACE= $(POUND_SIGN) - -include ../Makefile.targ -include $(SRC)/lib/Makefile.lib -include $(SRC)/lib/Makefile.spec - -$(DISABLE_APPTRACE)install: $(ROOTABILIB) diff --git a/usr/src/lib/cfgadm_plugins/ib/spec/sparc/Makefile b/usr/src/lib/cfgadm_plugins/ib/spec/sparc/Makefile deleted file mode 100644 index 7a9ab38247..0000000000 --- a/usr/src/lib/cfgadm_plugins/ib/spec/sparc/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -# -# Copyright 2003 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/ib/spec/sparc/Makefile -# - -.KEEP_STATE: - -# To enable apptrace, comment out the next line -DISABLE_APPTRACE= $(POUND_SIGN) - -include ../Makefile.targ -include $(SRC)/lib/Makefile.lib -include $(SRC)/lib/Makefile.spec - -$(DISABLE_APPTRACE)install: $(ROOTABILIB) diff --git a/usr/src/lib/cfgadm_plugins/ib/spec/sparcv9/Makefile b/usr/src/lib/cfgadm_plugins/ib/spec/sparcv9/Makefile deleted file mode 100644 index f96d11d5ba..0000000000 --- a/usr/src/lib/cfgadm_plugins/ib/spec/sparcv9/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -# -# Copyright 2003 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/ib/spec/sparcv9/Makefile - -# To enable apptrace, comment out the next line -DISABLE_APPTRACE= $(POUND_SIGN) - -include ../Makefile.targ -include $(SRC)/lib/Makefile.lib -include $(SRC)/lib/Makefile.lib.64 -include $(SRC)/lib/Makefile.spec - -$(DISABLE_APPTRACE)install: $(ROOTABILIB64) diff --git a/usr/src/lib/cfgadm_plugins/ib/spec/versions b/usr/src/lib/cfgadm_plugins/ib/spec/versions deleted file mode 100644 index 567008d876..0000000000 --- a/usr/src/lib/cfgadm_plugins/ib/spec/versions +++ /dev/null @@ -1,34 +0,0 @@ -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -#pragma ident "%Z%%M% %I% %E% SMI" -# -# usr/src/lib/cfgadm_plugins/ib/spec/versions -# -sparc { - SUNWprivate_1.1; -} -sparcv9 { - SUNWprivate_1.1; -} diff --git a/usr/src/lib/cfgadm_plugins/pci/Makefile b/usr/src/lib/cfgadm_plugins/pci/Makefile index 865b46e881..9a190d45f8 100644 --- a/usr/src/lib/cfgadm_plugins/pci/Makefile +++ b/usr/src/lib/cfgadm_plugins/pci/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# 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. @@ -20,16 +19,16 @@ # CDDL HEADER END # # -# Copyright (c) 1999, by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # -# lib/cfgadm_plugins/pci/Makefile include ../../../Makefile.master -SUBDIRS= spec .WAIT $(MACH) $(BUILD64) $(MACH64) +SUBDIRS = $(MACH) +$(BUILD64)SUBDIRS += $(MACH64) all := TARGET= all clean := TARGET= clean @@ -53,7 +52,7 @@ CP= cp all clean clobber delete install lint package: $(SUBDIRS) -$(MACH) $(MACH64) spec: FRC +$(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) _msg: $(MSGDOMAIN) $(POFILE) diff --git a/usr/src/lib/cfgadm_plugins/pci/Makefile.com b/usr/src/lib/cfgadm_plugins/pci/Makefile.com index aa1c9120db..fe0d0703d0 100644 --- a/usr/src/lib/cfgadm_plugins/pci/Makefile.com +++ b/usr/src/lib/cfgadm_plugins/pci/Makefile.com @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# 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. @@ -20,13 +19,11 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # -# lib/cfgadm_plugins/pci/Makefile.com -# LIBRARY= pci.a VERS= .1 @@ -35,6 +32,7 @@ OBJECTS= cfga.o pci_strings.o # include library definitions include ../../../Makefile.lib +SRCDIR = ../common INS.dir.root.sys= $(INS) -s -d -m $(DIRMODE) $@ $(CH)INS.dir.root.sys= $(INS) -s -d -m $(DIRMODE) -u root -g sys $@ INS.dir.bin.bin= $(INS) -s -d -m $(DIRMODE) $@ @@ -47,16 +45,12 @@ USR_LIB_DIR_CFGADM_64 = $(USR_LIB_DIR_CFGADM)/$(MACH64) ROOTLIBDIR= $(USR_LIB_DIR_CFGADM) ROOTLIBDIR64= $(USR_LIB_DIR_CFGADM_64) -MAPFILE= $(MAPDIR)/mapfile -CLOBBERFILES += $(MAPFILE) - SRCS= ../common/cfga.c $(SRC)/common/pci/pci_strings.c LIBS = $(DYNLIB) CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS CFLAGS += $(CCVERBOSE) -DYNFLAGS += -M $(MAPFILE) LDLIBS += -lc -ldevice -ldevinfo -lrcm .KEEP_STATE: @@ -65,11 +59,6 @@ all: $(LIBS) lint: lintcheck -$(DYNLIB): $(MAPFILE) - -$(MAPFILE): - @cd $(MAPDIR); $(MAKE) mapfile - # Create target directories $(USR_LIB_DIR): -$(INS.dir.root.sys) diff --git a/usr/src/lib/cfgadm_plugins/pci/amd64/Makefile b/usr/src/lib/cfgadm_plugins/pci/amd64/Makefile index c89e294820..4b07c3a63e 100644 --- a/usr/src/lib/cfgadm_plugins/pci/amd64/Makefile +++ b/usr/src/lib/cfgadm_plugins/pci/amd64/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# 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. @@ -20,13 +19,12 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # -MAPDIR= ../spec/amd64 include ../Makefile.com include ../../../Makefile.lib.64 diff --git a/usr/src/lib/cfgadm_plugins/sata/spec/versions b/usr/src/lib/cfgadm_plugins/pci/common/mapfile-vers index 9bd9c66def..986c2b9b75 100644 --- a/usr/src/lib/cfgadm_plugins/sata/spec/versions +++ b/usr/src/lib/cfgadm_plugins/pci/common/mapfile-vers @@ -18,23 +18,21 @@ # # CDDL HEADER END # - # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # -sparc { - SUNWprivate_1.1; -} -sparcv9 { - SUNWprivate_1.1; -} -i386 { - SUNWprivate_1.1; -} -amd64 { - SUNWprivate_1.1; -} +SUNWprivate_1.1 { + global: + cfga_change_state; + cfga_help; + cfga_list_ext; + cfga_private_func; + cfga_test; + cfga_version; + local: + *; +}; diff --git a/usr/src/lib/cfgadm_plugins/pci/i386/Makefile b/usr/src/lib/cfgadm_plugins/pci/i386/Makefile index 5dcc284162..50dd2a7dd7 100644 --- a/usr/src/lib/cfgadm_plugins/pci/i386/Makefile +++ b/usr/src/lib/cfgadm_plugins/pci/i386/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# 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. @@ -20,14 +19,12 @@ # CDDL HEADER END # # -# Copyright (c) 1999, by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # -# lib/cfgadm_plugins/pci/i386/Makefile -MAPDIR= ../spec/i386 include ../Makefile.com .KEEP_STATE: diff --git a/usr/src/lib/cfgadm_plugins/pci/sparc/Makefile b/usr/src/lib/cfgadm_plugins/pci/sparc/Makefile index 39b2f356be..50dd2a7dd7 100644 --- a/usr/src/lib/cfgadm_plugins/pci/sparc/Makefile +++ b/usr/src/lib/cfgadm_plugins/pci/sparc/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# 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. @@ -20,14 +19,12 @@ # CDDL HEADER END # # -# Copyright (c) 1999, by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # -# lib/cfgadm_plugins/pci/sparc/Makefile -MAPDIR= ../spec/sparc include ../Makefile.com .KEEP_STATE: diff --git a/usr/src/lib/cfgadm_plugins/pci/sparcv9/Makefile b/usr/src/lib/cfgadm_plugins/pci/sparcv9/Makefile index 83382433a5..4b07c3a63e 100644 --- a/usr/src/lib/cfgadm_plugins/pci/sparcv9/Makefile +++ b/usr/src/lib/cfgadm_plugins/pci/sparcv9/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# 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. @@ -20,14 +19,12 @@ # CDDL HEADER END # # -# Copyright (c) 1999, by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # -# lib/cfgadm_plugins/pci/sparcv9/Makefile -MAPDIR= ../spec/sparcv9 include ../Makefile.com include ../../../Makefile.lib.64 diff --git a/usr/src/lib/cfgadm_plugins/pci/spec/Makefile b/usr/src/lib/cfgadm_plugins/pci/spec/Makefile deleted file mode 100644 index 4aed628ebb..0000000000 --- a/usr/src/lib/cfgadm_plugins/pci/spec/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -# -# Copyright (c) 1999 by Sun Microsystems, Inc. -# All rights reserved. -# -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/pci/spec/Makefile - -include $(SRC)/lib/Makefile.spec.arch diff --git a/usr/src/lib/cfgadm_plugins/pci/spec/Makefile.targ b/usr/src/lib/cfgadm_plugins/pci/spec/Makefile.targ deleted file mode 100644 index 554ecd55c1..0000000000 --- a/usr/src/lib/cfgadm_plugins/pci/spec/Makefile.targ +++ /dev/null @@ -1,35 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -# -# Copyright (c) 1999 by Sun Microsystems, Inc. -# All rights reserved. -# -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/pci/spec/Makefile.targ - -LIBRARY = pci.a -VERS = .1 - -OBJECTS = pci.o - -SPECCPP = diff --git a/usr/src/lib/cfgadm_plugins/pci/spec/amd64/Makefile b/usr/src/lib/cfgadm_plugins/pci/spec/amd64/Makefile deleted file mode 100644 index 5dd1b7240f..0000000000 --- a/usr/src/lib/cfgadm_plugins/pci/spec/amd64/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -# -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# - -include ../Makefile.targ - -# Add arch specific objects here -OBJECTS += - -include $(SRC)/lib/Makefile.lib -include $(SRC)/lib/Makefile.lib.64 - -# Uncomment the following if the linker complains -#amd64_C_PICFLAGS = $(amd64_C_BIGPICFLAGS) - -include $(SRC)/lib/Makefile.spec - -install: $(ROOTABILIB64) diff --git a/usr/src/lib/cfgadm_plugins/pci/spec/i386/Makefile b/usr/src/lib/cfgadm_plugins/pci/spec/i386/Makefile deleted file mode 100644 index 7c10315acd..0000000000 --- a/usr/src/lib/cfgadm_plugins/pci/spec/i386/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -# -# Copyright (c) 1999 by Sun Microsystems, Inc. -# All rights reserved. -# -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/pci/spec/i386/Makefile - -include ../Makefile.targ - -# Add arch specific objects here -OBJECTS += - -include $(SRC)/lib/Makefile.lib - -# Uncomment the following if the linker complains -#i386_C_PICFLAGS = -K PIC - -include $(SRC)/lib/Makefile.spec - -install: $(ROOTABILIB) diff --git a/usr/src/lib/cfgadm_plugins/pci/spec/pci.spec b/usr/src/lib/cfgadm_plugins/pci/spec/pci.spec deleted file mode 100644 index 76eaad9434..0000000000 --- a/usr/src/lib/cfgadm_plugins/pci/spec/pci.spec +++ /dev/null @@ -1,85 +0,0 @@ -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/pci/pci.spec - -function cfga_change_state -include <sys/types.h> -include <sys/param.h> -include <config_admin.h> -declaration cfga_err_t cfga_change_state(cfga_cmd_t state_change_cmd, \ - const char *ap_id, char *options, \ - struct cfga_confirm *confp, struct cfga_msg *msgp, \ - char **errstring, cfga_flags_t flags) -version SUNWprivate_1.1 -end - -function cfga_private_func -include <sys/types.h> -include <sys/param.h> -include <config_admin.h> -declaration cfga_err_t cfga_private_func(const char *function, \ - const char *ap_id, const char *options, \ - struct cfga_confirm *confp, struct cfga_msg *msgp, \ - char **errstring, cfga_flags_t flags) -version SUNWprivate_1.1 -end - -function cfga_test -include <sys/types.h> -include <sys/param.h> -include <config_admin.h> -declaration cfga_err_t cfga_test(int num_ap_ids, char *const *ap_ids, \ - const char *options, struct cfga_msg *msgp, \ - char **errstring, cfga_flags_t flags) -version SUNWprivate_1.1 -end - -function cfga_list_ext -include <sys/types.h> -include <sys/param.h> -include <config_admin.h> -declaration cfga_err_t cfga_list_ext(const char *ap_id, \ - cfga_list_data_t **cs, int *nlist, \ - const char *options, const char *listopts, \ - char **errstring, cfga_flags_t flags) -version SUNWprivate_1.1 -end - - -function cfga_help -include <sys/types.h> -include <sys/param.h> -include <config_admin.h> -declaration cfga_err_t cfga_help(struct cfga_msg *msgp, \ - const char *options, cfga_flags_t flags) -version SUNWprivate_1.1 -end - -data cfga_version -declaration int cfga_version -version SUNWprivate_1.1 -end diff --git a/usr/src/lib/cfgadm_plugins/pci/spec/sparc/Makefile b/usr/src/lib/cfgadm_plugins/pci/spec/sparc/Makefile deleted file mode 100644 index 753d945350..0000000000 --- a/usr/src/lib/cfgadm_plugins/pci/spec/sparc/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -# -# Copyright (c) 1999 by Sun Microsystems, Inc. -# All rights reserved. -# -# ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/pci/spec/sparc/Makefile - -include ../Makefile.targ - -# Add arch specific objects here -OBJECTS += - -include $(SRC)/lib/Makefile.lib - -# Uncomment the following if the linker complains -#sparc_C_PICFLAGS = -K PIC - -include $(SRC)/lib/Makefile.spec - -install: $(ROOTABILIB) diff --git a/usr/src/lib/cfgadm_plugins/pci/spec/sparcv9/Makefile b/usr/src/lib/cfgadm_plugins/pci/spec/sparcv9/Makefile deleted file mode 100644 index ac0abc07cf..0000000000 --- a/usr/src/lib/cfgadm_plugins/pci/spec/sparcv9/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -# -# Copyright (c) 1999 by Sun Microsystems, Inc. -# All rights reserved. -# -# ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/pci/spec/sparcv9/Makefile - -include ../Makefile.targ - -# Add arch specific objects here -OBJECTS += - -include $(SRC)/lib/Makefile.lib -include $(SRC)/lib/Makefile.lib.64 - -# Uncomment the following if the linker complains -#sparcv9_C_PICFLAGS = -K PIC - -include $(SRC)/lib/Makefile.spec - -install: $(ROOTABILIB64) diff --git a/usr/src/lib/cfgadm_plugins/pci/spec/versions b/usr/src/lib/cfgadm_plugins/pci/spec/versions deleted file mode 100644 index a542a0f7fc..0000000000 --- a/usr/src/lib/cfgadm_plugins/pci/spec/versions +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -# ident "%Z%%M% %I% %E% SMI" -# - -sparc { - SUNWprivate_1.1; -} -sparcv9 { - SUNWprivate_1.1; -} -i386 { - SUNWprivate_1.1; -} -amd64 { - SUNWprivate_1.1; -} diff --git a/usr/src/lib/cfgadm_plugins/sata/Makefile b/usr/src/lib/cfgadm_plugins/sata/Makefile index 691964397e..1187341292 100644 --- a/usr/src/lib/cfgadm_plugins/sata/Makefile +++ b/usr/src/lib/cfgadm_plugins/sata/Makefile @@ -18,18 +18,17 @@ # # CDDL HEADER END # - # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # -# lib/cfgadm_plugins/sata/Makefile include ../../Makefile.lib -SUBDIRS= spec .WAIT $(MACH) $(BUILD64) $(MACH64) +SUBDIRS = $(MACH) +$(BUILD64)SUBDIRS += $(MACH64) all := TARGET= all clean := TARGET= clean @@ -53,7 +52,7 @@ CP= cp all clean clobber delete install lint package: $(SUBDIRS) -$(MACH) $(MACH64) spec: FRC +$(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) _msg: $(MSGDOMAIN) $(POFILE) diff --git a/usr/src/lib/cfgadm_plugins/sata/Makefile.com b/usr/src/lib/cfgadm_plugins/sata/Makefile.com index dd1fb7e8b9..6b10ca7b3f 100644 --- a/usr/src/lib/cfgadm_plugins/sata/Makefile.com +++ b/usr/src/lib/cfgadm_plugins/sata/Makefile.com @@ -18,15 +18,12 @@ # # CDDL HEADER END # - # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # -# lib/cfgadm_plugins/sata/Makefile.com -# LIBRARY= sata.a VERS= .1 @@ -36,14 +33,10 @@ OBJECTS= cfga_sata.o cfga_rcm.o # include library definitions include ../../../Makefile.lib +SRCDIR = ../common ROOTLIBDIR= $(ROOT)/usr/lib/cfgadm ROOTLIBDIR64= $(ROOTLIBDIR)/$(MACH64) -MAPFILE= $(MAPDIR)/mapfile -CLOBBERFILES += $(MAPFILE) - -SRCS= $(OBJECTS:%.o=../common/%.c) - LIBS= $(DYNLIB) LINTFLAGS += -DDEBUG @@ -52,7 +45,6 @@ LINTFLAGS64 += -DDEBUG CFLAGS += $(CCVERBOSE) CFLAGS64 += $(CCVERBOSE) -DYNFLAGS += -M $(MAPFILE) LDLIBS += -lc -ldevice -ldevinfo -lrcm -lnvpair .KEEP_STATE: @@ -61,11 +53,6 @@ all: $(LIBS) lint: lintcheck -$(DYNLIB): $(MAPFILE) - -$(MAPFILE): - @cd $(MAPDIR); $(MAKE) mapfile - # Install rules $(ROOTLIBDIR)/%: % $(ROOTLIBDIR) diff --git a/usr/src/lib/cfgadm_plugins/sata/amd64/Makefile b/usr/src/lib/cfgadm_plugins/sata/amd64/Makefile index 2caa30e412..12fe21de7f 100644 --- a/usr/src/lib/cfgadm_plugins/sata/amd64/Makefile +++ b/usr/src/lib/cfgadm_plugins/sata/amd64/Makefile @@ -18,7 +18,6 @@ # # CDDL HEADER END # - # # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -26,7 +25,6 @@ # ident "%Z%%M% %I% %E% SMI" # -MAPDIR= ../spec/amd64 include ../Makefile.com include ../../../Makefile.lib.64 CFLAGS += -D_POSIX_PTHREAD_SEMANTICS diff --git a/usr/src/lib/cfgadm_plugins/sata/spec/i386/Makefile b/usr/src/lib/cfgadm_plugins/sata/common/mapfile-vers index 2b765a917c..986c2b9b75 100644 --- a/usr/src/lib/cfgadm_plugins/sata/spec/i386/Makefile +++ b/usr/src/lib/cfgadm_plugins/sata/common/mapfile-vers @@ -18,26 +18,21 @@ # # CDDL HEADER END # - # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # -# lib/cfgadm_plugins/sata/spec/i386/Makefile - -include ../Makefile.targ - -# Add arch specific objects here -OBJECTS += - -include $(SRC)/lib/Makefile.lib - -# Uncomment the following if the linker complains -#i386_C_PICFLAGS = -K PIC - -include $(SRC)/lib/Makefile.spec - -install: $(ROOTABILIB) +SUNWprivate_1.1 { + global: + cfga_change_state; + cfga_help; + cfga_list_ext; + cfga_private_func; + cfga_test; + cfga_version; + local: + *; +}; diff --git a/usr/src/lib/cfgadm_plugins/sata/i386/Makefile b/usr/src/lib/cfgadm_plugins/sata/i386/Makefile index 04d069c967..9c9593ade6 100644 --- a/usr/src/lib/cfgadm_plugins/sata/i386/Makefile +++ b/usr/src/lib/cfgadm_plugins/sata/i386/Makefile @@ -18,17 +18,13 @@ # # CDDL HEADER END # - # # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # -# lib/cfgadm_plugins/sata/i386/Makefile -# -MAPDIR= ../spec/i386 include ../Makefile.com CFLAGS += -D_POSIX_PTHREAD_SEMANTICS LINTFLAGS += -D_POSIX_PTHREAD_SEMANTICS diff --git a/usr/src/lib/cfgadm_plugins/sata/spec/Makefile.targ b/usr/src/lib/cfgadm_plugins/sata/spec/Makefile.targ deleted file mode 100644 index ebf2c3ed62..0000000000 --- a/usr/src/lib/cfgadm_plugins/sata/spec/Makefile.targ +++ /dev/null @@ -1,37 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/sata/spec/Makefile.targ - -LIBRARY= sata.a -VERS= .1 - -OBJECTS= cfga_sata.o - -TRANSCPP = -SPECCPP = - diff --git a/usr/src/lib/cfgadm_plugins/sata/spec/cfga_sata.spec b/usr/src/lib/cfgadm_plugins/sata/spec/cfga_sata.spec deleted file mode 100644 index 83793393bd..0000000000 --- a/usr/src/lib/cfgadm_plugins/sata/spec/cfga_sata.spec +++ /dev/null @@ -1,77 +0,0 @@ -# -# CDDL HEADER START -# -# 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 -# - -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/sata/spec/cfga_sata.spec - -function cfga_change_state -include <sys/param.h>, <config_admin.h> -declaration cfga_err_t cfga_change_state(cfga_cmd_t, const char *, \ - const char *, struct cfga_confirm *, \ - struct cfga_msg *, char **, cfga_flags_t) -version SUNWprivate_1.1 -end - - -function cfga_help -include <sys/param.h>, <config_admin.h> -declaration cfga_err_t cfga_help(struct cfga_msg *, const char *, \ - cfga_flags_t) -version SUNWprivate_1.1 -end - - -function cfga_list_ext -include <sys/param.h>, <config_admin.h> -declaration cfga_err_t cfga_list_ext(const char *, \ - struct cfga_list_data **, int *, const char *, \ - const char *, char **, cfga_flags_t) -version SUNWprivate_1.1 -end - - -function cfga_private_func -include <sys/param.h>, <config_admin.h> -declaration cfga_err_t cfga_private_func(const char *, const char *, \ - const char *, struct cfga_confirm *, \ - struct cfga_msg *, char **, cfga_flags_t) -version SUNWprivate_1.1 -end - - -function cfga_test -include <sys/param.h>, <config_admin.h> -declaration cfga_err_t cfga_test(const char *, const char *, \ - struct cfga_msg *, char **, cfga_flags_t) -version SUNWprivate_1.1 -end - -data cfga_version -declaration int cfga_version -version SUNWprivate_1.1 -end - - diff --git a/usr/src/lib/cfgadm_plugins/sbd/Makefile.com b/usr/src/lib/cfgadm_plugins/sbd/Makefile.com index 757b9d611b..f4ab702c77 100644 --- a/usr/src/lib/cfgadm_plugins/sbd/Makefile.com +++ b/usr/src/lib/cfgadm_plugins/sbd/Makefile.com @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# 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. @@ -20,13 +19,11 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # -# lib/sbd/Makefile.com -# PLATFORM= sun4u LIBRARY= sbd.a @@ -51,13 +48,11 @@ USR_PSM_LIB_CFG_DIR_64 = $(USR_PSM_LIB_CFG_DIR)/$(MACH64) ROOTLIBDIR= $(USR_PSM_LIB_CFG_DIR) ROOTLIBDIR64= $(USR_PSM_LIB_CFG_DIR_64) -MAPFILE= ../common/mapfile-vers -SRCS= $(OBJECTS:%.o=../common/%.c) +SRCDIR = ../common LIBS = $(DYNLIB) CFLAGS += $(CCVERBOSE) -DYNFLAGS += -M $(MAPFILE) LDLIBS += -lc -lkstat -lnvpair CPPFLAGS += -I$(ROOT)/usr/platform/$(PLATFORM)/include -DSBD_DEBUG @@ -74,8 +69,6 @@ all: $(LIBS) lint: lintcheck -$(DYNLIB): $(MAPFILE) - # Create target directories $(USR_PSM_DIR): -$(INS.dir.root.sys) diff --git a/usr/src/lib/cfgadm_plugins/scsi/Makefile b/usr/src/lib/cfgadm_plugins/scsi/Makefile index a0b7f07b08..af85aa5804 100644 --- a/usr/src/lib/cfgadm_plugins/scsi/Makefile +++ b/usr/src/lib/cfgadm_plugins/scsi/Makefile @@ -18,19 +18,18 @@ # # CDDL HEADER END # - # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # -# lib/cfgadm_plugins/scsi/Makefile include ../../Makefile.lib sparc_SUBDIRS= SUNW,SPARC-Enterprise -SUBDIRS= spec .WAIT $(MACH) $(BUILD64) $(MACH64) $($(MACH)_SUBDIRS) +SUBDIRS = $(MACH) +$(BUILD64)SUBDIRS += $(MACH64) $($(MACH)_SUBDIRS) all := TARGET= all clean := TARGET= clean @@ -54,7 +53,7 @@ CP= cp all clean clobber delete install lint package: $(SUBDIRS) -$(MACH) $(MACH64) spec $($(MACH)_SUBDIRS): FRC +$(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) _msg: $(MSGDOMAIN) $(POFILE) diff --git a/usr/src/lib/cfgadm_plugins/scsi/Makefile.com b/usr/src/lib/cfgadm_plugins/scsi/Makefile.com index fa435b3484..c29b5bc91d 100644 --- a/usr/src/lib/cfgadm_plugins/scsi/Makefile.com +++ b/usr/src/lib/cfgadm_plugins/scsi/Makefile.com @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# 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. @@ -20,13 +19,11 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # -# lib/cfgadm_plugins/scsi/Makefile.com -# LIBRARY= scsi.a VERS= .1 @@ -36,19 +33,14 @@ OBJECTS= cfga_ctl.o cfga_cvt.o cfga_list.o cfga_scsi.o cfga_utils.o cfga_rcm.o # include library definitions include ../../../Makefile.lib +SRCDIR = ../common ROOTLIBDIR= $(ROOT)/usr/lib/cfgadm ROOTLIBDIR64= $(ROOTLIBDIR)/$(MACH64) -MAPFILE= $(MAPDIR)/mapfile -CLOBBERFILES += $(MAPFILE) - -SRCS= $(OBJECTS:%.o=../common/%.c) - LIBS= $(DYNLIB) CFLAGS += $(CCVERBOSE) -DYNFLAGS += -M $(MAPFILE) LDLIBS += -lc -ldevice -ldevinfo -lrcm .KEEP_STATE: @@ -57,11 +49,6 @@ all: $(LIBS) lint: lintcheck -$(DYNLIB): $(MAPFILE) - -$(MAPFILE): - @cd $(MAPDIR); $(MAKE) mapfile - # Install rules $(ROOTLIBDIR)/%: % $(ROOTLIBDIR) diff --git a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile.com b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile.com index 7c84f49c1c..e675ae9d87 100644 --- a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile.com +++ b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile.com @@ -18,15 +18,12 @@ # # CDDL HEADER END # - # # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # -# lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile.com -# LIBRARY= scsi.a VERS= .1 @@ -47,8 +44,7 @@ include $(SRC)/lib/Makefile.lib ROOTLIBDIR= $(ROOT)/usr/platform/SUNW,SPARC-Enterprise/lib/cfgadm ROOTLIBDIR64= $(ROOTLIBDIR)/$(MACH64) -MAPFILE= $(MAPDIR)/mapfile -CLOBBERFILES += $(MAPFILE) +SRCDIR = ../../common SRCS= $(GEN_OBJECTS:%.o=../../common/%.c) $(OPL_OBJECTS:%.o=../common/%.c) @@ -56,7 +52,6 @@ LIBS= $(DYNLIB) CFLAGS += $(CCVERBOSE) -DYNFLAGS += -M $(MAPFILE) LDLIBS += -lc -ldevice -ldevinfo -lrcm .KEEP_STATE: @@ -65,11 +60,6 @@ all: $(LIBS) lint: lintcheck -$(DYNLIB): $(MAPFILE) - -$(MAPFILE): - @cd $(MAPDIR); $(MAKE) mapfile - # Install rules $(ROOTLIBDIR)/%: % $(ROOTLIBDIR) diff --git a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparc/Makefile b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparc/Makefile index 14a712eb3b..c845c24bfc 100644 --- a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparc/Makefile +++ b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparc/Makefile @@ -18,17 +18,13 @@ # # CDDL HEADER END # - # # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparc/Makefile +# ident "%Z%%M% %I% %E% SMI" # -MAPDIR= ../../spec/sparc include ../Makefile.com CFLAGS += -I../../common -I$(SRC)/uts/sun4u/opl diff --git a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparcv9/Makefile b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparcv9/Makefile index 88e3961369..c05026a824 100644 --- a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparcv9/Makefile +++ b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparcv9/Makefile @@ -18,17 +18,13 @@ # # CDDL HEADER END # - # # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # -# lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparcv9/Makefile -# -MAPDIR= ../../spec/sparcv9 include ../Makefile.com include ../../../../Makefile.lib.64 CFLAGS64 += -I../../common -I$(SRC)/uts/sun4u/opl diff --git a/usr/src/lib/cfgadm_plugins/scsi/amd64/Makefile b/usr/src/lib/cfgadm_plugins/scsi/amd64/Makefile index a95e1e4bbd..a0aa2c59c4 100644 --- a/usr/src/lib/cfgadm_plugins/scsi/amd64/Makefile +++ b/usr/src/lib/cfgadm_plugins/scsi/amd64/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# 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. @@ -20,13 +19,12 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # -MAPDIR= ../spec/amd64 include ../Makefile.com include ../../../Makefile.lib.64 diff --git a/usr/src/lib/cfgadm_plugins/sata/spec/amd64/Makefile b/usr/src/lib/cfgadm_plugins/scsi/common/mapfile-vers index a06ecae4b3..986c2b9b75 100644 --- a/usr/src/lib/cfgadm_plugins/sata/spec/amd64/Makefile +++ b/usr/src/lib/cfgadm_plugins/scsi/common/mapfile-vers @@ -18,26 +18,21 @@ # # CDDL HEADER END # - # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # -include ../Makefile.targ - -# Add arch specific objects here -OBJECTS += - -include $(SRC)/lib/Makefile.lib -include $(SRC)/lib/Makefile.lib.64 - -# Uncomment the following if the linker complains -#amd64_C_PICFLAGS = $(amd64_C_BIGPICFLAGS) - -include $(SRC)/lib/Makefile.spec - -install: $(ROOTABILIB64) - +SUNWprivate_1.1 { + global: + cfga_change_state; + cfga_help; + cfga_list_ext; + cfga_private_func; + cfga_test; + cfga_version; + local: + *; +}; diff --git a/usr/src/lib/cfgadm_plugins/scsi/i386/Makefile b/usr/src/lib/cfgadm_plugins/scsi/i386/Makefile index deed4004f1..25e03c3f72 100644 --- a/usr/src/lib/cfgadm_plugins/scsi/i386/Makefile +++ b/usr/src/lib/cfgadm_plugins/scsi/i386/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# 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. @@ -20,15 +19,12 @@ # CDDL HEADER END # # -# Copyright (c) 1998-1999 by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/scsi/i386/Makefile +# ident "%Z%%M% %I% %E% SMI" # -MAPDIR= ../spec/i386 include ../Makefile.com .KEEP_STATE: diff --git a/usr/src/lib/cfgadm_plugins/scsi/sparc/Makefile b/usr/src/lib/cfgadm_plugins/scsi/sparc/Makefile index 81ba4e1d91..25e03c3f72 100644 --- a/usr/src/lib/cfgadm_plugins/scsi/sparc/Makefile +++ b/usr/src/lib/cfgadm_plugins/scsi/sparc/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# 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. @@ -20,15 +19,12 @@ # CDDL HEADER END # # -# Copyright (c) 1998-1999 by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/scsi/sparc/Makefile +# ident "%Z%%M% %I% %E% SMI" # -MAPDIR= ../spec/sparc include ../Makefile.com .KEEP_STATE: diff --git a/usr/src/lib/cfgadm_plugins/scsi/sparcv9/Makefile b/usr/src/lib/cfgadm_plugins/scsi/sparcv9/Makefile index 7218db5703..a0aa2c59c4 100644 --- a/usr/src/lib/cfgadm_plugins/scsi/sparcv9/Makefile +++ b/usr/src/lib/cfgadm_plugins/scsi/sparcv9/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# 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. @@ -20,15 +19,12 @@ # CDDL HEADER END # # -# Copyright (c) 1998-1999 by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/scsi/sparcv9/Makefile +# ident "%Z%%M% %I% %E% SMI" # -MAPDIR= ../spec/sparcv9 include ../Makefile.com include ../../../Makefile.lib.64 diff --git a/usr/src/lib/cfgadm_plugins/scsi/spec/Makefile b/usr/src/lib/cfgadm_plugins/scsi/spec/Makefile deleted file mode 100644 index 53b36048b6..0000000000 --- a/usr/src/lib/cfgadm_plugins/scsi/spec/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -# -# Copyright (c) 1999 by Sun Microsystems, Inc. -# All rights reserved. -# -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/scsi/spec/Makefile - -include $(SRC)/lib/Makefile.spec.arch diff --git a/usr/src/lib/cfgadm_plugins/scsi/spec/Makefile.targ b/usr/src/lib/cfgadm_plugins/scsi/spec/Makefile.targ deleted file mode 100644 index 582dfef74f..0000000000 --- a/usr/src/lib/cfgadm_plugins/scsi/spec/Makefile.targ +++ /dev/null @@ -1,36 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -# -# Copyright (c) 1999 by Sun Microsystems, Inc. -# All rights reserved. -# -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/scsi/spec/Makefile.targ - -LIBRARY= scsi.a -VERS= .1 - -OBJECTS= cfga_scsi.o - -TRANSCPP = -SPECCPP = diff --git a/usr/src/lib/cfgadm_plugins/scsi/spec/amd64/Makefile b/usr/src/lib/cfgadm_plugins/scsi/spec/amd64/Makefile deleted file mode 100644 index 5dd1b7240f..0000000000 --- a/usr/src/lib/cfgadm_plugins/scsi/spec/amd64/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -# -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# - -include ../Makefile.targ - -# Add arch specific objects here -OBJECTS += - -include $(SRC)/lib/Makefile.lib -include $(SRC)/lib/Makefile.lib.64 - -# Uncomment the following if the linker complains -#amd64_C_PICFLAGS = $(amd64_C_BIGPICFLAGS) - -include $(SRC)/lib/Makefile.spec - -install: $(ROOTABILIB64) diff --git a/usr/src/lib/cfgadm_plugins/scsi/spec/cfga_scsi.spec b/usr/src/lib/cfgadm_plugins/scsi/spec/cfga_scsi.spec deleted file mode 100644 index f896b36f80..0000000000 --- a/usr/src/lib/cfgadm_plugins/scsi/spec/cfga_scsi.spec +++ /dev/null @@ -1,71 +0,0 @@ -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/scsi/spec/cfga_scsi.spec - - -function cfga_change_state -include <sys/param.h>, <config_admin.h> -declaration cfga_err_t cfga_change_state(cfga_cmd_t, const char *, \ - const char *, struct cfga_confirm *, \ - struct cfga_msg *, char **, cfga_flags_t) -version SUNWprivate_1.1 -end - -function cfga_help -include <sys/param.h>, <config_admin.h> -declaration cfga_err_t cfga_help(struct cfga_msg *, const char *, \ - cfga_flags_t) -version SUNWprivate_1.1 -end - -function cfga_list_ext -include <sys/param.h>, <config_admin.h> -declaration cfga_err_t cfga_list_ext(const char *, \ - struct cfga_list_data **, int *, const char *, \ - const char *, char **, cfga_flags_t) -version SUNWprivate_1.1 -end - -function cfga_private_func -include <sys/param.h>, <config_admin.h> -declaration cfga_err_t cfga_private_func(const char *, const char *, \ - const char *, struct cfga_confirm *, \ - struct cfga_msg *, char **, cfga_flags_t) -version SUNWprivate_1.1 -end - -function cfga_test -include <sys/param.h>, <config_admin.h> -declaration cfga_err_t cfga_test(const char *, const char *, \ - struct cfga_msg *, char **, cfga_flags_t) -version SUNWprivate_1.1 -end - -data cfga_version -declaration int cfga_version -version SUNWprivate_1.1 -end diff --git a/usr/src/lib/cfgadm_plugins/scsi/spec/i386/Makefile b/usr/src/lib/cfgadm_plugins/scsi/spec/i386/Makefile deleted file mode 100644 index 41d7ee2ed9..0000000000 --- a/usr/src/lib/cfgadm_plugins/scsi/spec/i386/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -# -# Copyright (c) 1999 by Sun Microsystems, Inc. -# All rights reserved. -# -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/scsi/spec/i386/Makefile - -include ../Makefile.targ - -# Add arch specific objects here -OBJECTS += - -include $(SRC)/lib/Makefile.lib - -# Uncomment the following if the linker complains -#i386_C_PICFLAGS = -K PIC - -include $(SRC)/lib/Makefile.spec - -install: $(ROOTABILIB) diff --git a/usr/src/lib/cfgadm_plugins/scsi/spec/sparc/Makefile b/usr/src/lib/cfgadm_plugins/scsi/spec/sparc/Makefile deleted file mode 100644 index b86d0d4ff0..0000000000 --- a/usr/src/lib/cfgadm_plugins/scsi/spec/sparc/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -# -# Copyright (c) 1999 by Sun Microsystems, Inc. -# All rights reserved. -# -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/scsi/spec/sparc/Makefile -# - -.KEEP_STATE: - -include ../Makefile.targ - -# Add arch specific objects here -OBJECTS += - -include $(SRC)/lib/Makefile.lib - -# Uncomment the following if the linker complains -#sparc_C_PICFLAGS = -K PIC - -include $(SRC)/lib/Makefile.spec - -install: $(ROOTABILIB) diff --git a/usr/src/lib/cfgadm_plugins/scsi/spec/sparcv9/Makefile b/usr/src/lib/cfgadm_plugins/scsi/spec/sparcv9/Makefile deleted file mode 100644 index ec134c723c..0000000000 --- a/usr/src/lib/cfgadm_plugins/scsi/spec/sparcv9/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -# -# Copyright (c) 1999 by Sun Microsystems, Inc. -# All rights reserved. -# -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/scsi/spec/sparcv9/Makefile - -include ../Makefile.targ - -# Add arch specific objects here -OBJECTS += - -include $(SRC)/lib/Makefile.lib -include $(SRC)/lib/Makefile.lib.64 - -# Uncomment the following if the linker complains -#sparcv9_C_PICFLAGS = -K PIC - -include $(SRC)/lib/Makefile.spec - -install: $(ROOTABILIB64) diff --git a/usr/src/lib/cfgadm_plugins/scsi/spec/versions b/usr/src/lib/cfgadm_plugins/scsi/spec/versions deleted file mode 100644 index a542a0f7fc..0000000000 --- a/usr/src/lib/cfgadm_plugins/scsi/spec/versions +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -# ident "%Z%%M% %I% %E% SMI" -# - -sparc { - SUNWprivate_1.1; -} -sparcv9 { - SUNWprivate_1.1; -} -i386 { - SUNWprivate_1.1; -} -amd64 { - SUNWprivate_1.1; -} diff --git a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com index f37a852473..beeeea5b3c 100644 --- a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com +++ b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# 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. @@ -20,13 +19,11 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # -# lib/sysctrl/Makefile.com -# include $(SRC)/lib/cfgadm_plugins/Makefile.com @@ -53,13 +50,11 @@ USR_PSM_LIB_CFG_DIR_64 = $(USR_PSM_LIB_CFG_DIR)/$(MACH64) ROOTLIBDIR= $(USR_PSM_LIB_CFG_DIR) ROOTLIBDIR64= $(USR_PSM_LIB_CFG_DIR_64) -MAPFILE= ../common/mapfile-vers -SRCS= $(OBJECTS:%.o=../common/%.c) +SRCDIR = ../common LIBS = $(DYNLIB) CFLAGS += $(CCVERBOSE) -DYNFLAGS += -M $(MAPFILE) LDLIBS += -lc CPPFLAGS += -I$(ROOT)/usr/platform/$(PLATFORM)/include @@ -70,8 +65,6 @@ all: $(LIBS) lint: lintcheck -$(DYNLIB): $(MAPFILE) - # Create target directories $(USR_PSM_DIR): $(LINKED_DIRS) -$(INS.dir.root.sys) diff --git a/usr/src/lib/cfgadm_plugins/usb/Makefile b/usr/src/lib/cfgadm_plugins/usb/Makefile index a934235ecd..c112dc38e3 100644 --- a/usr/src/lib/cfgadm_plugins/usb/Makefile +++ b/usr/src/lib/cfgadm_plugins/usb/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# 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. @@ -20,16 +19,16 @@ # CDDL HEADER END # # -# Copyright (c) 2001 by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # -# lib/cfgadm_plugins/usb/Makefile include ../../Makefile.lib -SUBDIRS= spec .WAIT $(MACH) $(BUILD64) $(MACH64) +SUBDIRS = $(MACH) +$(BUILD64)SUBDIRS += $(MACH64) all := TARGET= all clean := TARGET= clean @@ -53,7 +52,7 @@ CP= cp all clean clobber delete install lint package: $(SUBDIRS) -$(MACH) $(MACH64) spec: FRC +$(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) _msg: $(MSGDOMAIN) $(POFILE) diff --git a/usr/src/lib/cfgadm_plugins/usb/Makefile.com b/usr/src/lib/cfgadm_plugins/usb/Makefile.com index 4c0c59ecf9..bd2941c04c 100644 --- a/usr/src/lib/cfgadm_plugins/usb/Makefile.com +++ b/usr/src/lib/cfgadm_plugins/usb/Makefile.com @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# 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. @@ -20,13 +19,11 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # -# lib/cfgadm_plugins/usb/Makefile.com -# LIBRARY= usb.a VERS= .1 @@ -36,14 +33,10 @@ OBJECTS= cfga_usb.o cfga_rcm.o cfga_configfile.o # include library definitions include ../../../Makefile.lib +SRCDIR = ../common ROOTLIBDIR= $(ROOT)/usr/lib/cfgadm ROOTLIBDIR64= $(ROOTLIBDIR)/$(MACH64) -MAPFILE= $(MAPDIR)/mapfile -CLOBBERFILES += $(MAPFILE) - -SRCS= $(OBJECTS:%.o=../common/%.c) - LIBS= $(DYNLIB) LINTFLAGS += -DDEBUG @@ -52,7 +45,6 @@ LINTFLAGS64 += -DDEBUG CFLAGS += $(CCVERBOSE) CFLAGS64 += $(CCVERBOSE) -DYNFLAGS += -M $(MAPFILE) LDLIBS += -lc -ldevice -ldevinfo -lrcm -lnvpair .KEEP_STATE: @@ -61,11 +53,6 @@ all: $(LIBS) lint: lintcheck -$(DYNLIB): $(MAPFILE) - -$(MAPFILE): - @cd $(MAPDIR); $(MAKE) mapfile - # Install rules $(ROOTLIBDIR)/%: % $(ROOTLIBDIR) diff --git a/usr/src/lib/cfgadm_plugins/usb/amd64/Makefile b/usr/src/lib/cfgadm_plugins/usb/amd64/Makefile index a95e1e4bbd..a0aa2c59c4 100644 --- a/usr/src/lib/cfgadm_plugins/usb/amd64/Makefile +++ b/usr/src/lib/cfgadm_plugins/usb/amd64/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# 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. @@ -20,13 +19,12 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # -MAPDIR= ../spec/amd64 include ../Makefile.com include ../../../Makefile.lib.64 diff --git a/usr/src/lib/cfgadm_plugins/usb/common/mapfile-vers b/usr/src/lib/cfgadm_plugins/usb/common/mapfile-vers new file mode 100644 index 0000000000..986c2b9b75 --- /dev/null +++ b/usr/src/lib/cfgadm_plugins/usb/common/mapfile-vers @@ -0,0 +1,38 @@ +# +# CDDL HEADER START +# +# 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 +# +# +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# ident "%Z%%M% %I% %E% SMI" +# + +SUNWprivate_1.1 { + global: + cfga_change_state; + cfga_help; + cfga_list_ext; + cfga_private_func; + cfga_test; + cfga_version; + local: + *; +}; diff --git a/usr/src/lib/cfgadm_plugins/usb/i386/Makefile b/usr/src/lib/cfgadm_plugins/usb/i386/Makefile index cb57b7323e..25e03c3f72 100644 --- a/usr/src/lib/cfgadm_plugins/usb/i386/Makefile +++ b/usr/src/lib/cfgadm_plugins/usb/i386/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# 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. @@ -20,15 +19,12 @@ # CDDL HEADER END # # -# Copyright (c) 2001 by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/usb/i386/Makefile +# ident "%Z%%M% %I% %E% SMI" # -MAPDIR= ../spec/i386 include ../Makefile.com .KEEP_STATE: diff --git a/usr/src/lib/cfgadm_plugins/usb/sparc/Makefile b/usr/src/lib/cfgadm_plugins/usb/sparc/Makefile index bccf710e4a..25e03c3f72 100644 --- a/usr/src/lib/cfgadm_plugins/usb/sparc/Makefile +++ b/usr/src/lib/cfgadm_plugins/usb/sparc/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# 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. @@ -20,15 +19,12 @@ # CDDL HEADER END # # -# Copyright (c) 2001 by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/usb/sparc/Makefile +# ident "%Z%%M% %I% %E% SMI" # -MAPDIR= ../spec/sparc include ../Makefile.com .KEEP_STATE: diff --git a/usr/src/lib/cfgadm_plugins/usb/sparcv9/Makefile b/usr/src/lib/cfgadm_plugins/usb/sparcv9/Makefile index db46bd9557..a0aa2c59c4 100644 --- a/usr/src/lib/cfgadm_plugins/usb/sparcv9/Makefile +++ b/usr/src/lib/cfgadm_plugins/usb/sparcv9/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# 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. @@ -20,15 +19,12 @@ # CDDL HEADER END # # -# Copyright (c) 2001 by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/usb/sparcv9/Makefile +# ident "%Z%%M% %I% %E% SMI" # -MAPDIR= ../spec/sparcv9 include ../Makefile.com include ../../../Makefile.lib.64 diff --git a/usr/src/lib/cfgadm_plugins/usb/spec/Makefile b/usr/src/lib/cfgadm_plugins/usb/spec/Makefile deleted file mode 100644 index c3663627b8..0000000000 --- a/usr/src/lib/cfgadm_plugins/usb/spec/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -# -# Copyright (c) 2001 by Sun Microsystems, Inc. -# All rights reserved. -# -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/usb/spec/Makefile - -include $(SRC)/lib/Makefile.spec.arch diff --git a/usr/src/lib/cfgadm_plugins/usb/spec/Makefile.targ b/usr/src/lib/cfgadm_plugins/usb/spec/Makefile.targ deleted file mode 100644 index 104af2d358..0000000000 --- a/usr/src/lib/cfgadm_plugins/usb/spec/Makefile.targ +++ /dev/null @@ -1,36 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -# -# Copyright (c) 2001 by Sun Microsystems, Inc. -# All rights reserved. -# -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/usb/spec/Makefile.targ - -LIBRARY= usb.a -VERS= .1 - -OBJECTS= cfga_usb.o - -TRANSCPP = -SPECCPP = diff --git a/usr/src/lib/cfgadm_plugins/usb/spec/amd64/Makefile b/usr/src/lib/cfgadm_plugins/usb/spec/amd64/Makefile deleted file mode 100644 index 5dd1b7240f..0000000000 --- a/usr/src/lib/cfgadm_plugins/usb/spec/amd64/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -# -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# - -include ../Makefile.targ - -# Add arch specific objects here -OBJECTS += - -include $(SRC)/lib/Makefile.lib -include $(SRC)/lib/Makefile.lib.64 - -# Uncomment the following if the linker complains -#amd64_C_PICFLAGS = $(amd64_C_BIGPICFLAGS) - -include $(SRC)/lib/Makefile.spec - -install: $(ROOTABILIB64) diff --git a/usr/src/lib/cfgadm_plugins/usb/spec/cfga_usb.spec b/usr/src/lib/cfgadm_plugins/usb/spec/cfga_usb.spec deleted file mode 100644 index b1c0aa9cb5..0000000000 --- a/usr/src/lib/cfgadm_plugins/usb/spec/cfga_usb.spec +++ /dev/null @@ -1,70 +0,0 @@ -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/usb/spec/cfga_usb.spec - -function cfga_change_state -include <sys/param.h>, <config_admin.h> -declaration cfga_err_t cfga_change_state(cfga_cmd_t, const char *, \ - const char *, struct cfga_confirm *, \ - struct cfga_msg *, char **, cfga_flags_t) -version SUNWprivate_1.1 -end - -function cfga_help -include <sys/param.h>, <config_admin.h> -declaration cfga_err_t cfga_help(struct cfga_msg *, const char *, \ - cfga_flags_t) -version SUNWprivate_1.1 -end - -function cfga_list_ext -include <sys/param.h>, <config_admin.h> -declaration cfga_err_t cfga_list_ext(const char *, \ - struct cfga_list_data **, int *, const char *, \ - const char *, char **, cfga_flags_t) -version SUNWprivate_1.1 -end - -function cfga_private_func -include <sys/param.h>, <config_admin.h> -declaration cfga_err_t cfga_private_func(const char *, const char *, \ - const char *, struct cfga_confirm *, \ - struct cfga_msg *, char **, cfga_flags_t) -version SUNWprivate_1.1 -end - -function cfga_test -include <sys/param.h>, <config_admin.h> -declaration cfga_err_t cfga_test(const char *, const char *, \ - struct cfga_msg *, char **, cfga_flags_t) -version SUNWprivate_1.1 -end - -data cfga_version -declaration int cfga_version -version SUNWprivate_1.1 -end diff --git a/usr/src/lib/cfgadm_plugins/usb/spec/i386/Makefile b/usr/src/lib/cfgadm_plugins/usb/spec/i386/Makefile deleted file mode 100644 index f73285202b..0000000000 --- a/usr/src/lib/cfgadm_plugins/usb/spec/i386/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -# -# Copyright (c) 2001 by Sun Microsystems, Inc. -# All rights reserved. -# -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/usb/spec/i386/Makefile - -include ../Makefile.targ - -# Add arch specific objects here -OBJECTS += - -include $(SRC)/lib/Makefile.lib - -# Uncomment the following if the linker complains -#i386_C_PICFLAGS = -K PIC - -include $(SRC)/lib/Makefile.spec - -install: $(ROOTABILIB) diff --git a/usr/src/lib/cfgadm_plugins/usb/spec/sparc/Makefile b/usr/src/lib/cfgadm_plugins/usb/spec/sparc/Makefile deleted file mode 100644 index f754ed4c66..0000000000 --- a/usr/src/lib/cfgadm_plugins/usb/spec/sparc/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -# -# Copyright (c) 2001 by Sun Microsystems, Inc. -# All rights reserved. -# -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/usb/spec/sparc/Makefile -# - -.KEEP_STATE: - -include ../Makefile.targ - -# Add arch specific objects here -OBJECTS += - -include $(SRC)/lib/Makefile.lib - -# Uncomment the following if the linker complains -#sparc_C_PICFLAGS = -K PIC - -include $(SRC)/lib/Makefile.spec - -install: $(ROOTABILIB) diff --git a/usr/src/lib/cfgadm_plugins/usb/spec/sparcv9/Makefile b/usr/src/lib/cfgadm_plugins/usb/spec/sparcv9/Makefile deleted file mode 100644 index 6c2baae2fa..0000000000 --- a/usr/src/lib/cfgadm_plugins/usb/spec/sparcv9/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -# -# Copyright (c) 2001 by Sun Microsystems, Inc. -# All rights reserved. -# -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/cfgadm_plugins/usb/spec/sparcv9/Makefile - -include ../Makefile.targ - -# Add arch specific objects here -OBJECTS += - -include $(SRC)/lib/Makefile.lib -include $(SRC)/lib/Makefile.lib.64 - -# Uncomment the following if the linker complains -#sparcv9_C_PICFLAGS = -K PIC - -include $(SRC)/lib/Makefile.spec - -install: $(ROOTABILIB64) diff --git a/usr/src/lib/cfgadm_plugins/usb/spec/versions b/usr/src/lib/cfgadm_plugins/usb/spec/versions deleted file mode 100644 index a542a0f7fc..0000000000 --- a/usr/src/lib/cfgadm_plugins/usb/spec/versions +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (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 -# -# ident "%Z%%M% %I% %E% SMI" -# - -sparc { - SUNWprivate_1.1; -} -sparcv9 { - SUNWprivate_1.1; -} -i386 { - SUNWprivate_1.1; -} -amd64 { - SUNWprivate_1.1; -} |