diff options
author | peter <peter@FreeBSD.org> | 2001-08-10 09:43:22 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2001-08-10 09:43:22 +0000 |
commit | c132709d1892a50d7915da8685face38ada32e4f (patch) | |
tree | 91ad9c2f4db08545ffa8883e62c900d4001de987 /contrib/cvs/lib | |
parent | e832f306d6c3f06dc0d801543a4302233e24e063 (diff) | |
parent | a037ef8f32200b26968e77344bcfb963251fa8b9 (diff) | |
download | FreeBSD-src-c132709d1892a50d7915da8685face38ada32e4f.zip FreeBSD-src-c132709d1892a50d7915da8685face38ada32e4f.tar.gz |
This commit was generated by cvs2svn to compensate for changes in r81404,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/cvs/lib')
-rw-r--r-- | contrib/cvs/lib/ChangeLog | 66 | ||||
-rw-r--r-- | contrib/cvs/lib/Makefile.am | 88 | ||||
-rw-r--r-- | contrib/cvs/lib/Makefile.in | 490 | ||||
-rw-r--r-- | contrib/cvs/lib/getdate.y | 46 | ||||
-rw-r--r-- | contrib/cvs/lib/rename.c | 4 | ||||
-rw-r--r-- | contrib/cvs/lib/system.h | 43 | ||||
-rw-r--r-- | contrib/cvs/lib/xgssapi.h | 30 | ||||
-rw-r--r-- | contrib/cvs/lib/xselect.h | 21 | ||||
-rw-r--r-- | contrib/cvs/lib/xtime.h | 57 |
9 files changed, 658 insertions, 187 deletions
diff --git a/contrib/cvs/lib/ChangeLog b/contrib/cvs/lib/ChangeLog index 102ca4c..107445d 100644 --- a/contrib/cvs/lib/ChangeLog +++ b/contrib/cvs/lib/ChangeLog @@ -1,3 +1,69 @@ +2001-04-25 Derek Price <dprice@collab.net> + + * Makefile.in: Regenerated using AM 1.4e as of today at 18:10 -0400. + +2001-04-02 Derek Price <dprice@collab.net> + for Alon Ziv <alonz@zapper.com> + + * getdate.y: Add a declaration for yyparse(). + + * getdate.c: Regenerated. + +2001-03-14 Derek Price <derek.price@openavenue.com> + + * Makefile.in: Regenerated + +2001-02-20 Derek Price <derek.price@openavenue.com> + + * xgssapi.h: New file to perform GSSAPI include magic. + * Makefile.am (EXTRA_DIST): Add xgssapi.h. + + * Makefile.in: Regenerated. + +2001-02-14 Derek Price <derek.price@openavenue.com> + + * Makefile.am (libcvs_a_SOURCES): Add xtime.h & xselect.h. + * Makefile.in: Regenerated. + * getdate.y: Include xtime.h. + * getdate.c: Regenerated. + * system.h: Include xtime.h. + * xtime.h: New file to do include magic for time functions. + * xselect.h: New file to do select include magic. + +2001-02-06 Derek Price <derek.price@openavenue.com> + Rex Jolliff <Rex_Jolliff@notes.ymp.gov> + Shawn Smith <Shawn_Smith@notes.ymp.gov> + + * system.h: definitions of CVS_OPENDIR, CVS_READDIR, & CVS_CLOSEDIR + provided here in support of changes to handle VMS DEC C 5.7 + {open,read,close}dir problems. Check today's entry in the vms subdir + for more. + +2001-01-10 Derek Price <derek.price@openavenue.com> + Rex Jolliff <Rex_Jolliff@notes.ymp.gov> + + * rename.c: replace calls to unlink() with CVS_UNLINK() for VMS + +2000-12-22 Derek Price <derek.price@openavenue.com> + + * Makefile.am (INCLUDES): Fixed typo + * Makefile.in: Regenerated + +2000-12-22 Derek Price <derek.price@openavenue.com> + + * Makefile.am (INCLUDES): Added $(top_srcdir)/src + * Makefile.in: Regenerated + +2000-12-21 Derek Price <derek.price@openavenue.com> + + * .cvsignore: Added .deps directory and alphabetized + * Makefile.am: New file needed by Automake + * Makefile.in: Regenerated + +2000-11-15 Derek Price <derek.price@openavenue.com> + + * system.h: Added CVS_FDOPEN to conform to CVS_FOPEN precedent + 2000-07-10 Larry Jones <larry.jones@sdrc.com> * savecwd.c: #include <sys/types.h> before <fcntl.h>. diff --git a/contrib/cvs/lib/Makefile.am b/contrib/cvs/lib/Makefile.am new file mode 100644 index 0000000..5984fcf --- /dev/null +++ b/contrib/cvs/lib/Makefile.am @@ -0,0 +1,88 @@ +## Process this file with automake to produce Makefile.in +# Makefile for library files used by GNU CVS. +# Copyright (C) 1986, 1988-1994, 2000 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program 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 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 +INCLUDES = -I$(top_srcdir)/src $(includeopt) + +noinst_LIBRARIES = libcvs.a + +# Always use CVS's regular expression matcher regex.o, because of +# variations in regular expression syntax - we want to be the same +# across systems and (probably) compared with old versions of CVS too. +# +# On a more mundane/detail level, having regex.h match regex.c can be +# an issue if we aren't careful. +# +# Also should look into unifying regular expression matching in CVS +# with the diff library (perhaps to have the caller, CVS, do the +# matching?) +libcvs_a_SOURCES = \ + argmatch.c \ + ftruncate.c \ + getdate.y \ + getline.c \ + getopt.c \ + getopt1.c \ + md5.c \ + regex.c \ + savecwd.c \ + sighandle.c \ + stripslash.c \ + xgetwd.c \ + yesno.c \ + getline.h \ + getopt.h \ + fnmatch.h \ + md5.h \ + regex.h \ + savecwd.h \ + system.h \ + wait.h \ + xselect.h \ + xtime.h +## because @LIBOBJS@ is included below, automake automatically knows about +## dup2.c +## fncase.c +## fnmatch.c +## hostname.c +## memmove.c +## mkdir.c +## rename.c +## strstr.c +## strerror.c +## strtoul.c +## valloc.c +## waitpid.c +libcvs_a_LIBADD = @LIBOBJS@ + +EXTRA_DIST = \ + .cvsignore \ + ChangeLog.fsf \ + build_lib.com \ + xgssapi.h + +# for backwards compatibility with the old makefiles +realclean: maintainer-clean +.PHONY: realclean diff --git a/contrib/cvs/lib/Makefile.in b/contrib/cvs/lib/Makefile.in index 736f131..f53c852 100644 --- a/contrib/cvs/lib/Makefile.in +++ b/contrib/cvs/lib/Makefile.in @@ -1,6 +1,20 @@ +# Makefile.in generated automatically by automake 1.4e from Makefile.am. + +# 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, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + # Makefile for library files used by GNU CVS. -# Do not use this makefile directly, but only from `../Makefile'. -# Copyright (C) 1986, 1988-1994 Free Software Foundation, Inc. +# Copyright (C) 1986, 1988-1994, 2000 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -12,157 +26,403 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -cvs_srcdir = @top_srcdir@/src -VPATH = @srcdir@ +# 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 = /bin/sh +SHELL = @SHELL@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ -SOURCES = \ +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@ + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_HEADER = $(INSTALL_DATA) +transform = @program_transform_name@ + +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +AMTAR = @AMTAR@ +AWK = @AWK@ +CC = @CC@ +CSH = @CSH@ +DEPDIR = @DEPDIR@ +ETAGS = @ETAGS@ +ETAGS_INCLUDE_OPTION = @ETAGS_INCLUDE_OPTION@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@ +KRB4 = @KRB4@ +LN_S = @LN_S@ +MAKEINFO = @MAKEINFO@ +PACKAGE = @PACKAGE@ +PERL = @PERL@ +PR = @PR@ +PS2PDF = @PS2PDF@ +RANLIB = @RANLIB@ +ROFF = @ROFF@ +STRIP = @STRIP@ +TEXI2DVI = @TEXI2DVI@ +VERSION = @VERSION@ +YACC = @YACC@ +_am_include = @_am_include@ +_am_quote = @_am_quote@ +includeopt = @includeopt@ +install_sh = @install_sh@ + +INCLUDES = -I$(top_srcdir)/src $(includeopt) + +noinst_LIBRARIES = libcvs.a + +# Always use CVS's regular expression matcher regex.o, because of +# variations in regular expression syntax - we want to be the same +# across systems and (probably) compared with old versions of CVS too. +# +# On a more mundane/detail level, having regex.h match regex.c can be +# an issue if we aren't careful. +# +# Also should look into unifying regular expression matching in CVS +# with the diff library (perhaps to have the caller, CVS, do the +# matching?) +libcvs_a_SOURCES = \ argmatch.c \ - dup2.c \ - fncase.c \ - fnmatch.c \ ftruncate.c \ - getdate.c \ getdate.y \ getline.c \ getopt.c \ getopt1.c \ - hostname.c \ md5.c \ - memmove.c \ - mkdir.c \ regex.c \ - rename.c \ savecwd.c \ sighandle.c \ - strstr.c \ - strerror.c \ stripslash.c \ - strtoul.c \ - valloc.c \ - waitpid.c \ xgetwd.c \ - yesno.c + yesno.c \ + getline.h \ + getopt.h \ + fnmatch.h \ + md5.h \ + regex.h \ + savecwd.h \ + system.h \ + wait.h \ + xselect.h \ + xtime.h -HEADERS = getline.h getopt.h fnmatch.h regex.h system.h wait.h md5.h savecwd.h +libcvs_a_LIBADD = @LIBOBJS@ -# Always use CVS's regular expression matcher regex.o, because of -# variations in regular expression syntax - we want to be the same -# across systems and (probably) compared with old versions of CVS too. -# -# On a more mundane/detail level, having regex.h match regex.c can be -# an issue if we aren't careful. -# -# Also should look into unifying regular expression matching in CVS -# with the diff library (perhaps to have the caller, CVS, do the -# matching?) -OBJECTS = \ - @LIBOBJS@ \ - argmatch.o \ - getline.o \ - getopt.o \ - getopt1.o \ - md5.o \ - regex.o \ - savecwd.o \ - sighandle.o \ - stripslash.o \ - xgetwd.o \ - yesno.o \ - getdate.o - -DISTFILES = \ - .cvsignore ChangeLog ChangeLog.fsf Makefile.in \ - ${SOURCES} ${HEADERS} build_lib.com +EXTRA_DIST = \ + .cvsignore \ + ChangeLog.fsf \ + build_lib.com \ + xgssapi.h -DEFS = @DEFS@ -RANLIB = @RANLIB@ +EXEEXT = +OBJEXT = o +subdir = lib +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/src/options.h +CONFIG_CLEAN_FILES = +LIBRARIES = $(noinst_LIBRARIES) -CC = @CC@ +libcvs_a_AR = $(AR) cru +libcvs_a_DEPENDENCIES = @LIBOBJS@ +am_libcvs_a_OBJECTS = argmatch.$(OBJEXT) ftruncate.$(OBJEXT) \ + getdate.$(OBJEXT) getline.$(OBJEXT) getopt.$(OBJEXT) \ + getopt1.$(OBJEXT) md5.$(OBJEXT) regex.$(OBJEXT) \ + savecwd.$(OBJEXT) sighandle.$(OBJEXT) stripslash.$(OBJEXT) \ + xgetwd.$(OBJEXT) yesno.$(OBJEXT) +libcvs_a_OBJECTS = $(am_libcvs_a_OBJECTS) +AR = ar +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CFLAGS = @CFLAGS@ -CPPFLAGS= +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -YACC = @YACC@ +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/src +DEFS = @DEFS@ +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ +DIST_SOURCES = $(libcvs_a_SOURCES) +depcomp = $(SHELL) $(top_srcdir)/depcomp +@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/argmatch.Po $(DEPDIR)/dup2.Po \ +@AMDEP_TRUE@ $(DEPDIR)/fncase.Po $(DEPDIR)/fnmatch.Po \ +@AMDEP_TRUE@ $(DEPDIR)/ftruncate.Po $(DEPDIR)/getdate.Po \ +@AMDEP_TRUE@ $(DEPDIR)/getline.Po $(DEPDIR)/getopt.Po \ +@AMDEP_TRUE@ $(DEPDIR)/getopt1.Po $(DEPDIR)/hostname.Po \ +@AMDEP_TRUE@ $(DEPDIR)/md5.Po $(DEPDIR)/memmove.Po \ +@AMDEP_TRUE@ $(DEPDIR)/mkdir.Po $(DEPDIR)/regex.Po \ +@AMDEP_TRUE@ $(DEPDIR)/rename.Po $(DEPDIR)/savecwd.Po \ +@AMDEP_TRUE@ $(DEPDIR)/sighandle.Po $(DEPDIR)/strerror.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 +DIST_COMMON = ChangeLog Makefile.am Makefile.in dup2.c fncase.c \ + fnmatch.c getdate.c hostname.c memmove.c mkdir.c rename.c \ + strerror.c strstr.c strtoul.c valloc.c waitpid.c +SOURCES = $(libcvs_a_SOURCES) +OBJECTS = $(am_libcvs_a_OBJECTS) + +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .o .obj .y + +$(srcdir)/Makefile.in: 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) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status + +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + +libcvs.a: $(libcvs_a_OBJECTS) $(libcvs_a_DEPENDENCIES) + -rm -f libcvs.a + $(libcvs_a_AR) libcvs.a $(libcvs_a_OBJECTS) $(libcvs_a_LIBADD) + $(RANLIB) libcvs.a + +.y.c: + $(YACC) $(AM_YFLAGS) $(YFLAGS) $< && mv y.tab.c $*.c + if test -f y.tab.h; then \ + if cmp -s y.tab.h $*.h; then \ + rm -f y.tab.h; \ + else \ + mv y.tab.h $*.h; \ + fi; \ + fi + + +mostlyclean-compile: + -rm -f *.$(OBJEXT) core *.core + +distclean-compile: + -rm -f *.tab.c + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(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 $(LISP) + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + unique=`for i in $$list @CONFIG@; 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) + +GTAGS: + here=`CDPATH=: && cd $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $$here + +distclean-tags: + -rm -f TAGS ID + +@_am_include@ @_am_quote@$(DEPDIR)/argmatch.Po@_am_quote@ +@_am_include@ @_am_quote@$(DEPDIR)/dup2.Po@_am_quote@ +@_am_include@ @_am_quote@$(DEPDIR)/fncase.Po@_am_quote@ +@_am_include@ @_am_quote@$(DEPDIR)/fnmatch.Po@_am_quote@ +@_am_include@ @_am_quote@$(DEPDIR)/ftruncate.Po@_am_quote@ +@_am_include@ @_am_quote@$(DEPDIR)/getdate.Po@_am_quote@ +@_am_include@ @_am_quote@$(DEPDIR)/getline.Po@_am_quote@ +@_am_include@ @_am_quote@$(DEPDIR)/getopt.Po@_am_quote@ +@_am_include@ @_am_quote@$(DEPDIR)/getopt1.Po@_am_quote@ +@_am_include@ @_am_quote@$(DEPDIR)/hostname.Po@_am_quote@ +@_am_include@ @_am_quote@$(DEPDIR)/md5.Po@_am_quote@ +@_am_include@ @_am_quote@$(DEPDIR)/memmove.Po@_am_quote@ +@_am_include@ @_am_quote@$(DEPDIR)/mkdir.Po@_am_quote@ +@_am_include@ @_am_quote@$(DEPDIR)/regex.Po@_am_quote@ +@_am_include@ @_am_quote@$(DEPDIR)/rename.Po@_am_quote@ +@_am_include@ @_am_quote@$(DEPDIR)/savecwd.Po@_am_quote@ +@_am_include@ @_am_quote@$(DEPDIR)/sighandle.Po@_am_quote@ +@_am_include@ @_am_quote@$(DEPDIR)/strerror.Po@_am_quote@ +@_am_include@ @_am_quote@$(DEPDIR)/stripslash.Po@_am_quote@ +@_am_include@ @_am_quote@$(DEPDIR)/strstr.Po@_am_quote@ +@_am_include@ @_am_quote@$(DEPDIR)/strtoul.Po@_am_quote@ +@_am_include@ @_am_quote@$(DEPDIR)/valloc.Po@_am_quote@ +@_am_include@ @_am_quote@$(DEPDIR)/waitpid.Po@_am_quote@ +@_am_include@ @_am_quote@$(DEPDIR)/xgetwd.Po@_am_quote@ +@_am_include@ @_am_quote@$(DEPDIR)/yesno.Po@_am_quote@ + +distclean-depend: + -rm -rf $(DEPDIR) + +CCDEPMODE = @CCDEPMODE@ .c.o: - $(CC) $(CPPFLAGS) -I.. -I$(srcdir) -I$(cvs_srcdir) \ - $(DEFS) $(CFLAGS) -c $< + source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ + $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< + +.c.obj: + source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ + $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(COMPILE) -c -o $@ `cygpath -w $<` + + +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -all: libcvs.a -.PHONY: all +top_distdir = .. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) -install: all -.PHONY: install +distdir: $(DISTFILES) + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ + cp -pR $$d/$$file $(distdir) \ + || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LIBRARIES) installdirs: -.PHONY: installdirs -tags: $(DISTFILES) - ctags `for i in $(DISTFILES); do echo $(srcdir)/$$i; done` +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am -TAGS: $(DISTFILES) - etags `for i in $(DISTFILES); do echo $(srcdir)/$$i; done` +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -ls: - @echo $(DISTFILES) -.PHONY: ls +installcheck: installcheck-am -clean: - rm -f *.a *.o -.PHONY: clean +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install -distclean: clean - rm -f tags TAGS Makefile -.PHONY: distclean +mostlyclean-generic: -realclean: distclean - rm -f *.tab.c getdate.c -.PHONY: realclean +clean-generic: -dist-dir: - mkdir ${DISTDIR} - for i in ${DISTFILES}; do \ - ln $(srcdir)/$${i} ${DISTDIR}; \ - done -.PHONY: dist-dir - -libcvs.a: $(OBJECTS) - $(AR) cr $@ $(OBJECTS) - -$(RANLIB) $@ - -getdate.c: getdate.y - @echo expect 10 shift/reduce conflicts - $(YACC) $(srcdir)/getdate.y - -@if test -f y.tab.c; then \ - mv y.tab.c getdate.c ;\ - else \ - if test -f getdate.tab.c ; then \ - mv getdate.tab.c getdate.c ; \ - else \ - echo '*** Unable to create getdate.c' ;\ - fi ;\ - fi +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* -fnmatch.o: fnmatch.h -getopt1.o: getopt.h -regex.o: regex.h -md5.o: md5.h +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -rm -f Makefile.in + -test -z "getdate.c" || rm -f getdate.c +clean: clean-am -xlint: - @echo xlint does nothing +clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am -subdir = lib -Makefile: ../config.status Makefile.in - cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status +distclean: distclean-am + +distclean-am: clean-am distclean-compile distclean-depend \ + distclean-generic distclean-tags + +dvi: + +dvi-am: + +info: + +info-am: + +install-data-am: -#../config.status: ../configure -# cd .. ; $(SHELL) config.status --recheck +install-exec-am: + +install-info: + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +.PHONY: 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-man install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic tags \ + uninstall uninstall-am + + +# for backwards compatibility with the old makefiles +realclean: maintainer-clean +.PHONY: realclean -#../configure: ../configure.in -# cd $(top_srcdir) ; autoconf +# 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: diff --git a/contrib/cvs/lib/getdate.y b/contrib/cvs/lib/getdate.y index c3f18c6..a2786ed 100644 --- a/contrib/cvs/lib/getdate.y +++ b/contrib/cvs/lib/getdate.y @@ -39,46 +39,11 @@ Include <sys/time.h> if that will be used. */ #if defined(vms) - -#include <types.h> -#include <time.h> - -#else - -#include <sys/types.h> - -#ifdef TIME_WITH_SYS_TIME -#include <sys/time.h> -#include <time.h> -#else -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#else -#include <time.h> -#endif -#endif - -#ifdef timezone -#undef timezone /* needed for sgi */ -#endif - -#if defined(HAVE_SYS_TIMEB_H) -#include <sys/timeb.h> -#else -/* -** We use the obsolete `struct timeb' as part of our interface! -** Since the system doesn't have it, we define it here; -** our callers must do likewise. -*/ -struct timeb { - time_t time; /* Seconds since the epoch */ - unsigned short millitm; /* Field not used */ - short timezone; /* Minutes west of GMT */ - short dstflag; /* Field not used */ -}; -#endif /* defined(HAVE_SYS_TIMEB_H) */ - -#endif /* defined(vms) */ +# include <types.h> +#else /* defined(vms) */ +# include <sys/types.h> +# include "xtime.h" +#endif /* !defined(vms) */ #if defined (STDC_HEADERS) || defined (USG) #include <string.h> @@ -115,6 +80,7 @@ extern struct tm *localtime(); #define yylex getdate_yylex #define yyerror getdate_yyerror +static int yyparse (); static int yylex (); static int yyerror (); diff --git a/contrib/cvs/lib/rename.c b/contrib/cvs/lib/rename.c index ae3d36e..8dc0239 100644 --- a/contrib/cvs/lib/rename.c +++ b/contrib/cvs/lib/rename.c @@ -37,7 +37,7 @@ rename (from, to) { /* We don't check existence_error because the systems which need it have rename(). */ - if (unlink (to) && errno != ENOENT) + if (CVS_UNLINK (to) && errno != ENOENT) return -1; if ((from_stats.st_mode & S_IFMT) == S_IFDIR) { @@ -72,7 +72,7 @@ rename (from, to) { /* We don't check existence_error because the systems which need it have rename(). */ - if (link (from, to) == 0 && (unlink (from) == 0 || errno == ENOENT)) + if (link (from, to) == 0 && (CVS_UNLINK (from) == 0 || errno == ENOENT)) return 0; } } diff --git a/contrib/cvs/lib/system.h b/contrib/cvs/lib/system.h index 8beedf0..2c3adbd 100644 --- a/contrib/cvs/lib/system.h +++ b/contrib/cvs/lib/system.h @@ -156,16 +156,7 @@ off_t lseek (); char *getcwd (); #endif -#if TIME_WITH_SYS_TIME -# include <sys/time.h> -# include <time.h> -#else -# if HAVE_SYS_TIME_H -# include <sys/time.h> -# else -# include <time.h> -# endif -#endif +#include "xtime.h" #ifdef HAVE_IO_H #include <io.h> @@ -175,26 +166,6 @@ char *getcwd (); #include <direct.h> #endif -#ifdef timezone -#undef timezone /* needed for sgi */ -#endif - -#ifdef HAVE_SYS_TIMEB_H -#include <sys/timeb.h> -#else -struct timeb { - time_t time; /* Seconds since the epoch */ - unsigned short millitm; /* Field not used */ - short timezone; - short dstflag; /* Field not used */ -}; -#endif - -#if !defined(HAVE_FTIME) && !defined(HAVE_TIMEZONE) -#if !defined(timezone) -extern long timezone; -#endif -#endif /* @@ -429,6 +400,10 @@ extern int errno; #define CVS_FOPEN fopen #endif +#ifndef CVS_FDOPEN +#define CVS_FDOPEN fdopen +#endif + #ifndef CVS_MKDIR #define CVS_MKDIR mkdir #endif @@ -437,6 +412,14 @@ extern int errno; #define CVS_OPEN open #endif +#ifndef CVS_READDIR +#define CVS_READDIR readdir +#endif + +#ifndef CVS_CLOSEDIR +#define CVS_CLOSEDIR closedir +#endif + #ifndef CVS_OPENDIR #define CVS_OPENDIR opendir #endif diff --git a/contrib/cvs/lib/xgssapi.h b/contrib/cvs/lib/xgssapi.h new file mode 100644 index 0000000..31b8e39 --- /dev/null +++ b/contrib/cvs/lib/xgssapi.h @@ -0,0 +1,30 @@ +/* This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program 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 General Public License for more details. */ + +/* This file performs the generic include magic necessary for using + * cross platform gssapi which configure doesn't perform itself. + */ + +/* Can't include both of these headers at the same time with Solaris 7 & + * Heimdal Kerberos 0.3. If some system ends up requiring both, a configure + * test like TIME_AND_SYS_TIME will probably be necessary. + */ +#ifdef HAVE_GSSAPI_H +# include <gssapi.h> +#else +/* Assume existance of this header so that the user will get an informative + * message if HAVE_GSSAPI somehow gets defined with both headers missing. + */ +# include <gssapi/gssapi.h> +#endif +#ifdef HAVE_GSSAPI_GSSAPI_GENERIC_H +/* MIT Kerberos 5 v1.2.1 */ +# include <gssapi/gssapi_generic.h> +#endif diff --git a/contrib/cvs/lib/xselect.h b/contrib/cvs/lib/xselect.h new file mode 100644 index 0000000..f1df204 --- /dev/null +++ b/contrib/cvs/lib/xselect.h @@ -0,0 +1,21 @@ +/* This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program 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 General Public License for more details. */ + +/* This file simply performs the include magic necessary for using select */ +#include <sys/types.h> +#ifdef HAVE_SYS_BSDTYPES_H +# include <sys/bsdtypes.h> +#endif + +#include "xtime.h" + +#if HAVE_SYS_SELECT_H +# include <sys/select.h> +#endif diff --git a/contrib/cvs/lib/xtime.h b/contrib/cvs/lib/xtime.h new file mode 100644 index 0000000..00d9fae --- /dev/null +++ b/contrib/cvs/lib/xtime.h @@ -0,0 +1,57 @@ +/* This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program 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 General Public License for more details. */ + +/* This file simply performs the include magic necessary for using time + * functions + */ + +#ifdef vms +# include <time.h> +#else /* vms */ + +# if TIME_WITH_SYS_TIME +# include <sys/time.h> +# include <time.h> +# else /* TIME_WITH_SYS_TIME */ +# if HAVE_SYS_TIME_H +# include <sys/time.h> +# else /* HAVE_SYS_TIME_H */ +# include <time.h> +# endif /* !HAVE_SYS_TIME_H */ +# endif /* !TIME_WITH_SYS_TIME */ + +# ifdef HAVE_SYS_TIMEB_H +# include <sys/timeb.h> +# else /* HAVE_SYS_TIMEB_H */ +/* + * We use the obsolete `struct timeb' as part of our interface! + * Since the system doesn't have it, we define it here; + * our callers must do likewise. + * + * At the least we were using this in lib/getdate.y, but lib/system.h used to + * define it too, so maybe CVS is using it elsewhere. + */ +struct timeb { + time_t time; /* Seconds since the epoch */ + unsigned short millitm; /* Field not used */ + short timezone; /* Minutes west of GMT */ + short dstflag; /* Field not used */ +}; +# endif /* !HAVE_SYS_TIMEB_H */ + +# ifdef timezone +# undef timezone /* needed for sgi */ +# endif /* timezone */ + +# if !defined(HAVE_FTIME) && !defined(HAVE_TIMEZONE) +extern long timezone; +# endif /* !defined(HAVE_FTIME) && !defined(HAVE_TIMEZONE) */ + +#endif /* !vms */ |