1 diff -uNr cvs-1.10.8/Makefile.in cvs-1.10.8-zlib/Makefile.in
2 --- cvs-1.10.8/Makefile.in Mon Apr 26 17:05:11 1999
3 +++ cvs-1.10.8-zlib/Makefile.in Wed May 10 10:20:51 2000
6 ### Subdirectories to run make in for the primary targets.
7 # Unix source subdirs, where we'll want to run lint and etags:
8 -USOURCE_SUBDIRS = lib zlib diff src
9 +USOURCE_SUBDIRS = lib diff src
11 SUBDIRS = ${USOURCE_SUBDIRS} man doc contrib tools \
12 windows-NT os2 emx vms
16 cd lib ; $(MAKE) $(FLAGS_TO_PASS)
17 - cd zlib ; $(MAKE) $(FLAGS_TO_PASS)
18 cd diff ; $(MAKE) $(FLAGS_TO_PASS)
19 cd src ; $(MAKE) $(FLAGS_TO_PASS) check
23 cd lib ; $(MAKE) $(FLAGS_TO_PASS)
24 - cd zlib ; $(MAKE) $(FLAGS_TO_PASS)
25 cd diff ; $(MAKE) $(FLAGS_TO_PASS)
26 cd src ; $(MAKE) $(FLAGS_TO_PASS) remotecheck
30 cd lib ; $(MAKE) $(FLAGS_TO_PASS)
31 - cd zlib ; $(MAKE) $(FLAGS_TO_PASS)
32 cd diff ; $(MAKE) $(FLAGS_TO_PASS)
33 cd src ; $(MAKE) $(FLAGS_TO_PASS) installcheck
35 diff -uNr cvs-1.10.8/configure.in cvs-1.10.8-zlib/configure.in
36 --- cvs-1.10.8/configure.in Wed May 10 10:24:21 2000
37 +++ cvs-1.10.8-zlib/configure.in Wed May 10 10:23:51 2000
42 +AC_CHECK_LIB(z, zlibVersion)
43 dnl The auth server needs to be able to check passwords against passwd
44 dnl file entries, so we only #define AUTH_SERVER_SUPPORT if we can
45 dnl find the crypt function.
47 cp ./src/options.h ./src/options.h-SAVED
50 -AC_OUTPUT(Makefile lib/Makefile src/Makefile zlib/Makefile diff/Makefile doc/Makefile \
51 +AC_OUTPUT(Makefile lib/Makefile src/Makefile diff/Makefile doc/Makefile \
52 man/Makefile tools/Makefile \
54 windows-NT/Makefile windows-NT/SCC/Makefile \
55 diff -uNr cvs-1.10.8/src/Makefile.in cvs-1.10.8-zlib/src/Makefile.in
56 --- cvs-1.10.8/src/Makefile.in Tue Oct 6 19:04:30 1998
57 +++ cvs-1.10.8-zlib/src/Makefile.in Wed May 10 10:21:36 2000
62 -$(PROGS): ../lib/libcvs.a ../zlib/libz.a ../diff/libdiff.a
63 +$(PROGS): ../lib/libcvs.a ../diff/libdiff.a
66 - $(CC) $(OBJECTS) ../lib/libcvs.a ../zlib/libz.a ../diff/libdiff.a $(LIBS) $(LDFLAGS) -o $@
67 + $(CC) $(OBJECTS) ../lib/libcvs.a ../diff/libdiff.a $(LIBS) $(LDFLAGS) -o $@