diff options
Diffstat (limited to 'usr/src/lib/libxnet')
| -rw-r--r-- | usr/src/lib/libxnet/Makefile | 24 | ||||
| -rw-r--r-- | usr/src/lib/libxnet/Makefile.com | 38 | ||||
| -rw-r--r-- | usr/src/lib/libxnet/amd64/Makefile | 17 | ||||
| -rw-r--r-- | usr/src/lib/libxnet/common/data.c | 39 | ||||
| -rw-r--r-- | usr/src/lib/libxnet/common/mapfile-vers | 4 | ||||
| -rw-r--r-- | usr/src/lib/libxnet/i386/Makefile | 13 | ||||
| -rw-r--r-- | usr/src/lib/libxnet/sparc/Makefile | 13 | ||||
| -rw-r--r-- | usr/src/lib/libxnet/sparcv9/Makefile | 17 |
8 files changed, 43 insertions, 122 deletions
diff --git a/usr/src/lib/libxnet/Makefile b/usr/src/lib/libxnet/Makefile index f663bdff96..6cb7a4fa8a 100644 --- a/usr/src/lib/libxnet/Makefile +++ b/usr/src/lib/libxnet/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,31 +19,26 @@ # CDDL HEADER END # # -# Copyright 2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/libxnet/Makefile include ../Makefile.lib -SUBDIRS= $(MACH) $(BUILD64) $(MACH64) +SUBDIRS = $(MACH) $(BUILD64) $(MACH64) all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber -delete := TARGET= delete install := TARGET= install -lint := TARGET= lint -_msg := TARGET= _msg -package := TARGET= package .KEEP_STATE: -all clean clobber delete install lint package: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) + +lint: -$(MACH) $(MACH64): FRC - @cd $@; pwd; $(MAKE) $(TARGET) +$(SUBDIRS): FRC + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/lib/libxnet/Makefile.com b/usr/src/lib/libxnet/Makefile.com index cd7754cf37..70dccf0033 100644 --- a/usr/src/lib/libxnet/Makefile.com +++ b/usr/src/lib/libxnet/Makefile.com @@ -19,41 +19,15 @@ # CDDL HEADER END # # -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# - -LIBRARY= libxnet.a -VERS= .1 -OBJECTS= data.o - -include ../../Makefile.lib - -# install this library in the root filesystem -include ../../Makefile.rootfs -MAPFILES += $(MAPFILE.FLT) +LIBRARY = libxnet.a +VERS = .1 -SRCDIR= ../common -LIBS= $(DYNLIB) $(LINTLIB) +include $(SRC)/lib/Makefile.rootfs -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) - -CPPFLAGS += -D__EXTENSIONS__ -CFLAGS += $(CCVERBOSE) +LIBS += $(LINTLIB) DYNFLAGS += $(ZLOADFLTR) - -# Redefine shared object build rule to use $(LD) directly (this avoids .init -# and .fini sections being added). - -BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) - -.KEEP_STATE: - -all: $(LIBS) - -lint: lintcheck - -include ../../Makefile.targ +CPPFLAGS += -D__EXTENSIONS__ diff --git a/usr/src/lib/libxnet/amd64/Makefile b/usr/src/lib/libxnet/amd64/Makefile index b6175cc0ce..70f0fc2457 100644 --- a/usr/src/lib/libxnet/amd64/Makefile +++ b/usr/src/lib/libxnet/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,16 +19,14 @@ # CDDL HEADER END # # -# Copyright 2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -include ../../Makefile.lib.64 +include $(SRC)/lib/Makefile.lib.64 -.KEEP_STATE: +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) -BUILD.SO= $(LD) -o $@ -G -64 $(DYNFLAGS) $(PICS) - -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT) +include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libxnet/common/data.c b/usr/src/lib/libxnet/common/data.c deleted file mode 100644 index eccdbd746a..0000000000 --- a/usr/src/lib/libxnet/common/data.c +++ /dev/null @@ -1,39 +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) 1996, by Sun Microsystems, Inc. - * All rights reserved. - */ -#pragma ident "%Z%%M% %I% %E% SMI" - -/* - * Define any exported data items. These have to be described within an object - * rather than a mapfile so that they are assigned to a valid section (and thus - * do not result in absolute symbols). - * - * Both of these symbols originate from libnsl. h_error is an uninitialized - * data item where as t_errno is initialized - the value provided here is - * irrelevant but necessary to generate an appropriate copy relocation should - * an application reference this symbol. - */ -int h_errno; -int t_errno = 0; diff --git a/usr/src/lib/libxnet/common/mapfile-vers b/usr/src/lib/libxnet/common/mapfile-vers index 107f590b75..bae43c0320 100644 --- a/usr/src/lib/libxnet/common/mapfile-vers +++ b/usr/src/lib/libxnet/common/mapfile-vers @@ -130,7 +130,7 @@ SUNW_1.1 { getservent = FUNCTION FILTER libsocket.so.1; getsockname = FUNCTION FILTER libsocket.so.1; getsockopt = FUNCTION FILTER libsocket.so.1; - h_errno = NODIRECT FILTER libnsl.so.1; + h_errno = DATA S0x4 NODIRECT FILTER libnsl.so.1; htonl = FUNCTION FILTER libc.so.1; htons = FUNCTION FILTER libc.so.1; inet_addr = FUNCTION FILTER libnsl.so.1; @@ -156,7 +156,7 @@ SUNW_1.1 { shutdown = FUNCTION FILTER libsocket.so.1; socket = FUNCTION FILTER libsocket.so.1; socketpair = FUNCTION FILTER libsocket.so.1; - t_errno = FILTER libnsl.so.1; + t_errno = DATA S0x4 FILTER libnsl.so.1; local: *; }; diff --git a/usr/src/lib/libxnet/i386/Makefile b/usr/src/lib/libxnet/i386/Makefile index 06c850e43c..4e4e8c02a9 100644 --- a/usr/src/lib/libxnet/i386/Makefile +++ b/usr/src/lib/libxnet/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,13 +19,13 @@ # CDDL HEADER END # # -# Copyright 2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -.KEEP_STATE: +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libxnet/sparc/Makefile b/usr/src/lib/libxnet/sparc/Makefile index 06c850e43c..4e4e8c02a9 100644 --- a/usr/src/lib/libxnet/sparc/Makefile +++ b/usr/src/lib/libxnet/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,13 +19,13 @@ # CDDL HEADER END # # -# Copyright 2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -.KEEP_STATE: +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libxnet/sparcv9/Makefile b/usr/src/lib/libxnet/sparcv9/Makefile index b6175cc0ce..70f0fc2457 100644 --- a/usr/src/lib/libxnet/sparcv9/Makefile +++ b/usr/src/lib/libxnet/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,16 +19,14 @@ # CDDL HEADER END # # -# Copyright 2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -include ../../Makefile.lib.64 +include $(SRC)/lib/Makefile.lib.64 -.KEEP_STATE: +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) -BUILD.SO= $(LD) -o $@ -G -64 $(DYNFLAGS) $(PICS) - -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT) +include $(SRC)/lib/Makefile.filter.targ |