MWS_SRX644: migrate branch mws_srx644 -> HEAD

24 files changed, 566 insertions, 103 deletions

diff --git a/dmake/unix/386ix/public.h b/dmake/unix/386ix/public.h
index dea2bc27b6b3..2ee84f040881 100644
--- a/dmake/unix/386ix/public.h
+++ b/dmake/unix/386ix/public.h
@@ -1,4 +1,4 @@
-/* RCS  $Id: public.h,v 1.2 2003-01-13 14:28:03 waratah Exp $
+/* RCS  $Id: public.h,v 1.3 2003-03-25 14:02:43 hr Exp $
 -- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
 --
 --
@@ -88,6 +88,7 @@ void Clear_prerequisites ANSI((CELLPTR));
 int Test_circle ANSI((CELLPTR, int));
 STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
 t_attr Rcp_attribute ANSI((char *));
+void main ANSI((int, char **));
 FILE *Openfile ANSI((char *, int, int));
 FILE *Closefile ANSI(());
 FILE *Search_file ANSI((char *, char **));
diff --git a/dmake/unix/Makefile.in b/dmake/unix/Makefile.in
index 1b9fb775f6c1..3620ede628f5 100755
--- a/dmake/unix/Makefile.in
+++ b/dmake/unix/Makefile.in
@@ -1,6 +1,7 @@
-# Makefile.in generated automatically by automake 1.5 from Makefile.am.
+# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -13,73 +14,111 @@
 
 @SET_MAKE@
 
-SHELL = @SHELL@
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+
+CFLAGS = -O
 CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
 LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
 OBJEXT = @OBJEXT@
+OS_LIBRARY = @OS_LIBRARY@
+OS_SUBDIRS = @OS_SUBDIRS@
+OS_TYPE = @OS_TYPE@
 OS_VERSION = @OS_VERSION@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 
 noinst_LIBRARIES = libunix.a
 
 libunix_a_SOURCES = arlib.c dcache.c dirbrk.c rmprq.c ruletab.c runargv.c tempnam.c
 
 INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/unix/@OS_VERSION@/gnu -I$(top_srcdir)/unix  -I$(top_srcdir)/unix/@OS_VERSION@
-
-CFLAGS = -O
 subdir = unix
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
@@ -93,16 +132,13 @@ am_libunix_a_OBJECTS = arlib.$(OBJEXT) dcache.$(OBJEXT) dirbrk.$(OBJEXT) \
 	tempnam.$(OBJEXT)
 libunix_a_OBJECTS = $(am_libunix_a_OBJECTS)
 
-DEFS = @DEFS@
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/arlib.Po $(DEPDIR)/dcache.Po \
-@AMDEP_TRUE@	$(DEPDIR)/dirbrk.Po $(DEPDIR)/rmprq.Po \
-@AMDEP_TRUE@	$(DEPDIR)/ruletab.Po $(DEPDIR)/runargv.Po \
-@AMDEP_TRUE@	$(DEPDIR)/tempnam.Po
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/arlib.Po ./$(DEPDIR)/dcache.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/dirbrk.Po ./$(DEPDIR)/rmprq.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/ruletab.Po ./$(DEPDIR)/runargv.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/tempnam.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -119,9 +155,7 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configu
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  unix/Makefile
 Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && \
-	  CONFIG_HEADERS= CONFIG_LINKS= \
-	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
 
 AR = ar
 
@@ -138,78 +172,119 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/arlib.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dcache.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dirbrk.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rmprq.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ruletab.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/runargv.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tempnam.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arlib.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcache.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirbrk.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rmprq.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ruletab.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runargv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tempnam.Po@am__quote@
 
 distclean-depend:
-	-rm -rf $(DEPDIR)
+	-rm -rf ./$(DEPDIR)
 
 .c.o:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
 
 .c.obj:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c `cygpath -w $<`
-CCDEPMODE = @CCDEPMODE@
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
 uninstall-info-am:
 
+ETAGS = etags
+ETAGSFLAGS =
+
+CTAGS = ctags
+CTAGSFLAGS =
+
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique $(LISP)
+	mkid -fID $$unique
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || etags $(ETAGS_ARGS) $$tags  $$unique $(LISP)
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
+
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
 
 GTAGS:
-	here=`CDPATH=: && cd $(top_builddir) && pwd` \
+	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
 	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pR $$d/$$file $(distdir) \
-	    || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || cp -p $$d/$$file $(distdir)/$$file \
@@ -233,6 +308,7 @@ install-am: all-am
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -240,7 +316,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -280,18 +356,26 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES distclean distclean-compile \
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-noinstLIBRARIES ctags distclean distclean-compile \
 	distclean-depend distclean-generic distclean-tags distdir dvi \
 	dvi-am info info-am install install-am install-data \
 	install-data-am install-exec install-exec-am install-info \
 	install-info-am install-man install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic tags uninstall uninstall-am \
-	uninstall-info-am
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/dmake/unix/arlib.c b/dmake/unix/arlib.c
index 63ecfa8c2a20..f916ccb9dbfc 100644
--- a/dmake/unix/arlib.c
+++ b/dmake/unix/arlib.c
@@ -1,4 +1,64 @@
-/* RCS  $Id: arlib.c,v 1.2 2002-10-11 13:42:47 waratah Exp $
+/*************************************************************************
+ *
+ *  $RCSfile: arlib.c,v $
+ *
+ *  $Revision: 1.3 $
+ *
+ *  last change: $Author: hr $ $Date: 2003-03-25 14:02:41 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+/*
 --
 -- SYNOPSIS
 --      Unix archive manipulation code.
diff --git a/dmake/unix/bsd43/public.h b/dmake/unix/bsd43/public.h
index dea2bc27b6b3..2ee84f040881 100644
--- a/dmake/unix/bsd43/public.h
+++ b/dmake/unix/bsd43/public.h
@@ -1,4 +1,4 @@
-/* RCS  $Id: public.h,v 1.2 2003-01-13 14:28:03 waratah Exp $
+/* RCS  $Id: public.h,v 1.3 2003-03-25 14:02:43 hr Exp $
 -- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
 --
 --
@@ -88,6 +88,7 @@ void Clear_prerequisites ANSI((CELLPTR));
 int Test_circle ANSI((CELLPTR, int));
 STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
 t_attr Rcp_attribute ANSI((char *));
+void main ANSI((int, char **));
 FILE *Openfile ANSI((char *, int, int));
 FILE *Closefile ANSI(());
 FILE *Search_file ANSI((char *, char **));
diff --git a/dmake/unix/bsd43/uw/public.h b/dmake/unix/bsd43/uw/public.h
index dea2bc27b6b3..dd8721b417e3 100644
--- a/dmake/unix/bsd43/uw/public.h
+++ b/dmake/unix/bsd43/uw/public.h
@@ -1,4 +1,4 @@
-/* RCS  $Id: public.h,v 1.2 2003-01-13 14:28:03 waratah Exp $
+/* RCS  $Id: public.h,v 1.3 2003-03-25 14:02:44 hr Exp $
 -- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
 --
 --
@@ -88,6 +88,7 @@ void Clear_prerequisites ANSI((CELLPTR));
 int Test_circle ANSI((CELLPTR, int));
 STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
 t_attr Rcp_attribute ANSI((char *));
+void main ANSI((int, char **));
 FILE *Openfile ANSI((char *, int, int));
 FILE *Closefile ANSI(());
 FILE *Search_file ANSI((char *, char **));
diff --git a/dmake/unix/bsd43/vf/public.h b/dmake/unix/bsd43/vf/public.h
index 6bfe2a8c0380..dd8721b417e3 100644
--- a/dmake/unix/bsd43/vf/public.h
+++ b/dmake/unix/bsd43/vf/public.h
@@ -1,4 +1,4 @@
-/* RCS  $Id: public.h,v 1.2 2003-01-13 14:28:04 waratah Exp $
+/* RCS  $Id: public.h,v 1.3 2003-03-25 14:02:44 hr Exp $
 -- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
 --
 --
@@ -88,6 +88,7 @@ void Clear_prerequisites ANSI((CELLPTR));
 int Test_circle ANSI((CELLPTR, int));
 STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
 t_attr Rcp_attribute ANSI((char *));
+void main ANSI((int, char **));
 FILE *Openfile ANSI((char *, int, int));
 FILE *Closefile ANSI(());
 FILE *Search_file ANSI((char *, char **));
diff --git a/dmake/unix/bsdarm32/public.h b/dmake/unix/bsdarm32/public.h
index 6bfe2a8c0380..dd8721b417e3 100644
--- a/dmake/unix/bsdarm32/public.h
+++ b/dmake/unix/bsdarm32/public.h
@@ -1,4 +1,4 @@
-/* RCS  $Id: public.h,v 1.2 2003-01-13 14:28:04 waratah Exp $
+/* RCS  $Id: public.h,v 1.3 2003-03-25 14:02:44 hr Exp $
 -- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
 --
 --
@@ -88,6 +88,7 @@ void Clear_prerequisites ANSI((CELLPTR));
 int Test_circle ANSI((CELLPTR, int));
 STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
 t_attr Rcp_attribute ANSI((char *));
+void main ANSI((int, char **));
 FILE *Openfile ANSI((char *, int, int));
 FILE *Closefile ANSI(());
 FILE *Search_file ANSI((char *, char **));
diff --git a/dmake/unix/coherent/ver40/public.h b/dmake/unix/coherent/ver40/public.h
index 6bfe2a8c0380..aa52c70abb33 100644
--- a/dmake/unix/coherent/ver40/public.h
+++ b/dmake/unix/coherent/ver40/public.h
@@ -1,4 +1,4 @@
-/* RCS  $Id: public.h,v 1.2 2003-01-13 14:28:04 waratah Exp $
+/* RCS  $Id: public.h,v 1.3 2003-03-25 14:02:45 hr Exp $
 -- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
 --
 --
@@ -88,6 +88,7 @@ void Clear_prerequisites ANSI((CELLPTR));
 int Test_circle ANSI((CELLPTR, int));
 STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
 t_attr Rcp_attribute ANSI((char *));
+void main ANSI((int, char **));
 FILE *Openfile ANSI((char *, int, int));
 FILE *Closefile ANSI(());
 FILE *Search_file ANSI((char *, char **));
diff --git a/dmake/unix/coherent/ver42/public.h b/dmake/unix/coherent/ver42/public.h
index a716896135d2..aa52c70abb33 100644
--- a/dmake/unix/coherent/ver42/public.h
+++ b/dmake/unix/coherent/ver42/public.h
@@ -1,4 +1,4 @@
-/* RCS  $Id: public.h,v 1.2 2003-01-13 14:28:05 waratah Exp $
+/* RCS  $Id: public.h,v 1.3 2003-03-25 14:02:45 hr Exp $
 -- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
 --
 --
@@ -88,6 +88,7 @@ void Clear_prerequisites ANSI((CELLPTR));
 int Test_circle ANSI((CELLPTR, int));
 STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
 t_attr Rcp_attribute ANSI((char *));
+void main ANSI((int, char **));
 FILE *Openfile ANSI((char *, int, int));
 FILE *Closefile ANSI(());
 FILE *Search_file ANSI((char *, char **));
diff --git a/dmake/unix/cygwin/public.h b/dmake/unix/cygwin/public.h
index be9c814a6bf7..e28f958e56ff 100644
--- a/dmake/unix/cygwin/public.h
+++ b/dmake/unix/cygwin/public.h
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: public.h,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: waratah $ $Date: 2003-01-13 14:28:05 $
+ *  last change: $Author: hr $ $Date: 2003-03-25 14:02:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -109,6 +109,7 @@ void Clear_prerequisites ANSI((CELLPTR));
 int Test_circle ANSI((CELLPTR, int));
 STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
 t_attr Rcp_attribute ANSI((char *));
+int main ANSI((int, char **));
 FILE *Openfile ANSI((char *, int, int));
 FILE *Closefile ANSI(());
 FILE *Search_file ANSI((char *, char **));
diff --git a/dmake/unix/dcache.c b/dmake/unix/dcache.c
index 4b1457bf8fb9..b9cd83b7b773 100644
--- a/dmake/unix/dcache.c
+++ b/dmake/unix/dcache.c
@@ -1,4 +1,64 @@
-/* RCS  $Id: dcache.c,v 1.2 2002-10-11 13:42:47 waratah Exp $
+/*************************************************************************
+ *
+ *  $RCSfile: dcache.c,v $
+ *
+ *  $Revision: 1.3 $
+ *
+ *  last change: $Author: hr $ $Date: 2003-03-25 14:02:41 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+/*
 --
 -- SYNOPSIS
 --      Directory cache management routines.
diff --git a/dmake/unix/linux/gnu/public.h b/dmake/unix/linux/gnu/public.h
index 3d930348b930..639eb4c9731a 100644
--- a/dmake/unix/linux/gnu/public.h
+++ b/dmake/unix/linux/gnu/public.h
@@ -1,4 +1,64 @@
-/* RCS  $Id: public.h,v 1.2 2002-10-11 13:42:49 waratah Exp $
+/*************************************************************************
+ *
+ *  $RCSfile: public.h,v $
+ *
+ *  $Revision: 1.3 $
+ *
+ *  last change: $Author: hr $ $Date: 2003-03-25 14:02:46 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+/*
 -- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
 --
 --
diff --git a/dmake/unix/macosx/gnu/public.h b/dmake/unix/macosx/gnu/public.h
index ecaab4f5c934..d64675ed6d62 100644
--- a/dmake/unix/macosx/gnu/public.h
+++ b/dmake/unix/macosx/gnu/public.h
@@ -1,4 +1,4 @@
-/* RCS  $Id: public.h,v 1.2 2003-01-04 13:08:48 waratah Exp $
+/* RCS  $Id: public.h,v 1.3 2003-03-25 14:02:47 hr Exp $
 -- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
 --
 --
@@ -88,6 +88,7 @@ void Clear_prerequisites ANSI((CELLPTR));
 int Test_circle ANSI((CELLPTR, int));
 STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
 t_attr Rcp_attribute ANSI((char *));
+PUBLIC int main ANSI((int argc, char **argv));
 FILE *Openfile ANSI((char *, int, int));
 FILE *Closefile ANSI(());
 FILE *Search_file ANSI((char *, char **));
diff --git a/dmake/unix/rmprq.c b/dmake/unix/rmprq.c
index 17a951ae1fbd..7ba8155f4a9f 100644
--- a/dmake/unix/rmprq.c
+++ b/dmake/unix/rmprq.c
@@ -1,4 +1,64 @@
-/* RCS  $Id: rmprq.c,v 1.2 2002-10-11 13:42:47 waratah Exp $
+/*************************************************************************
+ *
+ *  $RCSfile: rmprq.c,v $
+ *
+ *  $Revision: 1.3 $
+ *
+ *  last change: $Author: hr $ $Date: 2003-03-25 14:02:41 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+/*
 --
 -- SYNOPSIS
 --      Remove prerequisites code.
diff --git a/dmake/unix/ruletab.c b/dmake/unix/ruletab.c
index b28a42833545..9288515a1c8b 100644
--- a/dmake/unix/ruletab.c
+++ b/dmake/unix/ruletab.c
@@ -1,5 +1,64 @@
-/* RCS  $Id: ruletab.c,v 1.2 2001-04-20 14:23:06 mh Exp $
---
+/*************************************************************************
+ *
+ *  $RCSfile: ruletab.c,v $
+ *
+ *  $Revision: 1.3 $
+ *
+ *  last change: $Author: hr $ $Date: 2003-03-25 14:02:42 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+/*
 -- SYNOPSIS
 --      Default initial configuration of dmake.
 --
diff --git a/dmake/unix/runargv.c b/dmake/unix/runargv.c
index 4766eecb26dd..e58b89fedb78 100644
--- a/dmake/unix/runargv.c
+++ b/dmake/unix/runargv.c
@@ -1,4 +1,64 @@
-/* RCS  $Id: runargv.c,v 1.6 2003-01-04 13:02:44 waratah Exp $
+/*************************************************************************
+ *
+ *  $RCSfile: runargv.c,v $
+ *
+ *  $Revision: 1.7 $
+ *
+ *  last change: $Author: hr $ $Date: 2003-03-25 14:02:42 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+/*
 --
 -- SYNOPSIS
 --      Invoke a sub process.
@@ -25,7 +85,11 @@
 
 #include <signal.h>
 #ifdef HAVE_WAIT_H
-#    include <wait.h>
+#  include <wait.h>
+#else
+# ifdef HAVE_SYS_WAIT_H
+#  include <sys/wait.h>
+# endif
 #endif
 
 #include "extern.h"
@@ -106,7 +170,6 @@ int last;
 int     shell;
 char    *cmd;
 {
-
    int          pid;
    char         **argv;
 
diff --git a/dmake/unix/solaris/gnu/public.h b/dmake/unix/solaris/gnu/public.h
index 66cd4d817002..734a558e19e9 100644
--- a/dmake/unix/solaris/gnu/public.h
+++ b/dmake/unix/solaris/gnu/public.h
@@ -1,4 +1,4 @@
-/* RCS  $Id: public.h,v 1.2 2003-01-13 14:28:06 waratah Exp $
+/* RCS  $Id: public.h,v 1.3 2003-03-25 14:02:47 hr Exp $
 -- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
 --
 --
@@ -88,6 +88,7 @@ void Clear_prerequisites ANSI((CELLPTR));
 int Test_circle ANSI((CELLPTR, int));
 STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
 t_attr Rcp_attribute ANSI((char *));
+void main ANSI((int, char **));
 FILE *Openfile ANSI((char *, int, int));
 FILE *Closefile ANSI(());
 FILE *Search_file ANSI((char *, char **));
diff --git a/dmake/unix/sysvr1/public.h b/dmake/unix/sysvr1/public.h
index 66cd4d817002..9a024920e9c9 100644
--- a/dmake/unix/sysvr1/public.h
+++ b/dmake/unix/sysvr1/public.h
@@ -1,4 +1,4 @@
-/* RCS  $Id: public.h,v 1.2 2003-01-13 14:28:06 waratah Exp $
+/* RCS  $Id: public.h,v 1.3 2003-03-25 14:02:48 hr Exp $
 -- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
 --
 --
@@ -88,6 +88,7 @@ void Clear_prerequisites ANSI((CELLPTR));
 int Test_circle ANSI((CELLPTR, int));
 STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
 t_attr Rcp_attribute ANSI((char *));
+void main ANSI((int, char **));
 FILE *Openfile ANSI((char *, int, int));
 FILE *Closefile ANSI(());
 FILE *Search_file ANSI((char *, char **));
diff --git a/dmake/unix/sysvr3/gnu/public.h b/dmake/unix/sysvr3/gnu/public.h
index 0f01813a3221..60feed0d7101 100644
--- a/dmake/unix/sysvr3/gnu/public.h
+++ b/dmake/unix/sysvr3/gnu/public.h
@@ -1,4 +1,4 @@
-/* RCS  $Id: public.h,v 1.2 2003-01-13 14:28:07 waratah Exp $
+/* RCS  $Id: public.h,v 1.3 2003-03-25 14:02:49 hr Exp $
 -- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
 --
 --
@@ -86,6 +86,7 @@ void Clear_prerequisites ANSI((CELLPTR));
 int Test_circle ANSI((CELLPTR, int));
 STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
 t_attr Rcp_attribute ANSI((char *));
+void main ANSI((int, char **));
 FILE *Openfile ANSI((char *, int, int));
 FILE *Closefile ANSI(());
 FILE *Search_file ANSI((char *, char **));
diff --git a/dmake/unix/sysvr3/public.h b/dmake/unix/sysvr3/public.h
index 66cd4d817002..9a024920e9c9 100644
--- a/dmake/unix/sysvr3/public.h
+++ b/dmake/unix/sysvr3/public.h
@@ -1,4 +1,4 @@
-/* RCS  $Id: public.h,v 1.2 2003-01-13 14:28:06 waratah Exp $
+/* RCS  $Id: public.h,v 1.3 2003-03-25 14:02:48 hr Exp $
 -- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
 --
 --
@@ -88,6 +88,7 @@ void Clear_prerequisites ANSI((CELLPTR));
 int Test_circle ANSI((CELLPTR, int));
 STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
 t_attr Rcp_attribute ANSI((char *));
+void main ANSI((int, char **));
 FILE *Openfile ANSI((char *, int, int));
 FILE *Closefile ANSI(());
 FILE *Search_file ANSI((char *, char **));
diff --git a/dmake/unix/sysvr3/pwd/public.h b/dmake/unix/sysvr3/pwd/public.h
index 011a809f03c0..248cfad40423 100644
--- a/dmake/unix/sysvr3/pwd/public.h
+++ b/dmake/unix/sysvr3/pwd/public.h
@@ -1,4 +1,4 @@
-/* RCS  $Id: public.h,v 1.2 2003-01-13 14:28:07 waratah Exp $
+/* RCS  $Id: public.h,v 1.3 2003-03-25 14:02:49 hr Exp $
 -- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
 --
 --
@@ -88,6 +88,7 @@ void Clear_prerequisites ANSI((CELLPTR));
 int Test_circle ANSI((CELLPTR, int));
 STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
 t_attr Rcp_attribute ANSI((char *));
+void main ANSI((int, char **));
 FILE *Openfile ANSI((char *, int, int));
 FILE *Closefile ANSI(());
 FILE *Search_file ANSI((char *, char **));
diff --git a/dmake/unix/sysvr4/public.h b/dmake/unix/sysvr4/public.h
index 011a809f03c0..248cfad40423 100644
--- a/dmake/unix/sysvr4/public.h
+++ b/dmake/unix/sysvr4/public.h
@@ -1,4 +1,4 @@
-/* RCS  $Id: public.h,v 1.2 2003-01-13 14:28:07 waratah Exp $
+/* RCS  $Id: public.h,v 1.3 2003-03-25 14:02:49 hr Exp $
 -- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
 --
 --
@@ -88,6 +88,7 @@ void Clear_prerequisites ANSI((CELLPTR));
 int Test_circle ANSI((CELLPTR, int));
 STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
 t_attr Rcp_attribute ANSI((char *));
+void main ANSI((int, char **));
 FILE *Openfile ANSI((char *, int, int));
 FILE *Closefile ANSI(());
 FILE *Search_file ANSI((char *, char **));
diff --git a/dmake/unix/xenix/public.h b/dmake/unix/xenix/public.h
index 3e9f08135868..5388a848dd3e 100644
--- a/dmake/unix/xenix/public.h
+++ b/dmake/unix/xenix/public.h
@@ -1,4 +1,4 @@
-/* RCS  $Id: public.h,v 1.2 2003-01-13 14:28:08 waratah Exp $
+/* RCS  $Id: public.h,v 1.3 2003-03-25 14:02:50 hr Exp $
 -- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
 --
 --
@@ -88,6 +88,7 @@ void Clear_prerequisites ANSI((CELLPTR));
 int Test_circle ANSI((CELLPTR, int));
 STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
 t_attr Rcp_attribute ANSI((char *));
+void main ANSI((int, char **));
 FILE *Openfile ANSI((char *, int, int));
 FILE *Closefile ANSI(());
 FILE *Search_file ANSI((char *, char **));
diff --git a/dmake/unix/xenix/pwd/public.h b/dmake/unix/xenix/pwd/public.h
index 3e9f08135868..5388a848dd3e 100644
--- a/dmake/unix/xenix/pwd/public.h
+++ b/dmake/unix/xenix/pwd/public.h
@@ -1,4 +1,4 @@
-/* RCS  $Id: public.h,v 1.2 2003-01-13 14:28:08 waratah Exp $
+/* RCS  $Id: public.h,v 1.3 2003-03-25 14:02:50 hr Exp $
 -- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
 --
 --
@@ -88,6 +88,7 @@ void Clear_prerequisites ANSI((CELLPTR));
 int Test_circle ANSI((CELLPTR, int));
 STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
 t_attr Rcp_attribute ANSI((char *));
+void main ANSI((int, char **));
 FILE *Openfile ANSI((char *, int, int));
 FILE *Closefile ANSI(());
 FILE *Search_file ANSI((char *, char **));