cvs-nserver-commits Mailing List for CVS with rewritten network layer
Brought to you by:
tyranny
Menu
▾
▴
cvs-nserver-commits — cvs-nserver repository commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(41) |
Sep
(69) |
Oct
(12) |
Nov
(35) |
Dec
(43) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(12) |
Feb
(19) |
Mar
(55) |
Apr
(25) |
May
(69) |
Jun
(33) |
Jul
(3) |
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
(35) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
Update of /cvsroot/cvs-nserver/cvs-nserver/acl In directory sc8-pr-cvs1:/tmp/cvs-serv14789/acl Added Files: .cvsignore Doxyfile Makefile.am Makefile.in acl-admins.c acl-admins.h branch-acl.c branch-acl.h check_acl.c check_acl.h check_acl.sh check_acl_admins.c check_acl_admins.sh check_branch_acl.c check_default_file_acl.c check_default_file_acl.sh check_dir_acl.c check_dir_acl.sh check_module_acl.c check_module_acl.sh check_persistent_acl.c check_persistent_acl.sh check_repository.c check_repository.sh check_traversing.c check_traversing.sh check_user_acl.c check_user_groups.c check_user_groups.sh cvsgroup-internal.h cvsgroup.c cvsgroup.h default-file-acl.c default-file-acl.h dir-acl.c dir-acl.h module-acl.c module-acl.h repository.c repository.h user-acl.c user-acl.h Log Message: Merged NCLI-1-11-1 code w/ CVS 1.11.5 |
|
From: Alexey M. <ty...@us...> - 2003-04-22 18:57:03
|
Update of /cvsroot/cvs-nserver/cvs-nserver/contrib
In directory sc8-pr-cvs1:/tmp/cvs-serv14789/contrib
Modified Files:
Makefile.am Makefile.in cvscheck.sh
Added Files:
repcheck
Log Message:
Merged NCLI-1-11-1 code w/ CVS 1.11.5
Index: Makefile.am
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/contrib/Makefile.am,v
retrieving revision 1.1.1.3
retrieving revision 1.2
diff -u -d -r1.1.1.3 -r1.2
--- Makefile.am 21 Apr 2003 18:30:52 -0000 1.1.1.3
+++ Makefile.am 22 Apr 2003 18:56:56 -0000 1.2
@@ -21,7 +21,6 @@
cln_hist \
commit_prep \
cvs2vendor \
- cvs_acls \
cvscheck \
debug_check_log \
log \
@@ -62,8 +61,6 @@
# we'd rather have a link here rather than two copies of a script
install-data-local:
- : FIXME - this path should be determined dynamically from bindir
- : and contribdir
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_LINKS)'; for p in $$list; do \
Index: Makefile.in
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/contrib/Makefile.in,v
retrieving revision 1.1.1.6
retrieving revision 1.2
diff -u -d -r1.1.1.6 -r1.2
--- Makefile.in 21 Apr 2003 18:30:52 -0000 1.1.1.6
+++ Makefile.in 22 Apr 2003 18:56:57 -0000 1.2
@@ -1,7 +1,6 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
-# @configure_input@
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -27,6 +26,7 @@
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
+
SHELL = @SHELL@
srcdir = @srcdir@
@@ -57,13 +57,9 @@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
@@ -73,31 +69,34 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
AMTAR = @AMTAR@
AWK = @AWK@
CC = @CC@
+CPP = @CPP@
CSH = @CSH@
DEPDIR = @DEPDIR@
EDITOR = @EDITOR@
+EXEEXT = @EXEEXT@
+EXPR = @EXPR@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KRB4 = @KRB4@
LN_S = @LN_S@
+M4 = @M4@
+MAINT = @MAINT@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PERL = @PERL@
PR = @PR@
PS2PDF = @PS2PDF@
RANLIB = @RANLIB@
ROFF = @ROFF@
-STRIP = @STRIP@
TEXI2DVI = @TEXI2DVI@
+U = @U@
VERSION = @VERSION@
YACC = @YACC@
am__include = @am__include@
am__quote = @am__quote@
+client_objects = @client_objects@
includeopt = @includeopt@
install_sh = @install_sh@
@@ -109,7 +108,6 @@
cln_hist \
commit_prep \
cvs2vendor \
- cvs_acls \
cvscheck \
debug_check_log \
log \
@@ -171,63 +169,65 @@
.SUFFIXES:
.SUFFIXES: .sh
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu contrib/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && \
+ CONFIG_HEADERS= CONFIG_LINKS= \
+ CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
check_cvs: $(top_builddir)/config.status check_cvs.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
clmerge: $(top_builddir)/config.status clmerge.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
cln_hist: $(top_builddir)/config.status cln_hist.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
commit_prep: $(top_builddir)/config.status commit_prep.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
cvs_acls: $(top_builddir)/config.status cvs_acls.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
log: $(top_builddir)/config.status log.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
log_accum: $(top_builddir)/config.status log_accum.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
mfpipe: $(top_builddir)/config.status mfpipe.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
pvcs2rcs: $(top_builddir)/config.status pvcs2rcs.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
rcslock: $(top_builddir)/config.status rcslock.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
sccs2rcs: $(top_builddir)/config.status sccs2rcs.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-contribSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
install-contribSCRIPTS: $(contrib_SCRIPTS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(contribdir)
@list='$(contrib_SCRIPTS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- if test -f $$d$$p; then \
- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
- echo " $(contribSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(contribdir)/$$f"; \
- $(contribSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(contribdir)/$$f; \
+ f="`echo $$p|sed '$(transform)'`"; \
+ if test -f $$p; then \
+ echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(contribdir)/$$f"; \
+ $(INSTALL_SCRIPT) $$p $(DESTDIR)$(contribdir)/$$f; \
+ elif test -f $(srcdir)/$$p; then \
+ echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(contribdir)/$$f"; \
+ $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(contribdir)/$$f; \
else :; fi; \
done
uninstall-contribSCRIPTS:
@$(NORMAL_UNINSTALL)
@list='$(contrib_SCRIPTS)'; for p in $$list; do \
- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ f="`echo $$p|sed '$(transform)'`"; \
echo " rm -f $(DESTDIR)$(contribdir)/$$f"; \
rm -f $(DESTDIR)$(contribdir)/$$f; \
done
uninstall-info-am:
-contribDATA_INSTALL = $(INSTALL_DATA)
install-contribDATA: $(contrib_DATA)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(contribdir)
@list='$(contrib_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(contribDATA_INSTALL) $$d$$p $(DESTDIR)$(contribdir)/$$f"; \
- $(contribDATA_INSTALL) $$d$$p $(DESTDIR)$(contribdir)/$$f; \
+ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(contribdir)/$$f"; \
+ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(contribdir)/$$f; \
done
uninstall-contribDATA:
@@ -240,26 +240,22 @@
tags: TAGS
TAGS:
+
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ @for file in $(DISTFILES); do \
+ if test -f $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
+ $(mkinstalldirs) "$(distdir)/$$dir"; \
fi; \
if test -d $$d/$$file; then \
- 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; \
+ cp -pR $$d/$$file $(distdir) \
+ || exit 1; \
else \
test -f $(distdir)/$$file \
|| cp -p $$d/$$file $(distdir)/$$file \
@@ -284,7 +280,6 @@
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:
@@ -293,7 +288,7 @@
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -350,8 +345,6 @@
# we'd rather have a link here rather than two copies of a script
install-data-local:
- : FIXME - this path should be determined dynamically from bindir
- : and contribdir
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_LINKS)'; for p in $$list; do \
Index: cvscheck.sh
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/contrib/cvscheck.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- cvscheck.sh 2 Jan 2000 17:12:29 -0000 1.1.1.1
+++ cvscheck.sh 22 Apr 2003 18:56:57 -0000 1.2
@@ -43,7 +43,7 @@
fi
# Else if a directory
- elif [ -d $file -a $file != CVS.adm ] ; then
+ elif [ -d $file -a $file != CVS ] ; then
# Move into it
cd $file
|
|
From: Alexey M. <ty...@us...> - 2003-04-22 18:57:03
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src
In directory sc8-pr-cvs1:/tmp/cvs-serv14789/src
Modified Files:
cvspasswd-file.c passwd.c
Log Message:
Merged NCLI-1-11-1 code w/ CVS 1.11.5
Index: cvspasswd-file.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/cvspasswd-file.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cvspasswd-file.c 21 Apr 2003 20:16:34 -0000 1.2
+++ cvspasswd-file.c 22 Apr 2003 18:56:58 -0000 1.3
@@ -64,6 +64,7 @@
{
char *passwd_line = NULL;
size_t passwd_line_allocated = 0;
+ char* result = NULL;
while (getline(&passwd_line, &passwd_line_allocated, cvspasswd) != -1)
{
@@ -94,6 +95,7 @@
break;
case find_action_remove:
+ result = "remove succeeded";
break;
case find_action_return:
@@ -114,5 +116,5 @@
}
if (passwd_line_allocated)
free(passwd_line);
- return NULL;
+ return result;
}
Index: passwd.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/passwd.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- passwd.c 21 Apr 2003 20:16:38 -0000 1.2
+++ passwd.c 22 Apr 2003 18:56:58 -0000 1.3
@@ -232,8 +232,8 @@
FILE *cvspasswd;
FILE *tmpcvspasswd;
{
- int result;
- result = (int) find_user(cvspasswd, tmpcvspasswd, user.name, find_action_remove);
+ char* result;
+ result = find_user(cvspasswd, tmpcvspasswd, user.name, find_action_remove);
if (!result)
error(1, 0, "User %s not found", user.name);
return 1;
|
Update of /cvsroot/cvs-nserver/cvs-nserver/www
In directory sc8-pr-cvs1:/tmp/cvs-serv14789/www
Modified Files:
Tag: NCLI-1-11-1
acl-cli.txt acl-rfc.txt
Added Files:
.cvsignore BRANCHES Makefile index.html logging-rfc.txt
ncli-architecture.txt
Log Message:
Merged NCLI-1-11-1 code w/ CVS 1.11.5
Index: acl-cli.txt
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/www/Attic/acl-cli.txt,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- acl-cli.txt 14 Apr 2002 19:12:13 -0000 1.1.2.4
+++ acl-cli.txt 22 Apr 2003 18:56:59 -0000 1.1.2.5
@@ -140,7 +140,7 @@
Notes:
-Please not that "recursive" operations are not implemented, and that's
+Please note that "recursive" operations are not implemented, and that's
intentionally. Use default file operations instead. Remember that
directory permissions are checked from the top.
Index: acl-rfc.txt
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/www/Attic/acl-rfc.txt,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- acl-rfc.txt 31 Mar 2002 18:22:13 -0000 1.1.2.7
+++ acl-rfc.txt 22 Apr 2003 18:56:59 -0000 1.1.2.8
@@ -17,14 +17,6 @@
Primary Authorization Features
===============================
-The concept of "no ACL" is used a lot, and this could sometimes lead
-to (unexpected) opening of repository to extemely wide access. In
-short, when the ACL file is non-existent or becomes empty after
-revoking all privileges granted, the "default ACLs" come into play.
-Default ACLs simply allow everything. Maybe we need some flag file in
-the repository that means "default ACLs is deny everyone".
-
-
We need the following basic authorization features:
- the ACLs are assigned on per-file-on-branch, not on per-file basis.
|
|
From: Alexey M. <ty...@us...> - 2003-04-22 18:57:03
|
Update of /cvsroot/cvs-nserver/cvs-nserver/windows-NT
In directory sc8-pr-cvs1:/tmp/cvs-serv14789/windows-NT
Modified Files:
Makefile.in
Log Message:
Merged NCLI-1-11-1 code w/ CVS 1.11.5
Index: Makefile.in
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/windows-NT/Makefile.in,v
retrieving revision 1.1.1.4
retrieving revision 1.2
diff -u -d -r1.1.1.4 -r1.2
--- Makefile.in 21 Apr 2003 18:31:16 -0000 1.1.1.4
+++ Makefile.in 22 Apr 2003 18:56:58 -0000 1.2
@@ -1,7 +1,6 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
-# @configure_input@
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -30,6 +29,7 @@
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
+
SHELL = @SHELL@
srcdir = @srcdir@
@@ -60,13 +60,9 @@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
@@ -76,31 +72,34 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
AMTAR = @AMTAR@
AWK = @AWK@
CC = @CC@
+CPP = @CPP@
CSH = @CSH@
DEPDIR = @DEPDIR@
EDITOR = @EDITOR@
+EXEEXT = @EXEEXT@
+EXPR = @EXPR@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KRB4 = @KRB4@
LN_S = @LN_S@
+M4 = @M4@
+MAINT = @MAINT@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PERL = @PERL@
PR = @PR@
PS2PDF = @PS2PDF@
RANLIB = @RANLIB@
ROFF = @ROFF@
-STRIP = @STRIP@
TEXI2DVI = @TEXI2DVI@
+U = @U@
VERSION = @VERSION@
YACC = @YACC@
am__include = @am__include@
am__quote = @am__quote@
+client_objects = @client_objects@
includeopt = @includeopt@
install_sh = @install_sh@
@@ -139,11 +138,13 @@
all: all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu windows-NT/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && \
+ CONFIG_HEADERS= CONFIG_LINKS= \
+ CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
uninstall-info-am:
# This directory's subdirectories are mostly independent; you can cd
@@ -153,7 +154,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -173,7 +174,7 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -201,19 +202,16 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
-ETAGS = etags
-ETAGSFLAGS =
-
tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ list='$(SOURCES) $(HEADERS) $(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
+ mkid -fID $$unique $(LISP)
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -224,50 +222,45 @@
test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
fi; \
done; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ list='$(SOURCES) $(HEADERS) $(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)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
+ here=`CDPATH=: && cd $(top_builddir) && pwd` \
&& cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ @for file in $(DISTFILES); do \
+ if test -f $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
+ $(mkinstalldirs) "$(distdir)/$$dir"; \
fi; \
if test -d $$d/$$file; then \
- 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; \
+ cp -pR $$d/$$file $(distdir) \
+ || exit 1; \
else \
test -f $(distdir)/$$file \
|| cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ for subdir in $(SUBDIRS); do \
if test "$$subdir" = .; then :; else \
test -d $(distdir)/$$subdir \
|| mkdir $(distdir)/$$subdir \
@@ -297,7 +290,6 @@
installcheck: installcheck-recursive
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:
@@ -305,7 +297,7 @@
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
|
|
From: Alexey M. <ty...@us...> - 2003-04-22 18:57:03
|
Update of /cvsroot/cvs-nserver/cvs-nserver/windows-NT/SCC
In directory sc8-pr-cvs1:/tmp/cvs-serv14789/windows-NT/SCC
Modified Files:
Makefile.in
Log Message:
Merged NCLI-1-11-1 code w/ CVS 1.11.5
Index: Makefile.in
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/windows-NT/SCC/Makefile.in,v
retrieving revision 1.1.1.5
retrieving revision 1.2
diff -u -d -r1.1.1.5 -r1.2
--- Makefile.in 21 Apr 2003 18:31:17 -0000 1.1.1.5
+++ Makefile.in 22 Apr 2003 18:56:58 -0000 1.2
@@ -1,7 +1,6 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
-# @configure_input@
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -30,6 +29,7 @@
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
+
SHELL = @SHELL@
srcdir = @srcdir@
@@ -60,13 +60,9 @@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
@@ -76,31 +72,34 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
AMTAR = @AMTAR@
AWK = @AWK@
CC = @CC@
+CPP = @CPP@
CSH = @CSH@
DEPDIR = @DEPDIR@
EDITOR = @EDITOR@
+EXEEXT = @EXEEXT@
+EXPR = @EXPR@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KRB4 = @KRB4@
LN_S = @LN_S@
+M4 = @M4@
+MAINT = @MAINT@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PERL = @PERL@
PR = @PR@
PS2PDF = @PS2PDF@
RANLIB = @RANLIB@
ROFF = @ROFF@
-STRIP = @STRIP@
TEXI2DVI = @TEXI2DVI@
+U = @U@
VERSION = @VERSION@
YACC = @YACC@
am__include = @am__include@
am__quote = @am__quote@
+client_objects = @client_objects@
includeopt = @includeopt@
install_sh = @install_sh@
@@ -122,35 +121,33 @@
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu windows-NT/SCC/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && \
+ CONFIG_HEADERS= CONFIG_LINKS= \
+ CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
uninstall-info-am:
tags: TAGS
TAGS:
+
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = ../..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ @for file in $(DISTFILES); do \
+ if test -f $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
+ $(mkinstalldirs) "$(distdir)/$$dir"; \
fi; \
if test -d $$d/$$file; then \
- 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; \
+ cp -pR $$d/$$file $(distdir) \
+ || exit 1; \
else \
test -f $(distdir)/$$file \
|| cp -p $$d/$$file $(distdir)/$$file \
@@ -174,7 +171,6 @@
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:
@@ -182,7 +178,7 @@
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
|
|
From: Alexey M. <ty...@us...> - 2003-04-21 21:46:21
|
Update of /cvsroot/cvs-nserver/cvs-nserver/tools
In directory sc8-pr-cvs1:/tmp/cvs-serv13347
Modified Files:
Makefile.in
Log Message:
Merged NCLI-1-11-1 code w/ CVS 1.11.5
Index: Makefile.in
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/tools/Makefile.in,v
retrieving revision 1.1.1.4
retrieving revision 1.2
diff -u -d -r1.1.1.4 -r1.2
--- Makefile.in 21 Apr 2003 18:31:16 -0000 1.1.1.4
+++ Makefile.in 21 Apr 2003 21:46:17 -0000 1.2
@@ -1,7 +1,6 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
-# @configure_input@
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -27,6 +26,7 @@
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
+
SHELL = @SHELL@
srcdir = @srcdir@
@@ -57,13 +57,9 @@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
@@ -73,31 +69,34 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
AMTAR = @AMTAR@
AWK = @AWK@
CC = @CC@
+CPP = @CPP@
CSH = @CSH@
DEPDIR = @DEPDIR@
EDITOR = @EDITOR@
+EXEEXT = @EXEEXT@
+EXPR = @EXPR@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KRB4 = @KRB4@
LN_S = @LN_S@
+M4 = @M4@
+MAINT = @MAINT@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PERL = @PERL@
PR = @PR@
PS2PDF = @PS2PDF@
RANLIB = @RANLIB@
ROFF = @ROFF@
-STRIP = @STRIP@
TEXI2DVI = @TEXI2DVI@
+U = @U@
VERSION = @VERSION@
YACC = @YACC@
am__include = @am__include@
am__quote = @am__quote@
+client_objects = @client_objects@
includeopt = @includeopt@
install_sh = @install_sh@
@@ -113,35 +112,33 @@
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu tools/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && \
+ CONFIG_HEADERS= CONFIG_LINKS= \
+ CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
uninstall-info-am:
tags: TAGS
TAGS:
+
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ @for file in $(DISTFILES); do \
+ if test -f $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
+ $(mkinstalldirs) "$(distdir)/$$dir"; \
fi; \
if test -d $$d/$$file; then \
- 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; \
+ cp -pR $$d/$$file $(distdir) \
+ || exit 1; \
else \
test -f $(distdir)/$$file \
|| cp -p $$d/$$file $(distdir)/$$file \
@@ -165,7 +162,6 @@
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:
@@ -173,7 +169,7 @@
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
|
|
From: Alexey M. <ty...@us...> - 2003-04-21 21:45:49
|
Update of /cvsroot/cvs-nserver/cvs-nserver/emx In directory sc8-pr-cvs1:/tmp/cvs-serv13110 Modified Files: config.h Log Message: Merged NCLI-1-11-1 code w/ CVS 1.11.5 Index: config.h =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/emx/config.h,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -d -r1.1.1.2 -r1.2 --- config.h 21 Apr 2003 18:30:52 -0000 1.1.1.2 +++ config.h 21 Apr 2003 21:45:45 -0000 1.2 @@ -260,8 +260,6 @@ /* This is where old bits go to die under OS/2 as well as WinNT. */ #define DEVNULL "nul" -/* We actually do have a transparent rsh, whew. */ -#undef RSH_NOT_TRANSPARENT /* But it won't be transparent unless we ask it nicely! */ #define RSH_NEEDS_BINARY_FLAG 1 @@ -299,18 +297,6 @@ /* Pipes need to be put into binary mode using setmode (). */ #define USE_SETMODE_BINARY 1 - -/* The reason for this is that we don't know whether to pass -b to - rsh. The system-supplied rsh on OS/2 wants it. Some other rsh - replacement might not accept it. Historically, the NT port of CVS - has not passed -b, and the OS/2 port has. What a mess. If we can - get away with just not accepting :ext: until we can figure out how - we should deal with this, then it will avoid having people rely on - behaviors which will need to change. */ -#define NO_EXT_METHOD 1 - -/* See above; we can't use rsh without -b. */ -#define RSH_NOT_TRANSPARENT 1 /* See discussion at xchmod in filesubr.c. */ #define CHMOD_BROKEN 1 |
|
From: Alexey M. <ty...@us...> - 2003-04-21 21:45:05
|
Update of /cvsroot/cvs-nserver/cvs-nserver/scripts In directory sc8-pr-cvs1:/tmp/cvs-serv12788 Added Files: Makefile.am Makefile.in init-cvs-repository.sh init-nval-tags.pl Log Message: Merged NCLI-1-11-1 code w/ CVS 1.11.5 |
|
From: Alexey M. <ty...@us...> - 2003-04-21 20:31:39
|
Update of /cvsroot/cvs-nserver/cvs-nserver/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv31333/tests
Modified Files:
Tag: NCLI-1-11-1
Makefile.am Makefile.in
Added Files:
.cvsignore acl.at atconfig.in atlocal.in atspecific.m4
basic.at package.m4.in racl.at testsuite testsuite.at
wrapsh.in
Log Message:
Merged NCLI-1-11-1 code w/ CVS 1.11.5
Index: Makefile.am
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/tests/Attic/Makefile.am,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- Makefile.am 16 Nov 2001 00:06:39 -0000 1.1.2.5
+++ Makefile.am 21 Apr 2003 20:31:03 -0000 1.1.2.6
@@ -15,5 +15,5 @@
atlocal: $(srcdir)/atlocal.in $(top_builddir)/config.status
cd $(top_builddir) && \
- $(SHELL) ./config.status $(subdir)/$@
+ $(SHELL) ./config.status $@
Index: Makefile.in
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/tests/Attic/Makefile.in,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- Makefile.in 9 Feb 2002 20:03:18 -0000 1.1.2.7
+++ Makefile.in 21 Apr 2003 20:31:03 -0000 1.1.2.8
@@ -61,6 +61,7 @@
CPP = @CPP@
CSH = @CSH@
DEPDIR = @DEPDIR@
+EDITOR = @EDITOR@
EXEEXT = @EXEEXT@
EXPR = @EXPR@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -82,11 +83,8 @@
am__include = @am__include@
am__quote = @am__quote@
client_objects = @client_objects@
-enable_setuid = @enable_setuid@
includeopt = @includeopt@
install_sh = @install_sh@
-setuid_group = @setuid_group@
-setuid_user = @setuid_user@
TESTSUITE = $(srcdir)/testsuite
TESTSUITE_AT = $(srcdir)/basic.at $(srcdir)/acl.at $(srcdir)/racl.at
@@ -97,7 +95,7 @@
AUTOTEST = $(AUTOM4TE) --language=autotest
subdir = tests
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/src/options.h
+CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = atconfig package.m4 cvs
DIST_SOURCES =
DIST_COMMON = Makefile.am Makefile.in atconfig.in package.m4.in \
@@ -227,7 +225,7 @@
atlocal: $(srcdir)/atlocal.in $(top_builddir)/config.status
cd $(top_builddir) && \
- $(SHELL) ./config.status $(subdir)/$@
+ $(SHELL) ./config.status $@
# 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.
.NOEXPORT:
|
|
From: Alexey M. <ty...@us...> - 2003-04-21 20:31:13
|
Update of /cvsroot/cvs-nserver/cvs-nserver/man
In directory sc8-pr-cvs1:/tmp/cvs-serv31333/man
Modified Files:
.cvsignore Makefile.am Makefile.in cvs.1
Added Files:
cvs-server.8
Log Message:
Merged NCLI-1-11-1 code w/ CVS 1.11.5
Index: .cvsignore
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/man/.cvsignore,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- .cvsignore 2 Jan 2000 17:12:29 -0000 1.1.1.1
+++ .cvsignore 21 Apr 2003 20:31:06 -0000 1.2
@@ -1 +1,3 @@
Makefile
+cvs-nserver.8
+cvs-pserver.8
Index: Makefile.am
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/man/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Makefile.am 19 May 2001 12:05:16 -0000 1.1.1.1
+++ Makefile.am 21 Apr 2003 20:31:06 -0000 1.2
@@ -12,10 +12,18 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-man_MANS = cvs.1 cvs.5 cvsbug.8
+man_MANS = cvs.1 cvs.5 cvsbug.8 cvs-nserver.8 cvs-pserver.8 cvs-server.8
EXTRA_DIST = \
.cvsignore \
$(man_MANS)
+
+CLEANFILES = cvs-nserver.8 cvs-pserver.8
+
+cvs-nserver.8: cvs-server.8
+ echo .so man8/$^ > $@
+
+cvs-pserver.8: cvs-server.8
+ echo .so man8/$^ > $@
# for backwards compatibility with the old makefiles
realclean: maintainer-clean
Index: Makefile.in
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/man/Makefile.in,v
retrieving revision 1.1.1.6
retrieving revision 1.2
diff -u -d -r1.1.1.6 -r1.2
--- Makefile.in 21 Apr 2003 18:31:10 -0000 1.1.1.6
+++ Makefile.in 21 Apr 2003 20:31:06 -0000 1.2
@@ -1,7 +1,6 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
-# @configure_input@
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -26,6 +25,7 @@
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
+
SHELL = @SHELL@
srcdir = @srcdir@
@@ -56,13 +56,9 @@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
@@ -72,39 +68,44 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
AMTAR = @AMTAR@
AWK = @AWK@
CC = @CC@
+CPP = @CPP@
CSH = @CSH@
DEPDIR = @DEPDIR@
EDITOR = @EDITOR@
+EXEEXT = @EXEEXT@
+EXPR = @EXPR@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KRB4 = @KRB4@
LN_S = @LN_S@
+M4 = @M4@
+MAINT = @MAINT@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PERL = @PERL@
PR = @PR@
PS2PDF = @PS2PDF@
RANLIB = @RANLIB@
ROFF = @ROFF@
-STRIP = @STRIP@
TEXI2DVI = @TEXI2DVI@
+U = @U@
VERSION = @VERSION@
YACC = @YACC@
am__include = @am__include@
am__quote = @am__quote@
+client_objects = @client_objects@
includeopt = @includeopt@
install_sh = @install_sh@
-man_MANS = cvs.1 cvs.5 cvsbug.8
+man_MANS = cvs.1 cvs.5 cvsbug.8 cvs-nserver.8 cvs-pserver.8 cvs-server.8
EXTRA_DIST = \
.cvsignore \
$(man_MANS)
+
+CLEANFILES = cvs-nserver.8 cvs-pserver.8
subdir = man
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
@@ -117,11 +118,13 @@
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu man/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && \
+ CONFIG_HEADERS= CONFIG_LINKS= \
+ CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
uninstall-info-am:
man1dir = $(mandir)/man1
@@ -139,10 +142,6 @@
if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
else file=$$i; fi; \
ext=`echo $$i | sed -e 's/^.*\\.//'`; \
- case "$$ext" in \
- 1*) ;; \
- *) ext='1' ;; \
- esac; \
inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
inst=`echo $$inst | sed -e 's/^.*\///'`; \
inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -182,10 +181,6 @@
if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
else file=$$i; fi; \
ext=`echo $$i | sed -e 's/^.*\\.//'`; \
- case "$$ext" in \
- 5*) ;; \
- *) ext='5' ;; \
- esac; \
inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
inst=`echo $$inst | sed -e 's/^.*\///'`; \
inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -225,10 +220,6 @@
if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
else file=$$i; fi; \
ext=`echo $$i | sed -e 's/^.*\\.//'`; \
- case "$$ext" in \
- 8*) ;; \
- *) ext='8' ;; \
- esac; \
inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
inst=`echo $$inst | sed -e 's/^.*\///'`; \
inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -255,26 +246,22 @@
tags: TAGS
TAGS:
+
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ @for file in $(DISTFILES); do \
+ if test -f $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
+ $(mkinstalldirs) "$(distdir)/$$dir"; \
fi; \
if test -d $$d/$$file; then \
- 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; \
+ cp -pR $$d/$$file $(distdir) \
+ || exit 1; \
else \
test -f $(distdir)/$$file \
|| cp -p $$d/$$file $(distdir)/$$file \
@@ -299,15 +286,15 @@
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:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -360,6 +347,12 @@
uninstall uninstall-am uninstall-info-am uninstall-man \
uninstall-man1 uninstall-man5 uninstall-man8
+
+cvs-nserver.8: cvs-server.8
+ echo .so man8/$^ > $@
+
+cvs-pserver.8: cvs-server.8
+ echo .so man8/$^ > $@
# for backwards compatibility with the old makefiles
realclean: maintainer-clean
Index: cvs.1
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/man/cvs.1,v
retrieving revision 1.1.1.4
retrieving revision 1.2
diff -u -d -r1.1.1.4 -r1.2
--- cvs.1 21 Apr 2003 18:23:41 -0000 1.1.1.4
+++ cvs.1 21 Apr 2003 20:31:06 -0000 1.2
@@ -2138,6 +2138,8 @@
.BR co ( 1 ),
.BR cvs ( 5 ),
.BR cvsbug ( 8 ),
+.BR cvs-nserver ( 8 ),
+.BR cvs-pserver ( 8 ),
.BR diff ( 1 ),
.BR grep ( 1 ),
.BR patch ( 1 ),
|
|
From: Alexey M. <ty...@us...> - 2003-04-21 20:31:11
|
Update of /cvsroot/cvs-nserver/cvs-nserver/vms
In directory sc8-pr-cvs1:/tmp/cvs-serv31333/vms
Modified Files:
Makefile.in
Added Files:
.cvsignore
Log Message:
Merged NCLI-1-11-1 code w/ CVS 1.11.5
Index: Makefile.in
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/vms/Makefile.in,v
retrieving revision 1.1.1.4
retrieving revision 1.2
diff -u -d -r1.1.1.4 -r1.2
--- Makefile.in 21 Apr 2003 18:31:17 -0000 1.1.1.4
+++ Makefile.in 21 Apr 2003 20:31:05 -0000 1.2
@@ -1,7 +1,6 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
-# @configure_input@
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -30,6 +29,7 @@
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
+
SHELL = @SHELL@
srcdir = @srcdir@
@@ -60,13 +60,9 @@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
@@ -76,31 +72,34 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
AMTAR = @AMTAR@
AWK = @AWK@
CC = @CC@
+CPP = @CPP@
CSH = @CSH@
DEPDIR = @DEPDIR@
EDITOR = @EDITOR@
+EXEEXT = @EXEEXT@
+EXPR = @EXPR@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KRB4 = @KRB4@
LN_S = @LN_S@
+M4 = @M4@
+MAINT = @MAINT@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PERL = @PERL@
PR = @PR@
PS2PDF = @PS2PDF@
RANLIB = @RANLIB@
ROFF = @ROFF@
-STRIP = @STRIP@
TEXI2DVI = @TEXI2DVI@
+U = @U@
VERSION = @VERSION@
YACC = @YACC@
am__include = @am__include@
am__quote = @am__quote@
+client_objects = @client_objects@
includeopt = @includeopt@
install_sh = @install_sh@
@@ -149,35 +148,33 @@
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu vms/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && \
+ CONFIG_HEADERS= CONFIG_LINKS= \
+ CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
uninstall-info-am:
tags: TAGS
TAGS:
+
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ @for file in $(DISTFILES); do \
+ if test -f $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
+ $(mkinstalldirs) "$(distdir)/$$dir"; \
fi; \
if test -d $$d/$$file; then \
- 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; \
+ cp -pR $$d/$$file $(distdir) \
+ || exit 1; \
else \
test -f $(distdir)/$$file \
|| cp -p $$d/$$file $(distdir)/$$file \
@@ -201,7 +198,6 @@
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:
@@ -209,7 +205,7 @@
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
|
|
From: Alexey M. <ty...@us...> - 2003-04-21 20:29:51
|
Update of /cvsroot/cvs-nserver/cvs-nserver/diff
In directory sc8-pr-cvs1:/tmp/cvs-serv29706/diff
Modified Files:
.cvsignore Makefile.in
Log Message:
Merged NCLI-1-11-1 code w/ CVS 1.11.5
Index: .cvsignore
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/diff/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- .cvsignore 2 Jan 2000 17:13:11 -0000 1.1
+++ .cvsignore 21 Apr 2003 20:29:15 -0000 1.2
@@ -1,3 +1,2 @@
+.deps
Makefile
-Debug
-Release
Index: Makefile.in
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/diff/Makefile.in,v
retrieving revision 1.1.1.6
retrieving revision 1.2
diff -u -d -r1.1.1.6 -r1.2
--- Makefile.in 21 Apr 2003 18:31:09 -0000 1.1.1.6
+++ Makefile.in 21 Apr 2003 20:29:16 -0000 1.2
@@ -1,7 +1,6 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
-# @configure_input@
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -13,6 +12,7 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
+
SHELL = @SHELL@
srcdir = @srcdir@
@@ -43,13 +43,9 @@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
@@ -59,31 +55,34 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
AMTAR = @AMTAR@
AWK = @AWK@
CC = @CC@
+CPP = @CPP@
CSH = @CSH@
DEPDIR = @DEPDIR@
EDITOR = @EDITOR@
+EXEEXT = @EXEEXT@
+EXPR = @EXPR@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KRB4 = @KRB4@
LN_S = @LN_S@
+M4 = @M4@
+MAINT = @MAINT@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PERL = @PERL@
PR = @PR@
PS2PDF = @PS2PDF@
RANLIB = @RANLIB@
ROFF = @ROFF@
-STRIP = @STRIP@
TEXI2DVI = @TEXI2DVI@
+U = @U@
VERSION = @VERSION@
YACC = @YACC@
am__include = @am__include@
am__quote = @am__quote@
+client_objects = @client_objects@
includeopt = @includeopt@
install_sh = @install_sh@
@@ -117,14 +116,12 @@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/analyze.Po ./$(DEPDIR)/cmpbuf.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/context.Po ./$(DEPDIR)/diff.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/diff3.Po ./$(DEPDIR)/dir.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/ed.Po ./$(DEPDIR)/ifdef.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/io.Po ./$(DEPDIR)/normal.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/side.Po ./$(DEPDIR)/util.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/version.Po
+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/analyze.Po $(DEPDIR)/cmpbuf.Po \
+@AMDEP_TRUE@ $(DEPDIR)/context.Po $(DEPDIR)/diff.Po \
+@AMDEP_TRUE@ $(DEPDIR)/diff3.Po $(DEPDIR)/dir.Po $(DEPDIR)/ed.Po \
+@AMDEP_TRUE@ $(DEPDIR)/ifdef.Po $(DEPDIR)/io.Po \
+@AMDEP_TRUE@ $(DEPDIR)/normal.Po $(DEPDIR)/side.Po \
+@AMDEP_TRUE@ $(DEPDIR)/util.Po $(DEPDIR)/version.Po
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
@@ -138,11 +135,13 @@
.SUFFIXES:
.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu diff/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && \
+ CONFIG_HEADERS= CONFIG_LINKS= \
+ CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
AR = ar
@@ -159,28 +158,28 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/analyze.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmpbuf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/context.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diff.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diff3.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dir.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ed.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ifdef.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/io.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/normal.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/side.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/analyze.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/cmpbuf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/context.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/diff.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/diff3.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dir.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ed.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ifdef.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/io.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/normal.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/side.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/util.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/version.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)/'`$<
+ $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
.c.obj:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -190,61 +189,53 @@
CCDEPMODE = @CCDEPMODE@
uninstall-info-am:
-ETAGS = etags
-ETAGSFLAGS =
-
tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ list='$(SOURCES) $(HEADERS) $(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
+ mkid -fID $$unique $(LISP)
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ list='$(SOURCES) $(HEADERS) $(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)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
+ here=`CDPATH=: && cd $(top_builddir) && pwd` \
&& cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ @for file in $(DISTFILES); do \
+ if test -f $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
+ $(mkinstalldirs) "$(distdir)/$$dir"; \
fi; \
if test -d $$d/$$file; then \
- 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; \
+ cp -pR $$d/$$file $(distdir) \
+ || exit 1; \
else \
test -f $(distdir)/$$file \
|| cp -p $$d/$$file $(distdir)/$$file \
@@ -268,7 +259,6 @@
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:
@@ -276,7 +266,7 @@
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
|
Update of /cvsroot/cvs-nserver/cvs-nserver/lib In directory sc8-pr-cvs1:/tmp/cvs-serv29706/lib Modified Files: Makefile.am Makefile.in getopt.h Added Files: ansi2knr.1 ansi2knr.c check_stringbuf.c snprintf.c stringbuf.c stringbuf.h Log Message: Merged NCLI-1-11-1 code w/ CVS 1.11.5 Index: Makefile.am =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/lib/Makefile.am,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -d -r1.1.1.2 -r1.2 --- Makefile.am 21 Apr 2003 18:31:07 -0000 1.1.1.2 +++ Makefile.am 21 Apr 2003 20:29:11 -0000 1.2 @@ -57,25 +57,11 @@ md5.h \ regex.h \ savecwd.h \ + stringbuf.h stringbuf.c \ system.h \ wait.h \ xselect.h \ xtime.h -## because @LIBOBJS@ is included below, automake automatically knows about -## dup2.c -## fncase.c -## fnmatch.c -## fnmatch.h -## ftruncate.c -## gethostname.c -## memmove.c -## mkdir.c -## rename.c -## strstr.c -## strerror.c -## strtoul.c -## valloc.c -## waitpid.c libcvs_a_LIBADD = @LIBOBJS@ EXTRA_DIST = \ @@ -83,6 +69,12 @@ ChangeLog.fsf \ build_lib.com \ xgssapi.h + +TESTS = check_stringbuf + +noinst_PROGRAMS = check_stringbuf + +check_stringbuf_SOURCES = check_stringbuf.c stringbuf.h stringbuf.c # for backwards compatibility with the old makefiles realclean: maintainer-clean Index: Makefile.in =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/lib/Makefile.in,v retrieving revision 1.1.1.6 retrieving revision 1.2 diff -u -d -r1.1.1.6 -r1.2 --- Makefile.in 21 Apr 2003 18:31:07 -0000 1.1.1.6 +++ Makefile.in 21 Apr 2003 20:29:11 -0000 1.2 @@ -1,7 +1,6 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. -# @configure_input@ +# Makefile.in generated automatically by automake 1.5 from Makefile.am. -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -26,6 +25,20 @@ # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. + +# For now we need to include $(top_srcdir)/src because some systems +# (at least 'AIX rioscpu2 3 4 000030498200', +# 'HP-UX hp60 B.10.20 A 9000/770 hp60 two-user license', & +# 'IRIX64 sgiop110 6.5 07151433 IP30') have trouble finding error.h +# when compiling savecwd.c +# +# FIXME - the fact that compiling on my Linux 2.2.16 system finds +# /usr/include/error.h instead of $(top_srcdir)/src/error.h but +# everything compiles and tests anyhow implies that src/error.h may +# be unecessary now. Should look more deeply into this +# +# $(includeopt) is CVS specific and set by configure + SHELL = @SHELL@ srcdir = @srcdir@ @@ -56,13 +69,9 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -72,46 +81,37 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - -EXEEXT = @EXEEXT@ -OBJEXT = @OBJEXT@ -PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ AWK = @AWK@ CC = @CC@ +CPP = @CPP@ CSH = @CSH@ DEPDIR = @DEPDIR@ EDITOR = @EDITOR@ +EXEEXT = @EXEEXT@ +EXPR = @EXPR@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KRB4 = @KRB4@ LN_S = @LN_S@ +M4 = @M4@ +MAINT = @MAINT@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ PR = @PR@ PS2PDF = @PS2PDF@ RANLIB = @RANLIB@ ROFF = @ROFF@ -STRIP = @STRIP@ TEXI2DVI = @TEXI2DVI@ +U = @U@ VERSION = @VERSION@ YACC = @YACC@ am__include = @am__include@ am__quote = @am__quote@ +client_objects = @client_objects@ includeopt = @includeopt@ install_sh = @install_sh@ -# For now we need to include $(top_srcdir)/src because some systems -# (at least 'AIX rioscpu2 3 4 000030498200', -# 'HP-UX hp60 B.10.20 A 9000/770 hp60 two-user license', & -# 'IRIX64 sgiop110 6.5 07151433 IP30') have trouble finding error.h -# when compiling savecwd.c -# -# FIXME - the fact that compiling on my Linux 2.2.16 system finds -# /usr/include/error.h instead of $(top_srcdir)/src/error.h but -# everything compiles and tests anyhow implies that src/error.h may -# be unecessary now. Should look more deeply into this -# -# $(includeopt) is CVS specific and set by configure INCLUDES = -I$(top_srcdir)/src $(includeopt) noinst_LIBRARIES = libcvs.a @@ -145,6 +145,7 @@ md5.h \ regex.h \ savecwd.h \ + stringbuf.h stringbuf.c \ system.h \ wait.h \ xselect.h \ @@ -158,6 +159,12 @@ build_lib.com \ xgssapi.h + +TESTS = check_stringbuf + +noinst_PROGRAMS = check_stringbuf + +check_stringbuf_SOURCES = check_stringbuf.c stringbuf.h stringbuf.c subdir = lib mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h @@ -170,8 +177,17 @@ getline.$(OBJEXT) getopt.$(OBJEXT) getopt1.$(OBJEXT) \ md5.$(OBJEXT) regex.$(OBJEXT) savecwd.$(OBJEXT) \ sighandle.$(OBJEXT) stripslash.$(OBJEXT) xgetwd.$(OBJEXT) \ - yesno.$(OBJEXT) + yesno.$(OBJEXT) stringbuf.$(OBJEXT) libcvs_a_OBJECTS = $(am_libcvs_a_OBJECTS) +noinst_PROGRAMS = check_stringbuf$(EXEEXT) +PROGRAMS = $(noinst_PROGRAMS) + +am_check_stringbuf_OBJECTS = check_stringbuf.$(OBJEXT) \ + stringbuf.$(OBJEXT) +check_stringbuf_OBJECTS = $(am_check_stringbuf_OBJECTS) +check_stringbuf_LDADD = $(LDADD) +check_stringbuf_DEPENDENCIES = +check_stringbuf_LDFLAGS = DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) @@ -179,42 +195,45 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dup2.Po $(DEPDIR)/fncase.Po \ -@AMDEP_TRUE@ $(DEPDIR)/fnmatch.Po $(DEPDIR)/fnmatch.h.in \ -@AMDEP_TRUE@ $(DEPDIR)/ftruncate.Po $(DEPDIR)/gethostname.Po \ +@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/argmatch.Po \ +@AMDEP_TRUE@ $(DEPDIR)/check_stringbuf.Po $(DEPDIR)/dup2.Po \ +@AMDEP_TRUE@ $(DEPDIR)/fncase.Po $(DEPDIR)/fnmatch.Po \ +@AMDEP_TRUE@ $(DEPDIR)/fnmatch.h.in $(DEPDIR)/ftruncate.Po \ +@AMDEP_TRUE@ $(DEPDIR)/getdate.Po $(DEPDIR)/gethostname.Po \ +@AMDEP_TRUE@ $(DEPDIR)/getline.Po $(DEPDIR)/getopt.Po \ +@AMDEP_TRUE@ $(DEPDIR)/getopt1.Po $(DEPDIR)/md5.Po \ @AMDEP_TRUE@ $(DEPDIR)/memmove.Po $(DEPDIR)/mkdir.Po \ -@AMDEP_TRUE@ $(DEPDIR)/rename.Po $(DEPDIR)/strerror.Po \ -@AMDEP_TRUE@ $(DEPDIR)/strstr.Po $(DEPDIR)/strtoul.Po \ -@AMDEP_TRUE@ $(DEPDIR)/valloc.Po $(DEPDIR)/waitpid.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/argmatch.Po ./$(DEPDIR)/getdate.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/getline.Po ./$(DEPDIR)/getopt.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/getopt1.Po ./$(DEPDIR)/md5.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/regex.Po ./$(DEPDIR)/savecwd.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/sighandle.Po ./$(DEPDIR)/stripslash.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xgetwd.Po ./$(DEPDIR)/yesno.Po +@AMDEP_TRUE@ $(DEPDIR)/regex.Po $(DEPDIR)/rename.Po \ +@AMDEP_TRUE@ $(DEPDIR)/savecwd.Po $(DEPDIR)/sighandle.Po \ +@AMDEP_TRUE@ $(DEPDIR)/strerror.Po $(DEPDIR)/stringbuf.Po \ +@AMDEP_TRUE@ $(DEPDIR)/stripslash.Po $(DEPDIR)/strstr.Po \ +@AMDEP_TRUE@ $(DEPDIR)/strtoul.Po $(DEPDIR)/valloc.Po \ +@AMDEP_TRUE@ $(DEPDIR)/waitpid.Po $(DEPDIR)/xgetwd.Po \ +@AMDEP_TRUE@ $(DEPDIR)/yesno.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ CFLAGS = @CFLAGS@ YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS) -DIST_SOURCES = $(libcvs_a_SOURCES) -DIST_COMMON = ChangeLog Makefile.am Makefile.in dup2.c fncase.c \ - fnmatch.c fnmatch.h.in ftruncate.c getdate.c gethostname.c \ - memmove.c mkdir.c rename.c strerror.c strstr.c strtoul.c \ - valloc.c waitpid.c -SOURCES = $(libcvs_a_SOURCES) +DIST_SOURCES = $(libcvs_a_SOURCES) $(check_stringbuf_SOURCES) +DIST_COMMON = ChangeLog Makefile.am Makefile.in ansi2knr.1 ansi2knr.c \ + dup2.c fncase.c fnmatch.c fnmatch.h.in ftruncate.c getdate.c \ + gethostname.c memmove.c mkdir.c rename.c strerror.c strstr.c \ + strtoul.c valloc.c waitpid.c +SOURCES = $(libcvs_a_SOURCES) $(check_stringbuf_SOURCES) all: all-am .SUFFIXES: .SUFFIXES: .c .o .obj .y -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu lib/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status AR = ar @@ -225,47 +244,55 @@ $(libcvs_a_AR) libcvs.a $(libcvs_a_OBJECTS) $(libcvs_a_LIBADD) $(RANLIB) libcvs.a +clean-noinstPROGRAMS: + -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) +check_stringbuf$(EXEEXT): $(check_stringbuf_OBJECTS) $(check_stringbuf_DEPENDENCIES) + @rm -f check_stringbuf$(EXEEXT) + $(LINK) $(check_stringbuf_LDFLAGS) $(check_stringbuf_OBJECTS) $(check_stringbuf_LDADD) $(LIBS) + mostlyclean-compile: -rm -f *.$(OBJEXT) core *.core distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/argmatch.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/check_stringbuf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dup2.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fncase.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fnmatch.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fnmatch.h.in@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ftruncate.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getdate.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gethostname.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getline.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt1.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/md5.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memmove.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mkdir.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/regex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rename.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/savecwd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sighandle.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strerror.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stringbuf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stripslash.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strstr.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtoul.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/valloc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/waitpid.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/argmatch.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdate.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getline.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/savecwd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sighandle.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stripslash.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xgetwd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yesno.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/xgetwd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/yesno.Po@am__quote@ distclean-depend: - -rm -rf $(DEPDIR) ./$(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)/'`$< + $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< .c.obj: @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @@ -275,81 +302,118 @@ CCDEPMODE = @CCDEPMODE@ .y.c: - $(YACCCOMPILE) `test -f '$<' || echo '$(srcdir)/'`$< - sed '/^#/ s|y\.tab\.c|$@|' y.tab.c >$@ - rm -f y.tab.c + $(YACCCOMPILE) $< && mv y.tab.c $@ if test -f y.tab.h; then \ - to=`echo "$*_H" | sed \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ - -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ - sed "/^#/ s/Y_TAB_H/$$to/g" y.tab.h >$*.ht; \ - rm -f y.tab.h; \ - if cmp -s $*.ht $*.h; then \ - rm -f $*.ht ;\ + if cmp -s y.tab.h $*.h; then \ + rm -f y.tab.h; \ else \ - mv $*.ht $*.h; \ + mv y.tab.h $*.h; \ fi; \ fi - if test -f y.output; then \ - mv y.output $*.output; \ - fi uninstall-info-am: -ETAGS = etags -ETAGSFLAGS = - tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(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 + mkid -fID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(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)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ + here=`CDPATH=: && cd $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH + +check-TESTS: $(TESTS) + @failed=0; all=0; xfail=0; xpass=0; \ + srcdir=$(srcdir); export srcdir; \ + list='$(TESTS)'; \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ + elif test -f $$tst; then dir=; \ + else dir="$(srcdir)/"; fi; \ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *" $$tst "*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ + ;; \ + *) \ + echo "PASS: $$tst"; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *" $$tst "*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ + *) \ + failed=`expr $$failed + 1`; \ + echo "FAIL: $$tst"; \ + ;; \ + esac; \ + fi; \ + done; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ + banner="All $$all tests passed"; \ + else \ + banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ + banner="$$failed of $$all tests failed"; \ + else \ + banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ + fi; \ + fi; \ + dashes=`echo "$$banner" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ + echo "$$dashes"; \ + test "$$failed" -eq 0; \ + fi + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @list='$(DISTFILES)'; for file in $$list; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + @for file in $(DISTFILES); do \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ - else \ - dir=''; \ + $(mkinstalldirs) "$(distdir)/$$dir"; \ fi; \ if test -d $$d/$$file; then \ - 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; \ + cp -pR $$d/$$file $(distdir) \ + || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -357,8 +421,9 @@ fi; \ done check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-am -all-am: Makefile $(LIBRARIES) +all-am: Makefile $(LIBRARIES) $(PROGRAMS) installdirs: @@ -373,7 +438,6 @@ 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: @@ -381,15 +445,15 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." - -test -z "getdate.c" || rm -f getdate.c clean: clean-am -clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am +clean-am: clean-generic clean-noinstLIBRARIES clean-noinstPROGRAMS \ + mostlyclean-am distclean: distclean-am @@ -424,16 +488,16 @@ uninstall-am: uninstall-info-am -.PHONY: GTAGS all all-am check check-am clean clean-generic \ - clean-noinstLIBRARIES 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 +.PHONY: GTAGS all all-am check check-TESTS check-am clean clean-generic \ + clean-noinstLIBRARIES clean-noinstPROGRAMS 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 # for backwards compatibility with the old makefiles Index: getopt.h =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/lib/getopt.h,v retrieving revision 1.1.1.3 retrieving revision 1.2 diff -u -d -r1.1.1.3 -r1.2 --- getopt.h 21 Apr 2003 18:31:09 -0000 1.1.1.3 +++ getopt.h 21 Apr 2003 20:29:12 -0000 1.2 @@ -29,6 +29,8 @@ * this isn't our file. Probably best not to mess with it too much. */ #if defined (_LIBC) || !defined (__GNU_LIBRARY__) +/* this is strange --alexm */ +# if 0 # ifdef HAVE_GETOPT # define getopt cvs_getopt # define optarg cvs_optarg @@ -36,6 +38,7 @@ # define optind cvs_optind # define optopt cvs_optopt # endif /* HAVE_GETOPT */ +# endif #endif /* _LIBC or not __GNU_LIBRARY__. */ #ifdef __cplusplus |
Update of /cvsroot/cvs-nserver/cvs-nserver/checkpassword In directory sc8-pr-cvs1:/tmp/cvs-serv29706/checkpassword Removed Files: BLURB CHANGES FILES INSTALL Makefile README SYSDEPS TARGETS THANKS TODO VERSION auto-str.c auto_home.h byte.h byte_copy.c byte_cr.c checkpassword.8 checkpassword.c chkshsgr.c conf-cc conf-home conf-ld error.c error.h error_str.c exit.h find-systype.sh hier.c install.c instcheck.c log_pam.c log_pam.h open.h open_read.c open_trunc.c prot.c prot.h readwrite.h str.h str_len.c strerr.h strerr_die.c strerr_sys.c subfd.h subfderr.c substdi.c substdio.c substdio.h substdio_copy.c substdo.c trycpp.c trycrypt.c trypam.c tryshadow.c tryshsgr.c tryslib.c tryspnam.c tryuserpw.c warn-auto.sh warn-shsgr Log Message: Merged NCLI-1-11-1 code w/ CVS 1.11.5 --- BLURB DELETED --- --- CHANGES DELETED --- --- FILES DELETED --- --- INSTALL DELETED --- --- Makefile DELETED --- --- README DELETED --- --- SYSDEPS DELETED --- --- TARGETS DELETED --- --- THANKS DELETED --- --- TODO DELETED --- --- VERSION DELETED --- --- auto-str.c DELETED --- --- auto_home.h DELETED --- --- byte.h DELETED --- --- byte_copy.c DELETED --- --- byte_cr.c DELETED --- --- checkpassword.8 DELETED --- --- checkpassword.c DELETED --- --- chkshsgr.c DELETED --- --- conf-cc DELETED --- --- conf-home DELETED --- --- conf-ld DELETED --- --- error.c DELETED --- --- error.h DELETED --- --- error_str.c DELETED --- --- exit.h DELETED --- --- find-systype.sh DELETED --- --- hier.c DELETED --- --- install.c DELETED --- --- instcheck.c DELETED --- --- log_pam.c DELETED --- --- log_pam.h DELETED --- --- open.h DELETED --- --- open_read.c DELETED --- --- open_trunc.c DELETED --- --- prot.c DELETED --- --- prot.h DELETED --- --- readwrite.h DELETED --- --- str.h DELETED --- --- str_len.c DELETED --- --- strerr.h DELETED --- --- strerr_die.c DELETED --- --- strerr_sys.c DELETED --- --- subfd.h DELETED --- --- subfderr.c DELETED --- --- substdi.c DELETED --- --- substdio.c DELETED --- --- substdio.h DELETED --- --- substdio_copy.c DELETED --- --- substdo.c DELETED --- --- trycpp.c DELETED --- --- trycrypt.c DELETED --- --- trypam.c DELETED --- --- tryshadow.c DELETED --- --- tryshsgr.c DELETED --- --- tryslib.c DELETED --- --- tryspnam.c DELETED --- --- tryuserpw.c DELETED --- --- warn-auto.sh DELETED --- --- warn-shsgr DELETED --- |
|
From: Alexey M. <ty...@us...> - 2003-04-21 20:28:12
|
Update of /cvsroot/cvs-nserver/cvs-nserver/zlib/os2 In directory sc8-pr-cvs1:/tmp/cvs-serv28074/zlib/os2 Removed Files: Makefile.os2 zlib.def Log Message: Merged NCLI-1-11-1 code w/ CVS 1.11.5 --- Makefile.os2 DELETED --- --- zlib.def DELETED --- |
|
From: Alexey M. <ty...@us...> - 2003-04-21 20:28:08
|
Update of /cvsroot/cvs-nserver/cvs-nserver/zlib/nt In directory sc8-pr-cvs1:/tmp/cvs-serv28074/zlib/nt Removed Files: Makefile.emx Makefile.gcc Makefile.nt zlib.dnt Log Message: Merged NCLI-1-11-1 code w/ CVS 1.11.5 --- Makefile.emx DELETED --- --- Makefile.gcc DELETED --- --- Makefile.nt DELETED --- --- zlib.dnt DELETED --- |
|
From: Alexey M. <ty...@us...> - 2003-04-21 20:28:07
|
Update of /cvsroot/cvs-nserver/cvs-nserver/zlib/msdos In directory sc8-pr-cvs1:/tmp/cvs-serv28074/zlib/msdos Removed Files: Makefile.b32 Makefile.bor Makefile.dj2 Makefile.emx Makefile.msc Makefile.tc Makefile.w32 Makefile.wat zlib.def zlib.rc Log Message: Merged NCLI-1-11-1 code w/ CVS 1.11.5 --- Makefile.b32 DELETED --- --- Makefile.bor DELETED --- --- Makefile.dj2 DELETED --- --- Makefile.emx DELETED --- --- Makefile.msc DELETED --- --- Makefile.tc DELETED --- --- Makefile.w32 DELETED --- --- Makefile.wat DELETED --- --- zlib.def DELETED --- --- zlib.rc DELETED --- |
|
From: Alexey M. <ty...@us...> - 2003-04-21 20:28:06
|
Update of /cvsroot/cvs-nserver/cvs-nserver/zlib/contrib/untgz In directory sc8-pr-cvs1:/tmp/cvs-serv28074/zlib/contrib/untgz Removed Files: Makefile makefile.w32 untgz.c Log Message: Merged NCLI-1-11-1 code w/ CVS 1.11.5 --- Makefile DELETED --- --- makefile.w32 DELETED --- --- untgz.c DELETED --- |
|
From: Alexey M. <ty...@us...> - 2003-04-21 20:28:05
|
Update of /cvsroot/cvs-nserver/cvs-nserver/zlib/contrib/minizip In directory sc8-pr-cvs1:/tmp/cvs-serv28074/zlib/contrib/minizip Removed Files: ChangeLogUnzip Makefile miniunz.c minizip.c readme.txt unzip.c unzip.def unzip.h zip.c zip.def zip.h zlibvc.def zlibvc.dsp zlibvc.dsw Log Message: Merged NCLI-1-11-1 code w/ CVS 1.11.5 --- ChangeLogUnzip DELETED --- --- Makefile DELETED --- --- miniunz.c DELETED --- --- minizip.c DELETED --- --- readme.txt DELETED --- --- unzip.c DELETED --- --- unzip.def DELETED --- --- unzip.h DELETED --- --- zip.c DELETED --- --- zip.def DELETED --- --- zip.h DELETED --- --- zlibvc.def DELETED --- --- zlibvc.dsp DELETED --- --- zlibvc.dsw DELETED --- |
|
From: Alexey M. <ty...@us...> - 2003-04-21 20:28:02
|
Update of /cvsroot/cvs-nserver/cvs-nserver/zlib/contrib/iostream In directory sc8-pr-cvs1:/tmp/cvs-serv28074/zlib/contrib/iostream Removed Files: test.cpp zfstream.cpp zfstream.h Log Message: Merged NCLI-1-11-1 code w/ CVS 1.11.5 --- test.cpp DELETED --- --- zfstream.cpp DELETED --- --- zfstream.h DELETED --- |
|
From: Alexey M. <ty...@us...> - 2003-04-21 20:28:01
|
Update of /cvsroot/cvs-nserver/cvs-nserver/zlib/contrib/iostream2 In directory sc8-pr-cvs1:/tmp/cvs-serv28074/zlib/contrib/iostream2 Removed Files: zstream.h zstream_test.cpp Log Message: Merged NCLI-1-11-1 code w/ CVS 1.11.5 --- zstream.h DELETED --- --- zstream_test.cpp DELETED --- |
|
From: Alexey M. <ty...@us...> - 2003-04-21 20:28:01
|
Update of /cvsroot/cvs-nserver/cvs-nserver/zlib/contrib/delphi2 In directory sc8-pr-cvs1:/tmp/cvs-serv28074/zlib/contrib/delphi2 Removed Files: d_zlib.bpr d_zlib.cpp readme.txt zlib.bpg zlib.bpr zlib.cpp zlib.pas zlib32.bpr zlib32.cpp Log Message: Merged NCLI-1-11-1 code w/ CVS 1.11.5 --- d_zlib.bpr DELETED --- --- d_zlib.cpp DELETED --- --- readme.txt DELETED --- --- zlib.bpg DELETED --- --- zlib.bpr DELETED --- --- zlib.cpp DELETED --- --- zlib.pas DELETED --- --- zlib32.bpr DELETED --- --- zlib32.cpp DELETED --- |
|
From: Alexey M. <ty...@us...> - 2003-04-21 20:28:00
|
Update of /cvsroot/cvs-nserver/cvs-nserver/zlib/contrib/delphi In directory sc8-pr-cvs1:/tmp/cvs-serv28074/zlib/contrib/delphi Removed Files: zlib.mak zlibdef.pas Log Message: Merged NCLI-1-11-1 code w/ CVS 1.11.5 --- zlib.mak DELETED --- --- zlibdef.pas DELETED --- |
|
From: Alexey M. <ty...@us...> - 2003-04-21 20:27:59
|
Update of /cvsroot/cvs-nserver/cvs-nserver/zlib/contrib/asm686 In directory sc8-pr-cvs1:/tmp/cvs-serv28074/zlib/contrib/asm686 Removed Files: README.686 match.S Log Message: Merged NCLI-1-11-1 code w/ CVS 1.11.5 --- README.686 DELETED --- --- match.S DELETED --- |
