diff options
Diffstat (limited to 'usr/src/lib/libuuid')
| -rw-r--r-- | usr/src/lib/libuuid/Makefile | 15 | ||||
| -rw-r--r-- | usr/src/lib/libuuid/Makefile.com | 11 | ||||
| -rw-r--r-- | usr/src/lib/libuuid/common/mapfile-vers (renamed from usr/src/lib/libuuid/spec/versions) | 49 | ||||
| -rw-r--r-- | usr/src/lib/libuuid/spec/Makefile | 30 | ||||
| -rw-r--r-- | usr/src/lib/libuuid/spec/Makefile.targ | 33 | ||||
| -rw-r--r-- | usr/src/lib/libuuid/spec/amd64/Makefile | 44 | ||||
| -rw-r--r-- | usr/src/lib/libuuid/spec/i386/Makefile | 45 | ||||
| -rw-r--r-- | usr/src/lib/libuuid/spec/sparc/Makefile | 44 | ||||
| -rw-r--r-- | usr/src/lib/libuuid/spec/sparcv9/Makefile | 46 | ||||
| -rw-r--r-- | usr/src/lib/libuuid/spec/uuid.spec | 88 |
10 files changed, 35 insertions, 370 deletions
diff --git a/usr/src/lib/libuuid/Makefile b/usr/src/lib/libuuid/Makefile index 2eeead5cca..933be73e70 100644 --- a/usr/src/lib/libuuid/Makefile +++ b/usr/src/lib/libuuid/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 2002 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/libuuid/Makefile include ../Makefile.lib -SUBDIRS= spec .WAIT $(MACH) $(BUILD64) $(MACH64) +SUBDIRS = $(MACH) +$(BUILD64)SUBDIRS += $(MACH64) all := TARGET= all clean := TARGET= clean @@ -41,7 +40,7 @@ lint := TARGET= lint all install clean clobber lint: $(SUBDIRS) -$(MACH) $(MACH64) spec: FRC +$(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/lib/libuuid/Makefile.com b/usr/src/lib/libuuid/Makefile.com index fdd1c7bc57..7329255870 100644 --- a/usr/src/lib/libuuid/Makefile.com +++ b/usr/src/lib/libuuid/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,7 +19,7 @@ # 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" @@ -37,11 +36,9 @@ include ../../Makefile.rootfs LIBS = $(DYNLIB) $(LINTLIB) LDLIBS += -lsocket -lnsl -lc -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) SRCDIR = ../common -MAPDIR = ../spec/$(TRANSMACH) -SPECMAPFILE = $(MAPDIR)/mapfile +$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) diff --git a/usr/src/lib/libuuid/spec/versions b/usr/src/lib/libuuid/common/mapfile-vers index 1b96e716d5..59a11dbe73 100644 --- a/usr/src/lib/libuuid/spec/versions +++ b/usr/src/lib/libuuid/common/mapfile-vers @@ -1,13 +1,9 @@ # -# 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. +# 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. @@ -22,27 +18,30 @@ # # CDDL HEADER END # -# ident "%Z%%M% %I% %E% SMI" # -# SUNWprivate_1.1: Project private PSARC 2002/094 +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# ident "%Z%%M% %I% %E% SMI" # -sparc { - SUNW_1.1; - SUNWprivate_1.1; -} - -sparcv9 { - SUNW_1.1; - SUNWprivate_1.1; -} - -i386 { - SUNW_1.1; - SUNWprivate_1.1; -} +SUNW_1.1 { + global: + uuid_clear; + uuid_compare; + uuid_copy; + uuid_generate; + uuid_generate_random; + uuid_generate_time; + uuid_is_null; + uuid_parse; + uuid_time; + uuid_unparse; +}; -amd64 { - SUNW_1.1; +SUNWprivate_1.1 { + global: SUNWprivate_1.1; -} + local: + *; +}; diff --git a/usr/src/lib/libuuid/spec/Makefile b/usr/src/lib/libuuid/spec/Makefile deleted file mode 100644 index f144a481db..0000000000 --- a/usr/src/lib/libuuid/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 2002 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libuuid/spec/Makefile - -include $(SRC)/lib/Makefile.spec.arch diff --git a/usr/src/lib/libuuid/spec/Makefile.targ b/usr/src/lib/libuuid/spec/Makefile.targ deleted file mode 100644 index 2f8fea834e..0000000000 --- a/usr/src/lib/libuuid/spec/Makefile.targ +++ /dev/null @@ -1,33 +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 -# -#ident "%Z%%M% %I% %E% SMI" -# -# Copyright 2002 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# lib/libuuid/spec/Makefile.targ - -LIBRARY = libuuid.a -VERS = .1 - -OBJECTS = uuid.o - diff --git a/usr/src/lib/libuuid/spec/amd64/Makefile b/usr/src/lib/libuuid/spec/amd64/Makefile deleted file mode 100644 index d334868181..0000000000 --- a/usr/src/lib/libuuid/spec/amd64/Makefile +++ /dev/null @@ -1,44 +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" -# - -.KEEP_STATE: - -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/libuuid/spec/i386/Makefile b/usr/src/lib/libuuid/spec/i386/Makefile deleted file mode 100644 index 179c815f8f..0000000000 --- a/usr/src/lib/libuuid/spec/i386/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 2002 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libuuid/spec/i386/Makefile - -.KEEP_STATE: - -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/libuuid/spec/sparc/Makefile b/usr/src/lib/libuuid/spec/sparc/Makefile deleted file mode 100644 index fbd86f3471..0000000000 --- a/usr/src/lib/libuuid/spec/sparc/Makefile +++ /dev/null @@ -1,44 +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 2002 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libuuid/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/libuuid/spec/sparcv9/Makefile b/usr/src/lib/libuuid/spec/sparcv9/Makefile deleted file mode 100644 index 63623eaf9b..0000000000 --- a/usr/src/lib/libuuid/spec/sparcv9/Makefile +++ /dev/null @@ -1,46 +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 2002 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libuuid/spec/sparcv9/Makefile - -.KEEP_STATE: - -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/libuuid/spec/uuid.spec b/usr/src/lib/libuuid/spec/uuid.spec deleted file mode 100644 index 501dcdcecf..0000000000 --- a/usr/src/lib/libuuid/spec/uuid.spec +++ /dev/null @@ -1,88 +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/libuuid/spec/uuid.spec - -# UUID generation -function uuid_generate -include <uuid/uuid.h> -declaration void uuid_generate(uuid_t) -version SUNW_1.1 -end - -function uuid_generate_random -include <uuid/uuid.h> -declaration void uuid_generate_random(uuid_t) -version SUNW_1.1 -end - -function uuid_generate_time -include <uuid/uuid.h> -declaration void uuid_generate_time(uuid_t) -version SUNW_1.1 -end - -function uuid_copy -include <uuid/uuid.h> -declaration void uuid_copy(uuid_t, uuid_t) -version SUNW_1.1 -end - -function uuid_clear -include <uuid/uuid.h> -declaration void uuid_clear(uuid_t) -version SUNW_1.1 -end - -function uuid_unparse -include <uuid/uuid.h> -declaration void uuid_unparse(uuid_t, char *) -version SUNW_1.1 -end - -function uuid_compare -include <uuid/uuid.h> -declaration int uuid_compare(uuid_t, uuid_t) -version SUNW_1.1 -end - -function uuid_is_null -include <uuid/uuid.h> -declaration int uuid_is_null(uuid_t) -version SUNW_1.1 -end - -function uuid_parse -include <uuid/uuid.h> -declaration int uuid_parse(char *, uuid_t) -version SUNW_1.1 -end - -function uuid_time -include <uuid/uuid.h> -declaration time_t uuid_time(uuid_t, struct timeval *) -version SUNW_1.1 -end |