diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/Makefile | 11 | ||||
| -rw-r--r-- | usr/src/ucbhead/Makefile | 68 | ||||
| -rw-r--r-- | usr/src/ucbhead/sys/file.h | 4 |
3 files changed, 79 insertions, 4 deletions
diff --git a/usr/src/Makefile b/usr/src/Makefile index 45252e17c9..ee119b34eb 100644 --- a/usr/src/Makefile +++ b/usr/src/Makefile @@ -42,7 +42,7 @@ $(SPARC_BLD)psm: stand SUBDIRS= $(COMMON_SUBDIRS) $($(MACH)_SUBDIRS) -HDRSUBDIRS= uts head lib cmd +HDRSUBDIRS= uts head lib cmd ucbhead # UCB headers are bug-for-bug compatible and not checkable against the header # standards. @@ -52,7 +52,7 @@ CHKHDRSUBDIRS= head uts lib # # Headers that can be built in parallel # -PARALLEL_HEADERS = sysheaders userheaders libheaders cmdheaders +PARALLEL_HEADERS = sysheaders userheaders libheaders ucbheaders cmdheaders # # Directories that can be built in parallel @@ -149,13 +149,13 @@ closedbins: FRC $(ROOTDIRS) .PARALLEL: $(PARALLEL_HEADERS) DUMMY .PARALLEL: $(PARALLEL_DIRS) DUMMY -$(SUBDIRS) head pkg: FRC +$(SUBDIRS) head ucbhead pkg: FRC @cd $@; pwd; $(MAKE) $(TARGET) # librpcsvc has a dependency on headers installed by # userheaders, hence the .WAIT before libheaders. sgs: rootdirs .WAIT sysheaders userheaders .WAIT \ - libheaders cmdheaders + libheaders ucbheaders cmdheaders # # Top-level setup target to setup the development environment that includes @@ -192,6 +192,9 @@ libheaders: bldtools sysheaders: FRC @cd uts; pwd; $(MAKE) install_h +ucbheaders: FRC + @cd ucbhead; pwd; $(MAKE) install_h + cmdheaders: FRC @cd cmd/fm; pwd; $(MAKE) install_h @cd cmd/mdb; pwd; $(MAKE) install_h diff --git a/usr/src/ucbhead/Makefile b/usr/src/ucbhead/Makefile new file mode 100644 index 0000000000..ef9fc7f2fe --- /dev/null +++ b/usr/src/ucbhead/Makefile @@ -0,0 +1,68 @@ +# +# 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 1989-2003 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# ucbhead/Makefile +# +# include global definitions +include ../Makefile.master + +LN= ln + +HDRS= curses.h dbm.h setjmp.h sgtty.h signal.h stdio.h strings.h unistd.h + +SYSHDRS= \ +dir.h fcntl.h file.h ioctl.h \ +param.h resource.h rusage.h signal.h \ +sysmacros.h ttychars.h types.h vfs.h \ +wait.h + +ROOTHDRS= $(HDRS:%=$(ROOT)/usr/ucbinclude/%) \ + $(SYSHDRS:%=$(ROOT)/usr/ucbinclude/sys/%) + +DIRS= sys +ROOTDIRS= $(ROOT)/usr/ucbinclude $(DIRS:%=$(ROOT)/usr/ucbinclude/%) + +FCNTLH= $(ROOT)/usr/ucbinclude/fcntl.h +SYSFCNTLH= $(ROOT)/usr/ucbinclude/sys/fcntl.h + +INS.FCNTLH= $(RM) $@; $(SYMLINK) sys/fcntl.h $@ + +# install rules +$(ROOT)/usr/ucbinclude/sys/%: sys/% + $(INS.file) + +$(ROOT)/usr/ucbinclude/%: % + $(INS.file) + +.KEEP_STATE: + +install_h: $(ROOTDIRS) $(ROOTHDRS) $(FCNTLH) + +$(FCNTLH): $(SYSFCNTLH) + $(INS.FCNTLH) + +$(ROOTDIRS): + $(INS.dir) + diff --git a/usr/src/ucbhead/sys/file.h b/usr/src/ucbhead/sys/file.h index 10863380dd..152141fcd7 100644 --- a/usr/src/ucbhead/sys/file.h +++ b/usr/src/ucbhead/sys/file.h @@ -77,6 +77,10 @@ typedef struct file #include <sys/fcntl.h> #endif +#if !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__) +int flock(int, int); +#endif + /* flags - see also fcntl.h */ #ifndef FOPEN |