aboutsummaryrefslogtreecommitdiff
path: root/contrib/cvs/src/Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/cvs/src/Makefile.in')
-rw-r--r--contrib/cvs/src/Makefile.in38
1 files changed, 17 insertions, 21 deletions
diff --git a/contrib/cvs/src/Makefile.in b/contrib/cvs/src/Makefile.in
index acb3343f6ab9..f02edf26101e 100644
--- a/contrib/cvs/src/Makefile.in
+++ b/contrib/cvs/src/Makefile.in
@@ -12,12 +12,6 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-# $CVSid: @(#)Makefile.in 1.19 94/09/29 $
-
SHELL = /bin/sh
srcdir = @srcdir@
@@ -43,31 +37,31 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
LIBS = @LIBS@
-SOURCES = add.c admin.c checkin.c checkout.c classify.c client.c commit.c \
-create_adm.c cvsrc.c diff.c edit.c entries.c error.c expand_path.c \
+SOURCES = add.c admin.c buffer.c checkin.c checkout.c classify.c client.c \
+commit.c create_adm.c cvsrc.c diff.c edit.c entries.c error.c expand_path.c \
fileattr.c find_names.c hash.c history.c ignore.c import.c \
lock.c log.c login.c logmsg.c main.c mkmodules.c modules.c myndbm.c no_diff.c \
parseinfo.c patch.c rcs.c rcscmds.c recurse.c release.c remove.c repos.c \
root.c rtag.c scramble.c server.c status.c subr.c filesubr.c run.c \
-tag.c update.c watch.c wrapper.c vers_ts.c version.c
+tag.c update.c watch.c wrapper.c vers_ts.c version.c zlib.c
-OBJECTS = add.o admin.o checkin.o checkout.o classify.o client.o commit.o \
-create_adm.o cvsrc.o diff.o edit.o entries.o expand_path.o \
+OBJECTS = add.o admin.o buffer.o checkin.o checkout.o classify.o client.o \
+commit.o create_adm.o cvsrc.o diff.o edit.o entries.o expand_path.o \
fileattr.o find_names.o hash.o history.o ignore.o import.o \
lock.o log.o login.o logmsg.o main.o mkmodules.o modules.o myndbm.o no_diff.o \
parseinfo.o patch.o rcs.o rcscmds.o recurse.o release.o remove.o repos.o \
root.o rtag.o scramble.o server.o status.o tag.o update.o \
watch.o wrapper.o vers_ts.o \
-subr.o filesubr.o run.o version.o error.o
+subr.o filesubr.o run.o version.o error.o zlib.o
-HEADERS = cvs.h rcs.h hash.h myndbm.h \
+HEADERS = buffer.h cvs.h rcs.h hash.h myndbm.h \
update.h server.h client.h error.h fileattr.h edit.h watch.h
TAGFILES = $(HEADERS) options.h.in $(SOURCES)
-DISTFILES = .cvsignore Makefile.in ChangeLog ChangeLog-9395 ChangeLog-9194 \
- NOTES README-rm-add \
- sanity.sh cvsbug.sh $(TAGFILES)
+DISTFILES = .cvsignore Makefile.in \
+ ChangeLog ChangeLog-96 ChangeLog-9395 ChangeLog-9194 \
+ sanity.sh cvsbug.sh $(TAGFILES) build_src.com
PROGS = cvs cvsbug
@@ -91,8 +85,7 @@ saber_cvs:
lint:
@cd ..; $(MAKE) lint SUBDIRS=src
-# CYGNUS LOCAL: Do not depend upon installdirs
-install:
+install: installdirs
@for prog in $(PROGS); do \
echo Installing $$prog in $(bindir); \
$(INSTALL) $$prog $(bindir)/$$prog ; \
@@ -151,10 +144,10 @@ dist-dir:
# Linking rules.
-$(PROGS): ../lib/libcvs.a
+$(PROGS): ../lib/libcvs.a ../zlib/libz.a
cvs: $(OBJECTS)
- $(CC) $(OBJECTS) ../lib/libcvs.a $(LIBS) $(LDFLAGS) -o $@
+ $(CC) $(OBJECTS) ../lib/libcvs.a ../zlib/libz.a $(LIBS) $(LDFLAGS) -o $@
xlint: $(SOURCES)
files= ; \
@@ -168,7 +161,7 @@ saber: $(SOURCES)
# load $(CFLAGS) $(SOURCES)
# load ../lib/libcvs.a $(LIBS)
-cvsbug: cvsbug.sh
+cvsbug: cvsbug.sh $(srcdir)/version.c
echo > .fname \
cvs-`sed < $(srcdir)/version.c \
-e '/version_string/!d' \
@@ -184,6 +177,9 @@ cvsbug: cvsbug.sh
$(OBJECTS): $(HEADERS) options.h
+zlib.o: zlib.c
+ $(CC) $(CPPFLAGS) $(INCLUDES) -I$(top_srcdir)/zlib $(DEFS) $(CFLAGS) -c $(srcdir)/zlib.c
+
subdir = src
Makefile: ../config.status Makefile.in
cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status